diff --git a/EVENTS.txt b/EVENTS.txt index 64e345b692..e6400244e4 100644 --- a/EVENTS.txt +++ b/EVENTS.txt @@ -655,3 +655,35 @@ StartUnblockProfile: when we're about to unblock EndUnblockProfile: when an unblock has succeeded - $user: the person doing the unblock - $profile: the person unblocked, can be remote + +StartSubscribe: when a subscription is starting +- $user: the person subscribing +- $other: the person being subscribed to + +EndSubscribe: when a subscription is finished +- $user: the person subscribing +- $other: the person being subscribed to + +StartUnsubscribe: when an unsubscribe is starting +- $user: the person unsubscribing +- $other: the person being unsubscribed from + +EndUnsubscribe: when an unsubscribe is done +- $user: the person unsubscribing +- $other: the person being unsubscribed to + +StartJoinGroup: when a user is joining a group +- $group: the group being joined +- $user: the user joining + +EndJoinGroup: when a user finishes joining a group +- $group: the group being joined +- $user: the user joining + +StartLeaveGroup: when a user is leaving a group +- $group: the group being left +- $user: the user leaving + +EndLeaveGroup: when a user has left a group +- $group: the group being left +- $user: the user leaving diff --git a/actions/all.php b/actions/all.php index efa4521e21..3eb1852147 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(_("%1$s and friends, page %2$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); } diff --git a/actions/apiaccountverifycredentials.php b/actions/apiaccountverifycredentials.php index 08b201dbff..1095d51626 100644 --- a/actions/apiaccountverifycredentials.php +++ b/actions/apiaccountverifycredentials.php @@ -82,4 +82,18 @@ class ApiAccountVerifyCredentialsAction extends ApiAuthAction } + /** + * Is this action read only? + * + * @param array $args other arguments + * + * @return boolean true + * + **/ + + function isReadOnly($args) + { + return true; + } + } diff --git a/actions/apidirectmessage.php b/actions/apidirectmessage.php index 5b3f412adc..5fbc46518b 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 4367397707..3618f94018 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 f131d1c7f2..c4daf480e6 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 a824e734bf..1de2cc32e0 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 3d9b7e001c..91c6fd0324 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 8fc4367388..73ecc9249a 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 8827d1c5ce..028d76a782 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 08348e97bd..69ead0b531 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 4b718bce67..374cf83df0 100644 --- a/actions/apigroupjoin.php +++ b/actions/apigroupjoin.php @@ -145,14 +145,14 @@ class ApiGroupJoinAction extends ApiAuthAction switch($this->format) { case 'xml': - $this->show_single_xml_group($this->group); + $this->showSingleXmlGroup($this->group); break; case 'json': $this->showSingleJsonGroup($this->group); 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 7321ff5d26..9848ece053 100644 --- a/actions/apigroupleave.php +++ b/actions/apigroupleave.php @@ -131,14 +131,14 @@ class ApiGroupLeaveAction extends ApiAuthAction switch($this->format) { case 'xml': - $this->show_single_xml_group($this->group); + $this->showSingleXmlGroup($this->group); break; case 'json': $this->showSingleJsonGroup($this->group); 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 4cf657579d..66b67a030e 100644 --- a/actions/apigrouplist.php +++ b/actions/apigrouplist.php @@ -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 c597839a88..1921c1f193 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 dd2843161a..3c7c8e8835 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 aae4d249c3..7aa49b1bf3 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 f2c459e6fd..7b4017531c 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/apioauthaccesstoken.php b/actions/apioauthaccesstoken.php new file mode 100644 index 0000000000..085ef6f0b1 --- /dev/null +++ b/actions/apioauthaccesstoken.php @@ -0,0 +1,94 @@ +. + * + * @category API + * @package StatusNet + * @author Zach Copley + * @copyright 2010 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET')) { + exit(1); +} + +require_once INSTALLDIR . '/lib/apioauth.php'; + +/** + * Exchange an authorized OAuth request token for an access token + * + * @category API + * @package StatusNet + * @author Zach Copley + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +class ApiOauthAccessTokenAction extends ApiOauthAction +{ + + /** + * Class handler. + * + * @param array $args array of arguments + * + * @return void + */ + function handle($args) + { + parent::handle($args); + + $datastore = new ApiStatusNetOAuthDataStore(); + $server = new OAuthServer($datastore); + $hmac_method = new OAuthSignatureMethod_HMAC_SHA1(); + + $server->add_signature_method($hmac_method); + + $atok = null; + + try { + $req = OAuthRequest::from_request(); + $atok = $server->fetch_access_token($req); + + } catch (OAuthException $e) { + common_log(LOG_WARN, 'API OAuthException - ' . $e->getMessage()); + common_debug(var_export($req, true)); + $this->outputError($e->getMessage()); + return; + } + + if (empty($atok)) { + common_debug('couldn\'t get access token.'); + print "Token exchange failed. Has the request token been authorized?\n"; + } else { + print $atok; + } + } + + function outputError($msg) + { + header('HTTP/1.1 401 Unauthorized'); + header('Content-Type: text/html; charset=utf-8'); + print $msg . "\n"; + } +} + diff --git a/actions/apioauthauthorize.php b/actions/apioauthauthorize.php new file mode 100644 index 0000000000..19128bdcef --- /dev/null +++ b/actions/apioauthauthorize.php @@ -0,0 +1,376 @@ +. + * + * @category API + * @package StatusNet + * @author Zach Copley + * @copyright 2010 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET')) { + exit(1); +} + +require_once INSTALLDIR . '/lib/apioauth.php'; + +/** + * Authorize an OAuth request token + * + * @category API + * @package StatusNet + * @author Zach Copley + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +class ApiOauthAuthorizeAction extends ApiOauthAction +{ + var $oauth_token; + var $callback; + var $app; + var $nickname; + var $password; + var $store; + + /** + * Is this a read-only action? + * + * @return boolean false + */ + + function isReadOnly($args) + { + return false; + } + + function prepare($args) + { + parent::prepare($args); + + common_debug("apioauthauthorize"); + + $this->nickname = $this->trimmed('nickname'); + $this->password = $this->arg('password'); + $this->oauth_token = $this->arg('oauth_token'); + $this->callback = $this->arg('oauth_callback'); + $this->store = new ApiStatusNetOAuthDataStore(); + $this->app = $this->store->getAppByRequestToken($this->oauth_token); + + return true; + } + + /** + * Handle input, produce output + * + * Switches on request method; either shows the form or handles its input. + * + * @param array $args $_REQUEST data + * + * @return void + */ + + function handle($args) + { + parent::handle($args); + + if ($_SERVER['REQUEST_METHOD'] == 'POST') { + + $this->handlePost(); + + } else { + + // XXX: make better error messages + + if (empty($this->oauth_token)) { + + common_debug("No request token found."); + + $this->clientError(_('Bad request.')); + return; + } + + if (empty($this->app)) { + common_debug('No app for that token.'); + $this->clientError(_('Bad request.')); + return; + } + + $name = $this->app->name; + common_debug("Requesting auth for app: " . $name); + + $this->showForm(); + } + } + + function handlePost() + { + common_debug("handlePost()"); + + // check session token for CSRF protection. + + $token = $this->trimmed('token'); + + if (!$token || $token != common_session_token()) { + $this->showForm(_('There was a problem with your session token. '. + 'Try again, please.')); + return; + } + + // check creds + + $user = null; + + if (!common_logged_in()) { + $user = common_check_user($this->nickname, $this->password); + if (empty($user)) { + $this->showForm(_("Invalid nickname / password!")); + return; + } + } else { + $user = common_current_user(); + } + + if ($this->arg('allow')) { + + // mark the req token as authorized + + $this->store->authorize_token($this->oauth_token); + + // Check to see if there was a previous token associated + // with this user/app and kill it. If the user is doing this she + // probably doesn't want any old tokens anyway. + + $appUser = Oauth_application_user::getByKeys($user, $this->app); + + if (!empty($appUser)) { + $result = $appUser->delete(); + + if (!$result) { + common_log_db_error($appUser, 'DELETE', __FILE__); + throw new ServerException(_('DB error deleting OAuth app user.')); + return; + } + } + + // associated the authorized req token with the user and the app + + $appUser = new Oauth_application_user(); + + $appUser->profile_id = $user->id; + $appUser->application_id = $this->app->id; + + // Note: do not copy the access type from the application. + // The access type should always be 0 when the OAuth app + // user record has a request token associated with it. + // Access type gets assigned once an access token has been + // granted. The OAuth app user record then gets updated + // with the new access token and access type. + + $appUser->token = $this->oauth_token; + $appUser->created = common_sql_now(); + + $result = $appUser->insert(); + + if (!$result) { + common_log_db_error($appUser, 'INSERT', __FILE__); + throw new ServerException(_('DB error inserting OAuth app user.')); + return; + } + + // if we have a callback redirect and provide the token + + // A callback specified in the app setup overrides whatever + // is passed in with the request. + + common_debug("Req token is authorized - doing callback"); + + if (!empty($this->app->callback_url)) { + $this->callback = $this->app->callback_url; + } + + if (!empty($this->callback)) { + + // XXX: Need better way to build this redirect url. + + $target_url = $this->getCallback($this->callback, + array('oauth_token' => $this->oauth_token)); + + common_debug("Doing callback to $target_url"); + + common_redirect($target_url, 303); + } else { + common_debug("callback was empty!"); + } + + // otherwise inform the user that the rt was authorized + + $this->elementStart('p'); + + // XXX: Do OAuth 1.0a verifier code + + $this->raw(sprintf(_("The request token %s has been authorized. " . + 'Please exchange it for an access token.'), + $this->oauth_token)); + + $this->elementEnd('p'); + + } else if ($this->arg('deny')) { + + $this->elementStart('p'); + + $this->raw(sprintf(_("The request token %s has been denied."), + $this->oauth_token)); + + $this->elementEnd('p'); + } else { + $this->clientError(_('Unexpected form submission.')); + return; + } + } + + function showForm($error=null) + { + $this->error = $error; + $this->showPage(); + } + + function showScripts() + { + parent::showScripts(); + if (!common_logged_in()) { + $this->autofocus('nickname'); + } + } + + /** + * Title of the page + * + * @return string title of the page + */ + + function title() + { + return _('An application would like to connect to your account'); + } + + /** + * Shows the authorization form. + * + * @return void + */ + + function showContent() + { + $this->elementStart('form', array('method' => 'post', + 'id' => 'form_apioauthauthorize', + 'class' => 'form_settings', + 'action' => common_local_url('apioauthauthorize'))); + $this->elementStart('fieldset'); + $this->element('legend', array('id' => 'apioauthauthorize_allowdeny'), + _('Allow or deny access')); + + $this->hidden('token', common_session_token()); + $this->hidden('oauth_token', $this->oauth_token); + $this->hidden('oauth_callback', $this->callback); + + $this->elementStart('ul', 'form_data'); + $this->elementStart('li'); + $this->elementStart('p'); + if (!empty($this->app->icon)) { + $this->element('img', array('src' => $this->app->icon)); + } + + $access = ($this->app->access_type & Oauth_application::$writeAccess) ? + 'access and update' : 'access'; + + $msg = _("The application %1$s by %2$s would like " . + "the ability to %3$s your account data."); + + $this->raw(sprintf($msg, + $this->app->name, + $this->app->organization, + $access)); + $this->elementEnd('p'); + $this->elementEnd('li'); + $this->elementEnd('ul'); + + if (!common_logged_in()) { + + $this->elementStart('fieldset'); + $this->element('legend', null, _('Account')); + $this->elementStart('ul', 'form_data'); + $this->elementStart('li'); + $this->input('nickname', _('Nickname')); + $this->elementEnd('li'); + $this->elementStart('li'); + $this->password('password', _('Password')); + $this->elementEnd('li'); + $this->elementEnd('ul'); + + $this->elementEnd('fieldset'); + + } + + $this->element('input', array('id' => 'deny_submit', + 'class' => 'submit submit form_action-primary', + 'name' => 'deny', + 'type' => 'submit', + 'value' => _('Deny'))); + + $this->element('input', array('id' => 'allow_submit', + 'class' => 'submit submit form_action-secondary', + 'name' => 'allow', + 'type' => 'submit', + 'value' => _('Allow'))); + + $this->elementEnd('fieldset'); + $this->elementEnd('form'); + } + + /** + * Instructions for using the form + * + * For "remembered" logins, we make the user re-login when they + * try to change settings. Different instructions for this case. + * + * @return void + */ + + function getInstructions() + { + return _('Allow or deny access to your account information.'); + } + + /** + * A local menu + * + * Shows different login/register actions. + * + * @return void + */ + + function showLocalNav() + { + } + +} diff --git a/actions/apioauthrequesttoken.php b/actions/apioauthrequesttoken.php new file mode 100644 index 0000000000..467640b9aa --- /dev/null +++ b/actions/apioauthrequesttoken.php @@ -0,0 +1,99 @@ +. + * + * @category API + * @package StatusNet + * @author Zach Copley + * @copyright 2010 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET')) { + exit(1); +} + +require_once INSTALLDIR . '/lib/apioauth.php'; + +/** + * Get an OAuth request token + * + * @category API + * @package StatusNet + * @author Zach Copley + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +class ApiOauthRequestTokenAction extends ApiOauthAction +{ + /** + * Take arguments for running + * + * @param array $args $_REQUEST args + * + * @return boolean success flag + * + */ + + function prepare($args) + { + parent::prepare($args); + + $this->callback = $this->arg('oauth_callback'); + + if (!empty($this->callback)) { + common_debug("callback: $this->callback"); + } + + return true; + } + + /** + * Class handler. + * + * @param array $args array of arguments + * + * @return void + */ + function handle($args) + { + parent::handle($args); + + $datastore = new ApiStatusNetOAuthDataStore(); + $server = new OAuthServer($datastore); + $hmac_method = new OAuthSignatureMethod_HMAC_SHA1(); + + $server->add_signature_method($hmac_method); + + try { + $req = OAuthRequest::from_request(); + $token = $server->fetch_request_token($req); + print $token; + } catch (OAuthException $e) { + common_log(LOG_WARN, 'API OAuthException - ' . $e->getMessage()); + header('HTTP/1.1 401 Unauthorized'); + header('Content-Type: text/html; charset=utf-8'); + print $e->getMessage() . "\n"; + } + } + +} diff --git a/actions/apistatusesdestroy.php b/actions/apistatusesdestroy.php index 8dc8793b53..f7d52f0208 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 2efd59b37f..f7a3dd60a0 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 e26c009c44..0315d2953e 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/apistatusesupdate.php b/actions/apistatusesupdate.php index f594bbf393..f8bf7cf874 100644 --- a/actions/apistatusesupdate.php +++ b/actions/apistatusesupdate.php @@ -85,6 +85,11 @@ class ApiStatusesUpdateAction extends ApiAuthAction $this->lat = $this->trimmed('lat'); $this->lon = $this->trimmed('long'); + // try to set the source attr from OAuth app + if (empty($this->source)) { + $this->source = $this->oauth_source; + } + if (empty($this->source) || in_array($this->source, self::$reserved_sources)) { $this->source = 'api'; } diff --git a/actions/apistatusnetconfig.php b/actions/apistatusnetconfig.php index ed1d151bfc..ab96f2e5f9 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 bbf891a899..5109cd8062 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 2c691bb84c..0ba324057e 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 700f6e0fdc..1027d97d44 100644 --- a/actions/apitimelinefavorites.php +++ b/actions/apitimelinefavorites.php @@ -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 9ec7447e64..4e3827baea 100644 --- a/actions/apitimelinefriends.php +++ b/actions/apitimelinefriends.php @@ -72,7 +72,6 @@ class ApiTimelineFriendsAction extends ApiBareAuthAction function prepare($args) { parent::prepare($args); - common_debug("api friends_timeline"); $this->user = $this->getTargetUser($this->arg('id')); if (empty($this->user)) { @@ -153,7 +152,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 22c577f397..af414c6804 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 5f5ea37b13..828eae6cf6 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 19f40aebc9..9dc2162cc4 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 633f3c36e6..3f4a46c0fa 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 1e65678ad5..88652c3fdc 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 681b0b9e9e..113ab96d2c 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 479bff4315..6ca2c779cb 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 1a50520f45..1427d23b6a 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 14c62a52e7..830b16941d 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 aa7aec5a41..a7fe0dcc1e 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 934f14ec45..0b4caf5bf3 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; } diff --git a/actions/confirmaddress.php b/actions/confirmaddress.php index 6fd74f3ff7..cc8351d8dc 100644 --- a/actions/confirmaddress.php +++ b/actions/confirmaddress.php @@ -141,7 +141,7 @@ class ConfirmaddressAction extends Action function title() { - return _('Confirm Address'); + return _('Confirm address'); } /** diff --git a/actions/deletenotice.php b/actions/deletenotice.php index ba8e86d0f4..69cb1ebe87 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/editapplication.php b/actions/editapplication.php new file mode 100644 index 0000000000..3b120259a8 --- /dev/null +++ b/actions/editapplication.php @@ -0,0 +1,264 @@ +. + * + * @category Applications + * @package StatusNet + * @author Zach Copley + * @copyright 2008-2009 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET') && !defined('LACONICA')) { + exit(1); +} + +/** + * Edit the details of an OAuth application + * + * This is the form for editing an application + * + * @category Application + * @package StatusNet + * @author Zach Copley + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +class EditApplicationAction extends OwnerDesignAction +{ + var $msg = null; + var $owner = null; + var $app = null; + + function title() + { + return _('Edit application'); + } + + /** + * Prepare to run + */ + + function prepare($args) + { + parent::prepare($args); + + if (!common_logged_in()) { + $this->clientError(_('You must be logged in to edit an application.')); + return false; + } + + $id = (int)$this->arg('id'); + + $this->app = Oauth_application::staticGet($id); + $this->owner = User::staticGet($this->app->owner); + $cur = common_current_user(); + + if ($cur->id != $this->owner->id) { + $this->clientError(_('You are not the owner of this application.'), 401); + } + + if (!$this->app) { + $this->clientError(_('No such application.')); + return false; + } + + return true; + } + + /** + * Handle the request + * + * On GET, show the form. On POST, try to save the app. + * + * @param array $args unused + * + * @return void + */ + + function handle($args) + { + parent::handle($args); + + if ($_SERVER['REQUEST_METHOD'] == 'POST') { + $this->handlePost($args); + } else { + $this->showForm(); + } + } + + function handlePost($args) + { + // Workaround for PHP returning empty $_POST and $_FILES when POST + // length > post_max_size in php.ini + + if (empty($_FILES) + && empty($_POST) + && ($_SERVER['CONTENT_LENGTH'] > 0) + ) { + $msg = _('The server was unable to handle that much POST ' . + 'data (%s bytes) due to its current configuration.'); + $this->clientException(sprintf($msg, $_SERVER['CONTENT_LENGTH'])); + return; + } + + // CSRF protection + $token = $this->trimmed('token'); + if (!$token || $token != common_session_token()) { + $this->clientError(_('There was a problem with your session token.')); + return; + } + + $cur = common_current_user(); + + if ($this->arg('cancel')) { + common_redirect(common_local_url('showapplication', + array('id' => $this->app->id)), 303); + } elseif ($this->arg('save')) { + $this->trySave(); + } else { + $this->clientError(_('Unexpected form submission.')); + } + } + + function showForm($msg=null) + { + $this->msg = $msg; + $this->showPage(); + } + + function showContent() + { + $form = new ApplicationEditForm($this, $this->app); + $form->show(); + } + + function showPageNotice() + { + if (!empty($this->msg)) { + $this->element('p', 'error', $this->msg); + } else { + $this->element('p', 'instructions', + _('Use this form to edit your application.')); + } + } + + function trySave() + { + $name = $this->trimmed('name'); + $description = $this->trimmed('description'); + $source_url = $this->trimmed('source_url'); + $organization = $this->trimmed('organization'); + $homepage = $this->trimmed('homepage'); + $callback_url = $this->trimmed('callback_url'); + $type = $this->arg('app_type'); + $access_type = $this->arg('default_access_type'); + + if (empty($name)) { + $this->showForm(_('Name is required.')); + return; + } elseif (mb_strlen($name) > 255) { + $this->showForm(_('Name is too long (max 255 chars).')); + return; + } elseif (empty($description)) { + $this->showForm(_('Description is required.')); + return; + } elseif (Oauth_application::descriptionTooLong($description)) { + $this->showForm(sprintf( + _('Description is too long (max %d chars).'), + Oauth_application::maxDescription())); + return; + } elseif (mb_strlen($source_url) > 255) { + $this->showForm(_('Source URL is too long.')); + return; + } elseif ((mb_strlen($source_url) > 0) + && !Validate::uri($source_url, + array('allowed_schemes' => array('http', 'https')))) + { + $this->showForm(_('Source URL is not valid.')); + return; + } elseif (empty($organization)) { + $this->showForm(_('Organization is required.')); + return; + } elseif (mb_strlen($organization) > 255) { + $this->showForm(_('Organization is too long (max 255 chars).')); + return; + } elseif (empty($homepage)) { + $this->showForm(_('Organization homepage is required.')); + return; + } elseif ((mb_strlen($homepage) > 0) + && !Validate::uri($homepage, + array('allowed_schemes' => array('http', 'https')))) + { + $this->showForm(_('Homepage is not a valid URL.')); + return; + } elseif (mb_strlen($callback_url) > 255) { + $this->showForm(_('Callback is too long.')); + return; + } elseif (mb_strlen($callback_url) > 0 + && !Validate::uri($source_url, + array('allowed_schemes' => array('http', 'https')) + )) + { + $this->showForm(_('Callback URL is not valid.')); + return; + } + + $cur = common_current_user(); + + // Checked in prepare() above + + assert(!is_null($cur)); + assert(!is_null($this->app)); + + $orig = clone($this->app); + + $this->app->name = $name; + $this->app->description = $description; + $this->app->source_url = $source_url; + $this->app->organization = $organization; + $this->app->homepage = $homepage; + $this->app->callback_url = $callback_url; + $this->app->type = $type; + + common_debug("access_type = $access_type"); + + if ($access_type == 'r') { + $this->app->access_type = 1; + } else { + $this->app->access_type = 3; + } + + $result = $this->app->update($orig); + + if (!$result) { + common_log_db_error($this->app, 'UPDATE', __FILE__); + $this->serverError(_('Could not update application.')); + } + + $this->app->uploadLogo(); + + common_redirect(common_local_url('oauthappssettings'), 303); + } + +} + diff --git a/actions/editgroup.php b/actions/editgroup.php index cf16080356..ad0b6e185d 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 761aaa8f31..bfef2970da 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/groupbyid.php b/actions/groupbyid.php index f65bf511af..5af7109cb4 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 1c998efe1e..e290ba5141 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 a9dc7eb1d9..f197aef33e 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 5c59594c56..0f47c268dd 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; } diff --git a/actions/imsettings.php b/actions/imsettings.php index f57933b43f..751c6117cd 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/joingroup.php b/actions/joingroup.php index 5ca34bd9cc..235e5ab4c2 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; } @@ -115,17 +115,13 @@ class JoingroupAction extends Action $cur = common_current_user(); - $member = new Group_member(); - - $member->group_id = $this->group->id; - $member->profile_id = $cur->id; - $member->created = common_sql_now(); - - $result = $member->insert(); - - if (!$result) { - common_log_db_error($member, 'INSERT', __FILE__); - $this->serverError(sprintf(_('Could not join user %1$s to group %2$s'), + try { + if (Event::handle('StartJoinGroup', array($this->group, $cur))) { + Group_member::join($this->group->id, $cur->id); + Event::handle('EndJoinGroup', array($this->group, $cur)); + } + } catch (Exception $e) { + $this->serverError(sprintf(_('Could not join user %1$s to group %2$s.'), $cur->nickname, $this->group->nickname)); } diff --git a/actions/leavegroup.php b/actions/leavegroup.php index b0f973e1ac..9b9d83b6ca 100644 --- a/actions/leavegroup.php +++ b/actions/leavegroup.php @@ -110,22 +110,15 @@ class LeavegroupAction extends Action $cur = common_current_user(); - $member = new Group_member(); - - $member->group_id = $this->group->id; - $member->profile_id = $cur->id; - - if (!$member->find(true)) { - $this->serverError(_('Could not find membership record.')); - return; - } - - $result = $member->delete(); - - if (!$result) { - common_log_db_error($member, 'DELETE', __FILE__); + try { + if (Event::handle('StartLeaveGroup', array($this->group, $cur))) { + Group_member::leave($this->group->id, $cur->id); + Event::handle('EndLeaveGroup', array($this->group, $cur)); + } + } catch (Exception $e) { $this->serverError(sprintf(_('Could not remove user %1$s from group %2$s.'), $cur->nickname, $this->group->nickname)); + return; } if ($this->boolean('ajax')) { diff --git a/actions/login.php b/actions/login.php index c775fa6924..8ea3c800b7 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 - // 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); + } - // 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); + $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 250ade221e..9ad7d6e7c8 100644 --- a/actions/makeadmin.php +++ b/actions/makeadmin.php @@ -129,7 +129,7 @@ class MakeadminAction extends Action 'profile_id' => $this->profile->id)); if (empty($member)) { - $this->serverError(_('Can\'t get membership record for %1$s in group %2$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 %1$s an admin for group %2$s'), + $this->serverError(_('Can\'t make %1$s an admin for group %2$s.'), $this->profile->getBestName(), $this->group->getBestName()); } diff --git a/actions/newapplication.php b/actions/newapplication.php new file mode 100644 index 0000000000..bc5b4edaf8 --- /dev/null +++ b/actions/newapplication.php @@ -0,0 +1,277 @@ +. + * + * @category Applications + * @package StatusNet + * @author Zach Copley + * @copyright 2008-2009 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET') && !defined('LACONICA')) { + exit(1); +} + +/** + * Add a new application + * + * This is the form for adding a new application + * + * @category Application + * @package StatusNet + * @author Zach Copley + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +class NewApplicationAction extends OwnerDesignAction +{ + var $msg; + + function title() + { + return _('New application'); + } + + /** + * Prepare to run + */ + + function prepare($args) + { + parent::prepare($args); + + if (!common_logged_in()) { + $this->clientError(_('You must be logged in to register an application.')); + return false; + } + + return true; + } + + /** + * Handle the request + * + * On GET, show the form. On POST, try to save the app. + * + * @param array $args unused + * + * @return void + */ + + function handle($args) + { + parent::handle($args); + + if ($_SERVER['REQUEST_METHOD'] == 'POST') { + $this->handlePost($args); + } else { + $this->showForm(); + } + } + + function handlePost($args) + { + // Workaround for PHP returning empty $_POST and $_FILES when POST + // length > post_max_size in php.ini + + if (empty($_FILES) + && empty($_POST) + && ($_SERVER['CONTENT_LENGTH'] > 0) + ) { + $msg = _('The server was unable to handle that much POST ' . + 'data (%s bytes) due to its current configuration.'); + $this->clientException(sprintf($msg, $_SERVER['CONTENT_LENGTH'])); + return; + } + + // CSRF protection + $token = $this->trimmed('token'); + if (!$token || $token != common_session_token()) { + $this->clientError(_('There was a problem with your session token.')); + return; + } + + $cur = common_current_user(); + + if ($this->arg('cancel')) { + common_redirect(common_local_url('oauthappssettings'), 303); + } elseif ($this->arg('save')) { + $this->trySave(); + } else { + $this->clientError(_('Unexpected form submission.')); + } + } + + function showForm($msg=null) + { + $this->msg = $msg; + $this->showPage(); + } + + function showContent() + { + $form = new ApplicationEditForm($this); + $form->show(); + } + + function showPageNotice() + { + if ($this->msg) { + $this->element('p', 'error', $this->msg); + } else { + $this->element('p', 'instructions', + _('Use this form to register a new application.')); + } + } + + function trySave() + { + $name = $this->trimmed('name'); + $description = $this->trimmed('description'); + $source_url = $this->trimmed('source_url'); + $organization = $this->trimmed('organization'); + $homepage = $this->trimmed('homepage'); + $callback_url = $this->trimmed('callback_url'); + $type = $this->arg('app_type'); + $access_type = $this->arg('default_access_type'); + + if (empty($name)) { + $this->showForm(_('Name is required.')); + return; + } elseif (mb_strlen($name) > 255) { + $this->showForm(_('Name is too long (max 255 chars).')); + return; + } elseif (empty($description)) { + $this->showForm(_('Description is required.')); + return; + } elseif (Oauth_application::descriptionTooLong($description)) { + $this->showForm(sprintf( + _('Description is too long (max %d chars).'), + Oauth_application::maxDescription())); + return; + } elseif (empty($source_url)) { + $this->showForm(_('Source URL is required.')); + return; + } elseif ((strlen($source_url) > 0) + && !Validate::uri( + $source_url, + array('allowed_schemes' => array('http', 'https')) + ) + ) + { + $this->showForm(_('Source URL is not valid.')); + return; + } elseif (empty($organization)) { + $this->showForm(_('Organization is required.')); + return; + } elseif (mb_strlen($organization) > 255) { + $this->showForm(_('Organization is too long (max 255 chars).')); + return; + } elseif (empty($homepage)) { + $this->showForm(_('Organization homepage is required.')); + return; + } elseif ((strlen($homepage) > 0) + && !Validate::uri( + $homepage, + array('allowed_schemes' => array('http', 'https')) + ) + ) + { + $this->showForm(_('Homepage is not a valid URL.')); + return; + } elseif (mb_strlen($callback_url) > 255) { + $this->showForm(_('Callback is too long.')); + return; + } elseif (strlen($callback_url) > 0 + && !Validate::uri( + $source_url, + array('allowed_schemes' => array('http', 'https')) + ) + ) + { + $this->showForm(_('Callback URL is not valid.')); + return; + } + + $cur = common_current_user(); + + // Checked in prepare() above + + assert(!is_null($cur)); + + $app = new Oauth_application(); + + $app->query('BEGIN'); + + $app->name = $name; + $app->owner = $cur->id; + $app->description = $description; + $app->source_url = $source_url; + $app->organization = $organization; + $app->homepage = $homepage; + $app->callback_url = $callback_url; + $app->type = $type; + + // Yeah, I dunno why I chose bit flags. I guess so I could + // copy this value directly to Oauth_application_user + // access_type which I think does need bit flags -- Z + + if ($access_type == 'r') { + $app->setAccessFlags(true, false); + } else { + $app->setAccessFlags(true, true); + } + + $app->created = common_sql_now(); + + // generate consumer key and secret + + $consumer = Consumer::generateNew(); + + $result = $consumer->insert(); + + if (!$result) { + common_log_db_error($consumer, 'INSERT', __FILE__); + $this->serverError(_('Could not create application.')); + } + + $app->consumer_key = $consumer->consumer_key; + + $this->app_id = $app->insert(); + + if (!$this->app_id) { + common_log_db_error($app, 'INSERT', __FILE__); + $this->serverError(_('Could not create application.')); + $app->query('ROLLBACK'); + } + + $app->uploadLogo(); + + $app->query('COMMIT'); + + common_redirect(common_local_url('oauthappssettings'), 303); + + } + +} + diff --git a/actions/newmessage.php b/actions/newmessage.php index 3504520913..25e58feab3 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/oauthappssettings.php b/actions/oauthappssettings.php new file mode 100644 index 0000000000..6c0670b17b --- /dev/null +++ b/actions/oauthappssettings.php @@ -0,0 +1,166 @@ +. + * + * @category Settings + * @package StatusNet + * @author Zach Copley + * @copyright 2008-2009 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET') && !defined('LACONICA')) { + exit(1); +} + +require_once INSTALLDIR . '/lib/settingsaction.php'; +require_once INSTALLDIR . '/lib/applicationlist.php'; + +/** + * Show a user's registered OAuth applications + * + * @category Settings + * @package StatusNet + * @author Zach Copley + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + * + * @see SettingsAction + */ + +class OauthappssettingsAction extends SettingsAction +{ + var $page = 0; + + function prepare($args) + { + parent::prepare($args); + $this->page = ($this->arg('page')) ? ($this->arg('page') + 0) : 1; + + if (!common_logged_in()) { + $this->clientError(_('You must be logged in to list your applications.')); + return false; + } + + return true; + } + + /** + * Title of the page + * + * @return string Title of the page + */ + + function title() + { + return _('OAuth applications'); + } + + /** + * Instructions for use + * + * @return instructions for use + */ + + function getInstructions() + { + return _('Applications you have registered'); + } + + /** + * Content area of the page + * + * @return void + */ + + function showContent() + { + $user = common_current_user(); + + $offset = ($this->page - 1) * APPS_PER_PAGE; + $limit = APPS_PER_PAGE + 1; + + $application = new Oauth_application(); + $application->owner = $user->id; + $application->limit($offset, $limit); + $application->orderBy('created DESC'); + $application->find(); + + $cnt = 0; + + if ($application) { + $al = new ApplicationList($application, $user, $this); + $cnt = $al->show(); + if (0 == $cnt) { + $this->showEmptyListMessage(); + } + } + + $this->elementStart('p', array('id' => 'application_register')); + $this->element('a', + array('href' => common_local_url('newapplication'), + 'class' => 'more' + ), + 'Register a new application'); + $this->elementEnd('p'); + + $this->pagination( + $this->page > 1, + $cnt > APPS_PER_PAGE, + $this->page, + 'oauthappssettings' + ); + } + + function showEmptyListMessage() + { + $message = sprintf(_('You have not registered any applications yet.')); + + $this->elementStart('div', 'guide'); + $this->raw(common_markup_to_html($message)); + $this->elementEnd('div'); + } + + /** + * Handle posts to this form + * + * Based on the button that was pressed, muxes out to other functions + * to do the actual task requested. + * + * All sub-functions reload the form with a message -- success or failure. + * + * @return void + */ + + function handlePost() + { + // CSRF protection + + $token = $this->trimmed('token'); + if (!$token || $token != common_session_token()) { + $this->showForm(_('There was a problem with your session token. '. + 'Try again, please.')); + return; + } + + } + +} diff --git a/actions/oauthconnectionssettings.php b/actions/oauthconnectionssettings.php new file mode 100644 index 0000000000..c2e8d441b0 --- /dev/null +++ b/actions/oauthconnectionssettings.php @@ -0,0 +1,212 @@ +. + * + * @category Settings + * @package StatusNet + * @author Zach Copley + * @copyright 2008-2009 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET') && !defined('LACONICA')) { + exit(1); +} + +require_once INSTALLDIR . '/lib/connectsettingsaction.php'; +require_once INSTALLDIR . '/lib/applicationlist.php'; + +/** + * Show connected OAuth applications + * + * @category Settings + * @package StatusNet + * @author Zach Copley + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + * + * @see SettingsAction + */ + +class OauthconnectionssettingsAction extends ConnectSettingsAction +{ + + var $page = null; + var $id = null; + + function prepare($args) + { + parent::prepare($args); + $this->id = (int)$this->arg('id'); + $this->page = ($this->arg('page')) ? ($this->arg('page') + 0) : 1; + return true; + } + + /** + * Title of the page + * + * @return string Title of the page + */ + + function title() + { + return _('Connected applications'); + } + + function isReadOnly($args) + { + return true; + } + + /** + * Instructions for use + * + * @return instructions for use + */ + + function getInstructions() + { + return _('You have allowed the following applications to access you account.'); + } + + /** + * Content area of the page + * + * @return void + */ + + function showContent() + { + $user = common_current_user(); + $profile = $user->getProfile(); + + $offset = ($this->page - 1) * APPS_PER_PAGE; + $limit = APPS_PER_PAGE + 1; + + $application = $profile->getApplications($offset, $limit); + + $cnt == 0; + + if (!empty($application)) { + $al = new ApplicationList($application, $user, $this, true); + $cnt = $al->show(); + } + + if ($cnt == 0) { + $this->showEmptyListMessage(); + } + + $this->pagination($this->page > 1, $cnt > APPS_PER_PAGE, + $this->page, 'connectionssettings', + array('nickname' => $this->user->nickname)); + } + + /** + * Handle posts to this form + * + * Based on the button that was pressed, muxes out to other functions + * to do the actual task requested. + * + * All sub-functions reload the form with a message -- success or failure. + * + * @return void + */ + + function handlePost() + { + // CSRF protection + + $token = $this->trimmed('token'); + if (!$token || $token != common_session_token()) { + $this->showForm(_('There was a problem with your session token. '. + 'Try again, please.')); + return; + } + + if ($this->arg('revoke')) { + $this->revokeAccess($this->id); + + // XXX: Show some indicator to the user of what's been done. + + $this->showPage(); + } else { + $this->clientError(_('Unexpected form submission.'), 401); + return false; + } + } + + function revokeAccess($appId) + { + $cur = common_current_user(); + + $app = Oauth_application::staticGet('id', $appId); + + if (empty($app)) { + $this->clientError(_('No such application.'), 404); + return false; + } + + $appUser = Oauth_application_user::getByKeys($cur, $app); + + if (empty($appUser)) { + $this->clientError(_('You are not a user of that application.'), 401); + return false; + } + + $orig = clone($appUser); + $appUser->access_type = 0; // No access + $result = $appUser->update(); + + if (!$result) { + common_log_db_error($orig, 'UPDATE', __FILE__); + $this->clientError(_('Unable to revoke access for app: ' . $app->id)); + return false; + } + + $msg = 'User %s (id: %d) revoked access to app %s (id: %d)'; + common_log(LOG_INFO, sprintf($msg, $cur->nickname, + $cur->id, $app->name, $app->id)); + + } + + function showEmptyListMessage() + { + $message = sprintf(_('You have not authorized any applications to use your account.')); + + $this->elementStart('div', 'guide'); + $this->raw(common_markup_to_html($message)); + $this->elementEnd('div'); + } + + function showSections() + { + $cur = common_current_user(); + + $this->element('h2', null, 'Developers'); + $this->elementStart('p'); + $this->raw(_('Developers can edit the registration settings for their applications ')); + $this->element('a', + array('href' => common_local_url('oauthappssettings')), + 'here.'); + $this->elementEnd('p'); + } + +} diff --git a/actions/othersettings.php b/actions/othersettings.php index 0de7cd9086..10e9873b39 100644 --- a/actions/othersettings.php +++ b/actions/othersettings.php @@ -57,7 +57,7 @@ class OthersettingsAction extends AccountSettingsAction function title() { - return _('Other Settings'); + return _('Other settings'); } /** diff --git a/actions/otp.php b/actions/otp.php new file mode 100644 index 0000000000..acf84aee81 --- /dev/null +++ b/actions/otp.php @@ -0,0 +1,145 @@ +. + * + * @category Login + * @package StatusNet + * @author Evan Prodromou + * @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 + * @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/pathsadminpanel.php b/actions/pathsadminpanel.php index d39c7c449a..3779fcfaaa 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/register.php b/actions/register.php index 96015c2190..6981373467 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.')); diff --git a/actions/showapplication.php b/actions/showapplication.php new file mode 100644 index 0000000000..a6ff425c7c --- /dev/null +++ b/actions/showapplication.php @@ -0,0 +1,327 @@ +. + * + * @category Application + * @package StatusNet + * @author Zach Copley + * @copyright 2008-2009 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET') && !defined('LACONICA')) { + exit(1); +} + +/** + * Show an OAuth application + * + * @category Application + * @package StatusNet + * @author Zach Copley + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +class ShowApplicationAction extends OwnerDesignAction +{ + /** + * Application to show + */ + + var $application = null; + + /** + * User who owns the app + */ + + var $owner = null; + + var $msg = null; + + var $success = null; + + /** + * Load attributes based on database arguments + * + * Loads all the DB stuff + * + * @param array $args $_REQUEST array + * + * @return success flag + */ + + function prepare($args) + { + parent::prepare($args); + + $id = (int)$this->arg('id'); + + $this->application = Oauth_application::staticGet($id); + $this->owner = User::staticGet($this->application->owner); + + if (!common_logged_in()) { + $this->clientError(_('You must be logged in to view an application.')); + return false; + } + + if (empty($this->application)) { + $this->clientError(_('No such application.'), 404); + return false; + } + + $cur = common_current_user(); + + if ($cur->id != $this->owner->id) { + $this->clientError(_('You are not the owner of this application.'), 401); + return false; + } + + return true; + } + + /** + * Handle the request + * + * Shows info about the app + * + * @return void + */ + + function handle($args) + { + parent::handle($args); + + if ($_SERVER['REQUEST_METHOD'] == 'POST') { + + // CSRF protection + $token = $this->trimmed('token'); + if (!$token || $token != common_session_token()) { + $this->clientError(_('There was a problem with your session token.')); + return; + } + + if ($this->arg('reset')) { + $this->resetKey(); + } + } else { + $this->showPage(); + } + } + + /** + * Title of the page + * + * @return string title of the page + */ + + function title() + { + if (!empty($this->application->name)) { + return 'Application: ' . $this->application->name; + } + } + + function showPageNotice() + { + if (!empty($this->msg)) { + $this->element('div', ($this->success) ? 'success' : 'error', $this->msg); + } + } + + function showContent() + { + + $cur = common_current_user(); + + $consumer = $this->application->getConsumer(); + + $this->elementStart('div', 'entity_profile vcard'); + $this->element('h2', null, _('Application profile')); + $this->elementStart('dl', 'entity_depiction'); + $this->element('dt', null, _('Icon')); + $this->elementStart('dd'); + if (!empty($this->application->icon)) { + $this->element('img', array('src' => $this->application->icon, + 'class' => 'photo logo')); + } + $this->elementEnd('dd'); + $this->elementEnd('dl'); + + $this->elementStart('dl', 'entity_fn'); + $this->element('dt', null, _('Name')); + $this->elementStart('dd'); + $this->element('a', array('href' => $this->application->source_url, + 'class' => 'url fn'), + $this->application->name); + $this->elementEnd('dd'); + $this->elementEnd('dl'); + + $this->elementStart('dl', 'entity_org'); + $this->element('dt', null, _('Organization')); + $this->elementStart('dd'); + $this->element('a', array('href' => $this->application->homepage, + 'class' => 'url'), + $this->application->organization); + $this->elementEnd('dd'); + $this->elementEnd('dl'); + + $this->elementStart('dl', 'entity_note'); + $this->element('dt', null, _('Description')); + $this->element('dd', 'note', $this->application->description); + $this->elementEnd('dl'); + + $this->elementStart('dl', 'entity_statistics'); + $this->element('dt', null, _('Statistics')); + $this->elementStart('dd'); + $defaultAccess = ($this->application->access_type & Oauth_application::$writeAccess) + ? 'read-write' : 'read-only'; + $profile = Profile::staticGet($this->application->owner); + + $appUsers = new Oauth_application_user(); + $appUsers->application_id = $this->application->id; + $userCnt = $appUsers->count(); + + $this->raw(sprintf( + _('created by %1$s - %2$s access by default - %3$d users'), + $profile->getBestName(), + $defaultAccess, + $userCnt + )); + $this->elementEnd('dd'); + $this->elementEnd('dl'); + $this->elementEnd('div'); + + $this->elementStart('div', 'entity_actions'); + $this->element('h2', null, _('Application actions')); + $this->elementStart('ul'); + $this->elementStart('li', 'entity_edit'); + $this->element('a', + array('href' => common_local_url('editapplication', + array('id' => $this->application->id))), + 'Edit'); + $this->elementEnd('li'); + + $this->elementStart('li', 'entity_reset_keysecret'); + $this->elementStart('form', array( + 'id' => 'forma_reset_key', + 'class' => 'form_reset_key', + 'method' => 'POST', + 'action' => common_local_url('showapplication', + array('id' => $this->application->id)))); + + $this->elementStart('fieldset'); + $this->hidden('token', common_session_token()); + $this->submit('reset', _('Reset key & secret')); + $this->elementEnd('fieldset'); + $this->elementEnd('form'); + $this->elementEnd('li'); + $this->elementEnd('ul'); + $this->elementEnd('div'); + + $this->elementStart('div', 'entity_data'); + $this->element('h2', null, _('Application info')); + $this->elementStart('dl', 'entity_consumer_key'); + $this->element('dt', null, _('Consumer key')); + $this->element('dd', null, $consumer->consumer_key); + $this->elementEnd('dl'); + + $this->elementStart('dl', 'entity_consumer_secret'); + $this->element('dt', null, _('Consumer secret')); + $this->element('dd', null, $consumer->consumer_secret); + $this->elementEnd('dl'); + + $this->elementStart('dl', 'entity_request_token_url'); + $this->element('dt', null, _('Request token URL')); + $this->element('dd', null, common_local_url('apioauthrequesttoken')); + $this->elementEnd('dl'); + + $this->elementStart('dl', 'entity_access_token_url'); + $this->element('dt', null, _('Access token URL')); + $this->element('dd', null, common_local_url('apioauthaccesstoken')); + $this->elementEnd('dl'); + + $this->elementStart('dl', 'entity_authorize_url'); + $this->element('dt', null, _('Authorize URL')); + $this->element('dd', null, common_local_url('apioauthauthorize')); + $this->elementEnd('dl'); + + $this->element('p', 'note', + _('Note: We support HMAC-SHA1 signatures. We do not support the plaintext signature method.')); + $this->elementEnd('div'); + + $this->elementStart('p', array('id' => 'application_action')); + $this->element('a', + array('href' => common_local_url('oauthappssettings'), + 'class' => 'more'), + 'View your applications'); + $this->elementEnd('p'); + } + + function resetKey() + { + $this->application->query('BEGIN'); + + $consumer = $this->application->getConsumer(); + $result = $consumer->delete(); + + if (!$result) { + common_log_db_error($consumer, 'DELETE', __FILE__); + $this->success = false; + $this->msg = ('Unable to reset consumer key and secret.'); + $this->showPage(); + return; + } + + $consumer = Consumer::generateNew(); + + $result = $consumer->insert(); + + if (!$result) { + common_log_db_error($consumer, 'INSERT', __FILE__); + $this->application->query('ROLLBACK'); + $this->success = false; + $this->msg = ('Unable to reset consumer key and secret.'); + $this->showPage(); + return; + } + + $orig = clone($this->application); + $this->application->consumer_key = $consumer->consumer_key; + $result = $this->application->update($orig); + + if (!$result) { + common_log_db_error($application, 'UPDATE', __FILE__); + $this->application->query('ROLLBACK'); + $this->success = false; + $this->msg = ('Unable to reset consumer key and secret.'); + $this->showPage(); + return; + } + + $this->application->query('COMMIT'); + + $this->success = true; + $this->msg = ('Consumer key and secret reset.'); + $this->showPage(); + } + +} diff --git a/actions/showgroup.php b/actions/showgroup.php index c0de4c653b..06ae572e81 100644 --- a/actions/showgroup.php +++ b/actions/showgroup.php @@ -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/siteadminpanel.php b/actions/siteadminpanel.php index 5e29f4c191..dd388a18a2 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 672abcef8c..751495d57a 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/subscribe.php b/actions/subscribe.php index 4c46806e40..a90d7facdf 100644 --- a/actions/subscribe.php +++ b/actions/subscribe.php @@ -58,7 +58,7 @@ class SubscribeAction extends Action $result = subs_subscribe_to($user, $other); - if($result != true) { + if (is_string($result)) { $this->clientError($result); return; } diff --git a/actions/tagother.php b/actions/tagother.php index e9e13b939b..735d876da2 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 4a5863489e..6bb10d448b 100644 --- a/actions/unsubscribe.php +++ b/actions/unsubscribe.php @@ -81,13 +81,13 @@ 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; } $result = subs_unsubscribe_to($user, $other); - if ($result != true) { + if (is_string($result)) { $this->clientError($result); return; } diff --git a/actions/userdesignsettings.php b/actions/userdesignsettings.php index 31a097970d..1cf8780006 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/version.php b/actions/version.php index c1f673c45c..b6593e5edb 100644 --- a/actions/version.php +++ b/actions/version.php @@ -266,5 +266,6 @@ class VersionAction extends Action 'Craig Andrews', 'mEDI', 'Brett Taylor', - 'Brigitte Schuster'); + 'Brigitte Schuster', + 'Brion Vibber'); } diff --git a/classes/Consumer.php b/classes/Consumer.php index d5b7b7e33a..ad64a8491b 100644 --- a/classes/Consumer.php +++ b/classes/Consumer.php @@ -4,16 +4,17 @@ */ require_once INSTALLDIR.'/classes/Memcached_DataObject.php'; -class Consumer extends Memcached_DataObject +class Consumer extends Memcached_DataObject { ###START_AUTOCODE /* the code below is auto generated do not remove the above tag */ public $__table = 'consumer'; // table name public $consumer_key; // varchar(255) primary_key not_null + public $consumer_secret; // varchar(255) not_null public $seed; // char(32) not_null - public $created; // datetime() not_null - public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP + public $created; // datetime not_null + public $modified; // timestamp not_null default_CURRENT_TIMESTAMP /* Static get */ function staticGet($k,$v=null) @@ -21,4 +22,18 @@ class Consumer extends Memcached_DataObject /* the code above is auto generated do not remove the tag below */ ###END_AUTOCODE + + static function generateNew() + { + $cons = new Consumer(); + $rand = common_good_rand(16); + + $cons->seed = $rand; + $cons->consumer_key = md5(time() + $rand); + $cons->consumer_secret = md5(md5(time() + time() + $rand)); + $cons->created = common_sql_now(); + + return $cons; + } + } diff --git a/classes/File.php b/classes/File.php index 6173f31d6e..c527c4ffe9 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 e41ccfd097..11f160718e 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/Group_member.php b/classes/Group_member.php index 069b2c7a1c..7b1760f767 100644 --- a/classes/Group_member.php +++ b/classes/Group_member.php @@ -25,4 +25,41 @@ class Group_member extends Memcached_DataObject { return Memcached_DataObject::pkeyGet('Group_member', $kv); } + + static function join($group_id, $profile_id) + { + $member = new Group_member(); + + $member->group_id = $group_id; + $member->profile_id = $profile_id; + $member->created = common_sql_now(); + + $result = $member->insert(); + + if (!$result) { + common_log_db_error($member, 'INSERT', __FILE__); + throw new Exception(_("Group join failed.")); + } + + return true; + } + + static function leave($group_id, $profile_id) + { + $member = Group_member::pkeyGet(array('group_id' => $group_id, + 'profile_id' => $profile_id)); + + if (empty($member)) { + throw new Exception(_("Not part of group.")); + } + + $result = $member->delete(); + + if (!$result) { + common_log_db_error($member, 'INSERT', __FILE__); + throw new Exception(_("Group leave failed.")); + } + + return true; + } } diff --git a/classes/Inbox.php b/classes/Inbox.php new file mode 100644 index 0000000000..086dba1c9d --- /dev/null +++ b/classes/Inbox.php @@ -0,0 +1,180 @@ +. + * + * @category Data + * @package StatusNet + * @author Evan Prodromou + * @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/ + */ + +require_once INSTALLDIR.'/classes/Memcached_DataObject.php'; + +class Inbox extends Memcached_DataObject +{ + const BOXCAR = 128; + + ###START_AUTOCODE + /* the code below is auto generated do not remove the above tag */ + + public $__table = 'inbox'; // table name + public $user_id; // int(4) primary_key not_null + public $notice_ids; // blob + + /* Static get */ + function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Inbox',$k,$v); } + + /* the code above is auto generated do not remove the tag below */ + ###END_AUTOCODE + + function sequenceKey() + { + return array(false, false, false); + } + + /** + * Create a new inbox from existing Notice_inbox stuff + */ + + static function initialize($user_id) + { + $inbox = Inbox::fromNoticeInbox($user_id); + + unset($inbox->fake); + + $result = $inbox->insert(); + + if (!$result) { + common_log_db_error($inbox, 'INSERT', __FILE__); + return null; + } + + return $inbox; + } + + static function fromNoticeInbox($user_id) + { + $ids = array(); + + $ni = new Notice_inbox(); + + $ni->user_id = $user_id; + $ni->selectAdd(); + $ni->selectAdd('notice_id'); + $ni->orderBy('notice_id DESC'); + $ni->limit(0, 1024); + + if ($ni->find()) { + while($ni->fetch()) { + $ids[] = $ni->notice_id; + } + } + + $ni->free(); + unset($ni); + + $inbox = new Inbox(); + + $inbox->user_id = $user_id; + $inbox->notice_ids = call_user_func_array('pack', array_merge(array('N*'), $ids)); + $inbox->fake = true; + + return $inbox; + } + + static function insertNotice($user_id, $notice_id) + { + $inbox = DB_DataObject::staticGet('inbox', 'user_id', $user_id); + + if (empty($inbox)) { + $inbox = Inbox::initialize($user_id); + } + + if (empty($inbox)) { + return false; + } + + $result = $inbox->query(sprintf('UPDATE inbox '. + 'set notice_ids = concat(cast(0x%08x as binary(4)), '. + 'substr(notice_ids, 1, 4092)) '. + 'WHERE user_id = %d', + $notice_id, $user_id)); + + if ($result) { + $c = self::memcache(); + + if (!empty($c)) { + $c->delete(self::cacheKey('inbox', 'user_id', $user_id)); + } + } + + return $result; + } + + static function bulkInsert($notice_id, $user_ids) + { + foreach ($user_ids as $user_id) + { + Inbox::insertNotice($user_id, $notice_id); + } + } + + function stream($user_id, $offset, $limit, $since_id, $max_id, $since, $own=false) + { + $inbox = Inbox::staticGet('user_id', $user_id); + + if (empty($inbox)) { + $inbox = Inbox::fromNoticeInbox($user_id); + if (empty($inbox)) { + return array(); + } else { + $inbox->encache(); + } + } + + $ids = unpack('N*', $inbox->notice_ids); + + if (!empty($since_id)) { + $newids = array(); + foreach ($ids as $id) { + if ($id > $since_id) { + $newids[] = $id; + } + } + $ids = $newids; + } + + if (!empty($max_id)) { + $newids = array(); + foreach ($ids as $id) { + if ($id <= $max_id) { + $newids[] = $id; + } + } + $ids = $newids; + } + + $ids = array_slice($ids, $offset, $limit); + + return $ids; + } +} diff --git a/classes/Login_token.php b/classes/Login_token.php index 746cd7f229..51dc61262e 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 400b05f977..4ecab9db62 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,7 +93,9 @@ 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; @@ -98,34 +103,22 @@ class Memcached_DataObject extends DB_DataObject } $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 $i; } } - 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 +126,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 +134,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 +173,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 +199,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 +300,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); } @@ -366,6 +331,29 @@ class Memcached_DataObject extends DB_DataObject $exists = false; } + // @fixme horrible evil hack! + // + // In multisite configuration we don't want to keep around a separate + // connection for every database; we could end up with thousands of + // connections open per thread. In an ideal world we might keep + // a connection per server and select different databases, but that'd + // be reliant on having the same db username/pass as well. + // + // MySQL connections are cheap enough we're going to try just + // closing out the old connection and reopening when we encounter + // a new DSN. + // + // WARNING WARNING if we end up actually using multiple DBs at a time + // we'll need some fancier logic here. + if (!$exists && !empty($_DB_DATAOBJECT['CONNECTIONS'])) { + foreach ($_DB_DATAOBJECT['CONNECTIONS'] as $index => $conn) { + if (!empty($conn)) { + $conn->disconnect(); + } + unset($_DB_DATAOBJECT['CONNECTIONS'][$index]); + } + } + $result = parent::_connect(); if ($result && !$exists) { diff --git a/classes/Notice.php b/classes/Notice.php index 9bda478271..38b10db048 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -125,8 +125,7 @@ class Notice extends Memcached_DataObject 'Fave', 'Notice_tag', 'Group_inbox', - 'Queue_item', - 'Notice_inbox'); + 'Queue_item'); foreach ($related as $cls) { $inst = new $cls(); @@ -276,7 +275,6 @@ class Notice extends Memcached_DataObject if (isset($repeat_of)) { $notice->repeat_of = $repeat_of; - $notice->reply_to = $repeat_of; } else { $notice->reply_to = self::getReplyTo($reply_to, $profile_id, $source, $final); } @@ -300,8 +298,6 @@ class Notice extends Memcached_DataObject // XXX: some of these functions write to the DB - $notice->query('BEGIN'); - $id = $notice->insert(); if (!$id) { @@ -339,12 +335,14 @@ class Notice extends Memcached_DataObject $notice->saveTags(); - $notice->addToInboxes(); + $groups = $notice->saveGroups(); + + $recipients = $notice->saveReplies(); + + $notice->addToInboxes($groups, $recipients); $notice->saveUrls(); - $notice->query('COMMIT'); - Event::handle('EndNoticeSave', array($notice)); } @@ -503,20 +501,6 @@ class Notice extends Memcached_DataObject $original->free(); unset($original); } - - $ni = new Notice_inbox(); - - $ni->notice_id = $this->id; - - if ($ni->find()) { - while ($ni->fetch()) { - $tmk = common_cache_key('user:repeated_to_me:'.$ni->user_id); - $cache->delete($tmk); - } - } - - $ni->free(); - unset($ni); } } } @@ -842,11 +826,28 @@ class Notice extends Memcached_DataObject return $ids; } - function addToInboxes() + /** + * @param $groups array of Group *objects* + * @param $recipients array of profile *ids* + */ + function whoGets($groups=null, $recipients=null) { - // XXX: loads constants + $c = self::memcache(); - $inbox = new Notice_inbox(); + if (!empty($c)) { + $ni = $c->get(common_cache_key('notice:who_gets:'.$this->id)); + if ($ni !== false) { + return $ni; + } + } + + if (is_null($groups)) { + $groups = $this->getGroups(); + } + + if (is_null($recipients)) { + $recipients = $this->getReplies(); + } $users = $this->getSubscribedUsers(); @@ -860,7 +861,6 @@ class Notice extends Memcached_DataObject $ni[$id] = NOTICE_INBOX_SOURCE_SUB; } - $groups = $this->saveGroups(); $profile = $this->getProfile(); foreach ($groups as $group) { @@ -875,8 +875,6 @@ class Notice extends Memcached_DataObject } } - $recipients = $this->saveReplies(); - foreach ($recipients as $recipient) { if (!array_key_exists($recipient, $ni)) { @@ -887,7 +885,19 @@ class Notice extends Memcached_DataObject } } - Notice_inbox::bulkInsert($this->id, $this->created, $ni); + if (!empty($c)) { + // XXX: pack this data better + $c->set(common_cache_key('notice:who_gets:'.$this->id), $ni); + } + + return $ni; + } + + function addToInboxes($groups, $recipients) + { + $ni = $this->whoGets($groups, $recipients); + + Inbox::bulkInsert($this->id, array_keys($ni)); return; } @@ -919,8 +929,17 @@ class Notice extends Memcached_DataObject return $ids; } + /** + * @return array of Group objects + */ function saveGroups() { + // Don't save groups for repeats + + if (!empty($this->repeat_of)) { + return array(); + } + $groups = array(); /* extract all !group */ @@ -991,6 +1010,12 @@ class Notice extends Memcached_DataObject */ function saveReplies() { + // Don't save reply data for repeats + + if (!empty($this->repeat_of)) { + return array(); + } + // Alternative reply format $tname = false; if (preg_match('/^T ([A-Z0-9]{1,64}) /', $this->content, $match)) { @@ -1077,6 +1102,63 @@ class Notice extends Memcached_DataObject return $recipientIds; } + function getReplies() + { + // XXX: cache me + + $ids = array(); + + $reply = new Reply(); + $reply->selectAdd(); + $reply->selectAdd('profile_id'); + $reply->notice_id = $this->id; + + if ($reply->find()) { + while($reply->fetch()) { + $ids[] = $reply->profile_id; + } + } + + $reply->free(); + + return $ids; + } + + /** + * Same calculation as saveGroups but without the saving + * @fixme merge the functions + * @return array of Group objects + */ + function getGroups() + { + // Don't save groups for repeats + + if (!empty($this->repeat_of)) { + return array(); + } + + // XXX: cache me + + $groups = array(); + + $gi = new Group_inbox(); + + $gi->selectAdd(); + $gi->selectAdd('group_id'); + + $gi->notice_id = $this->id; + + if ($gi->find()) { + while ($gi->fetch()) { + $groups[] = clone($gi); + } + } + + $gi->free(); + + return $groups; + } + function asAtomEntry($namespace=false, $source=false) { $profile = $this->getProfile(); diff --git a/classes/Notice_inbox.php b/classes/Notice_inbox.php index e350e6e2f8..c27dcdfd61 100644 --- a/classes/Notice_inbox.php +++ b/classes/Notice_inbox.php @@ -1,7 +1,7 @@ . */ -if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } +if (!defined('STATUSNET')) { + exit(1); +} require_once INSTALLDIR.'/classes/Memcached_DataObject.php'; @@ -29,12 +31,6 @@ define('NOTICE_INBOX_GC_MAX', 12800); define('NOTICE_INBOX_LIMIT', 1000); define('NOTICE_INBOX_SOFT_LIMIT', 1000); -define('NOTICE_INBOX_SOURCE_SUB', 1); -define('NOTICE_INBOX_SOURCE_GROUP', 2); -define('NOTICE_INBOX_SOURCE_REPLY', 3); -define('NOTICE_INBOX_SOURCE_FORWARD', 4); -define('NOTICE_INBOX_SOURCE_GATEWAY', -1); - class Notice_inbox extends Memcached_DataObject { ###START_AUTOCODE @@ -55,139 +51,31 @@ class Notice_inbox extends Memcached_DataObject function stream($user_id, $offset, $limit, $since_id, $max_id, $since, $own=false) { - return Notice::stream(array('Notice_inbox', '_streamDirect'), - array($user_id, $own), - ($own) ? 'notice_inbox:by_user:'.$user_id : - 'notice_inbox:by_user_own:'.$user_id, - $offset, $limit, $since_id, $max_id, $since); + throw new Exception('Notice_inbox no longer used; use Inbox'); } function _streamDirect($user_id, $own, $offset, $limit, $since_id, $max_id, $since) { - $inbox = new Notice_inbox(); - - $inbox->user_id = $user_id; - - if (!$own) { - $inbox->whereAdd('source != ' . NOTICE_INBOX_SOURCE_GATEWAY); - } - - if ($since_id != 0) { - $inbox->whereAdd('notice_id > ' . $since_id); - } - - if ($max_id != 0) { - $inbox->whereAdd('notice_id <= ' . $max_id); - } - - if (!is_null($since)) { - $inbox->whereAdd('created > \'' . date('Y-m-d H:i:s', $since) . '\''); - } - - $inbox->orderBy('created DESC'); - - if (!is_null($offset)) { - $inbox->limit($offset, $limit); - } - - $ids = array(); - - if ($inbox->find()) { - while ($inbox->fetch()) { - $ids[] = $inbox->notice_id; - } - } - - return $ids; + throw new Exception('Notice_inbox no longer used; use Inbox'); } - function pkeyGet($kv) + function &pkeyGet($kv) { return Memcached_DataObject::pkeyGet('Notice_inbox', $kv); } - /** - * Trim inbox for a given user to latest NOTICE_INBOX_LIMIT items - * (up to NOTICE_INBOX_GC_MAX will be deleted). - * - * @param int $user_id - * @return int count of notices dropped from the inbox, if any - */ static function gc($user_id) { - $entry = new Notice_inbox(); - $entry->user_id = $user_id; - $entry->orderBy('created DESC'); - $entry->limit(NOTICE_INBOX_LIMIT - 1, NOTICE_INBOX_GC_MAX); - - $total = $entry->find(); - - if ($total > 0) { - $notices = array(); - $cnt = 0; - while ($entry->fetch()) { - $notices[] = $entry->notice_id; - $cnt++; - if ($cnt >= NOTICE_INBOX_GC_BOXCAR) { - self::deleteMatching($user_id, $notices); - $notices = array(); - $cnt = 0; - } - } - - if ($cnt > 0) { - self::deleteMatching($user_id, $notices); - $notices = array(); - } - } - - return $total; + throw new Exception('Notice_inbox no longer used; use Inbox'); } static function deleteMatching($user_id, $notices) { - $entry = new Notice_inbox(); - return $entry->query('DELETE FROM notice_inbox '. - 'WHERE user_id = ' . $user_id . ' ' . - 'AND notice_id in ('.implode(',', $notices).')'); + throw new Exception('Notice_inbox no longer used; use Inbox'); } static function bulkInsert($notice_id, $created, $ni) { - $cnt = 0; - - $qryhdr = 'INSERT INTO notice_inbox (user_id, notice_id, source, created) VALUES '; - $qry = $qryhdr; - - foreach ($ni as $id => $source) { - if ($cnt > 0) { - $qry .= ', '; - } - $qry .= '('.$id.', '.$notice_id.', '.$source.", '".$created. "') "; - $cnt++; - if (rand() % NOTICE_INBOX_SOFT_LIMIT == 0) { - // FIXME: Causes lag in replicated servers - // Notice_inbox::gc($id); - } - if ($cnt >= MAX_BOXCARS) { - $inbox = new Notice_inbox(); - $result = $inbox->query($qry); - if (PEAR::isError($result)) { - common_log_db_error($inbox, $qry); - } - $qry = $qryhdr; - $cnt = 0; - } - } - - if ($cnt > 0) { - $inbox = new Notice_inbox(); - $result = $inbox->query($qry); - if (PEAR::isError($result)) { - common_log_db_error($inbox, $qry); - } - } - - return; + throw new Exception('Notice_inbox no longer used; use Inbox'); } } diff --git a/classes/Oauth_application.php b/classes/Oauth_application.php new file mode 100644 index 0000000000..a6b5390872 --- /dev/null +++ b/classes/Oauth_application.php @@ -0,0 +1,140 @@ +consumer_key); + } + + static function maxDesc() + { + $desclimit = common_config('application', 'desclimit'); + // null => use global limit (distinct from 0!) + if (is_null($desclimit)) { + $desclimit = common_config('site', 'textlimit'); + } + return $desclimit; + } + + static function descriptionTooLong($desc) + { + $desclimit = self::maxDesc(); + return ($desclimit > 0 && !empty($desc) && (mb_strlen($desc) > $desclimit)); + } + + function setAccessFlags($read, $write) + { + if ($read) { + $this->access_type |= self::$readAccess; + } else { + $this->access_type &= ~self::$readAccess; + } + + if ($write) { + $this->access_type |= self::$writeAccess; + } else { + $this->access_type &= ~self::$writeAccess; + } + } + + function setOriginal($filename) + { + $imagefile = new ImageFile($this->id, Avatar::path($filename)); + + // XXX: Do we want to have a bunch of different size icons? homepage, stream, mini? + // or just one and control size via CSS? --Zach + + $orig = clone($this); + $this->icon = Avatar::url($filename); + common_debug(common_log_objstring($this)); + return $this->update($orig); + } + + static function getByConsumerKey($key) + { + if (empty($key)) { + return null; + } + + $app = new Oauth_application(); + $app->consumer_key = $key; + $app->limit(1); + $result = $app->find(true); + + return empty($result) ? null : $app; + } + + /** + * Handle an image upload + * + * Does all the magic for handling an image upload, and crops the + * image by default. + * + * @return void + */ + + function uploadLogo() + { + if ($_FILES['app_icon']['error'] == + UPLOAD_ERR_OK) { + + try { + $imagefile = ImageFile::fromUpload('app_icon'); + } catch (Exception $e) { + common_debug("damn that sucks"); + $this->showForm($e->getMessage()); + return; + } + + $filename = Avatar::filename($this->id, + image_type_to_extension($imagefile->type), + null, + 'oauth-app-icon-'.common_timestamp()); + + $filepath = Avatar::path($filename); + + move_uploaded_file($imagefile->filepath, $filepath); + + $this->setOriginal($filename); + } + } + +} diff --git a/classes/Oauth_application_user.php b/classes/Oauth_application_user.php new file mode 100644 index 0000000000..57986281f9 --- /dev/null +++ b/classes/Oauth_application_user.php @@ -0,0 +1,44 @@ +profile_id = $user->id; + $oau->application_id = $app->id; + $oau->limit(1); + + $result = $oau->find(true); + + return empty($result) ? null : $oau; + } + +} diff --git a/classes/Profile.php b/classes/Profile.php index 25d908dbf9..1076fb2cb3 100644 --- a/classes/Profile.php +++ b/classes/Profile.php @@ -352,6 +352,31 @@ class Profile extends Memcached_DataObject return $profile; } + function getApplications($offset = 0, $limit = null) + { + $qry = + 'SELECT a.* ' . + 'FROM oauth_application_user u, oauth_application a ' . + 'WHERE u.profile_id = %d ' . + 'AND a.id = u.application_id ' . + 'AND u.access_type > 0 ' . + 'ORDER BY u.created DESC '; + + if ($offset > 0) { + if (common_config('db','type') == 'pgsql') { + $qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset; + } else { + $qry .= ' LIMIT ' . $offset . ', ' . $limit; + } + } + + $application = new Oauth_application(); + + $cnt = $application->query(sprintf($qry, $this->id)); + + return $application; + } + function subscriptionCount() { $c = common_memcache(); diff --git a/classes/Queue_item.php b/classes/Queue_item.php index 9c673540d7..cf805a6060 100644 --- a/classes/Queue_item.php +++ b/classes/Queue_item.php @@ -25,10 +25,12 @@ class Queue_item extends Memcached_DataObject function sequenceKey() { return array(false, false); } - static function top($transport) { + static function top($transport=null) { $qi = new Queue_item(); - $qi->transport = $transport; + if ($transport) { + $qi->transport = $transport; + } $qi->orderBy('created'); $qi->whereAdd('claimed is null'); @@ -40,7 +42,8 @@ class Queue_item extends Memcached_DataObject # XXX: potential race condition # can we force it to only update if claimed is still null # (or old)? - common_log(LOG_INFO, 'claiming queue item = ' . $qi->notice_id . ' for transport ' . $transport); + common_log(LOG_INFO, 'claiming queue item = ' . $qi->notice_id . + ' for transport ' . $qi->transport); $orig = clone($qi); $qi->claimed = common_sql_now(); $result = $qi->update($orig); diff --git a/classes/Status_network.php b/classes/Status_network.php index b3117640d8..ef8e1ed431 100644 --- a/classes/Status_network.php +++ b/classes/Status_network.php @@ -49,6 +49,13 @@ class Status_network extends DB_DataObject static $cache = null; static $base = null; + /** + * @param string $dbhost + * @param string $dbuser + * @param string $dbpass + * @param string $dbname + * @param array $servers memcached servers to use for caching config info + */ static function setupDB($dbhost, $dbuser, $dbpass, $dbname, $servers) { global $config; @@ -60,12 +67,17 @@ class Status_network extends DB_DataObject if (class_exists('Memcache')) { self::$cache = new Memcache(); + // Can't close persistent connections, making forking painful. + // + // @fixme only do this in *parent* CLI processes. + // single-process and child-processes *should* use persistent. + $persist = php_sapi_name() != 'cli'; if (is_array($servers)) { foreach($servers as $server) { - self::$cache->addServer($server); + self::$cache->addServer($server, 11211, $persist); } } else { - self::$cache->addServer($servers); + self::$cache->addServer($servers, 11211, $persist); } } @@ -89,7 +101,7 @@ class Status_network extends DB_DataObject if (empty($sn)) { $sn = self::staticGet($k, $v); if (!empty($sn)) { - self::$cache->set($ck, $sn); + self::$cache->set($ck, clone($sn)); } } @@ -121,6 +133,11 @@ class Status_network extends DB_DataObject return parent::delete(); } + /** + * @param string $servername hostname + * @param string $pathname URL base path + * @param string $wildcard hostname suffix to match wildcard config + */ static function setupSite($servername, $pathname, $wildcard) { global $config; @@ -150,9 +167,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 +187,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 +210,8 @@ class Status_network extends DB_DataObject // (C) 2006 by Heiko Richler http://www.richler.de/ // LGPL - function redirectToHostname() + function redirectTo($destination) { - $destination = 'http://'.$this->hostname; - $destination .= $_SERVER['REQUEST_URI']; - $old = 'http'. (($_SERVER['HTTPS'] == 'on') ? 'S' : ''). '://'. diff --git a/classes/Token.php b/classes/Token.php index 1fabd72f13..a129d1fd11 100644 --- a/classes/Token.php +++ b/classes/Token.php @@ -4,7 +4,7 @@ */ require_once INSTALLDIR.'/classes/Memcached_DataObject.php'; -class Token extends Memcached_DataObject +class Token extends Memcached_DataObject { ###START_AUTOCODE /* the code below is auto generated do not remove the above tag */ @@ -14,7 +14,9 @@ class Token extends Memcached_DataObject public $tok; // char(32) primary_key not_null public $secret; // char(32) not_null public $type; // tinyint(1) not_null - public $state; // tinyint(1) + public $state; // tinyint(1) + public $verifier; // varchar(255) + public $verified_callback; // varchar(255) public $created; // datetime() not_null public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP diff --git a/classes/User.php b/classes/User.php index 34151778c5..d6b52be017 100644 --- a/classes/User.php +++ b/classes/User.php @@ -291,6 +291,20 @@ class User extends Memcached_DataObject return false; } + // Everyone gets an inbox + + $inbox = new Inbox(); + + $inbox->user_id = $user->id; + $inbox->notice_ids = ''; + + $result = $inbox->insert(); + + if (!$result) { + common_log_db_error($inbox, 'INSERT', __FILE__); + return false; + } + // Everyone is subscribed to themself $subscription = new Subscription(); @@ -482,89 +496,30 @@ class User extends Memcached_DataObject function noticesWithFriends($offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $before_id=0, $since=null) { - $ids = Notice_inbox::stream($this->id, $offset, $limit, $since_id, $before_id, $since, false); - + $ids = Inbox::stream($this->id, $offset, $limit, $since_id, $before_id, $since, false); return Notice::getStreamByIds($ids); } function noticeInbox($offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $before_id=0, $since=null) { - $ids = Notice_inbox::stream($this->id, $offset, $limit, $since_id, $before_id, $since, true); - + $ids = Inbox::stream($this->id, $offset, $limit, $since_id, $before_id, $since, true); return Notice::getStreamByIds($ids); } function friendsTimeline($offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $before_id=0, $since=null) { - $ids = Notice::stream(array($this, '_friendsTimelineDirect'), - array(false), - 'user:friends_timeline:'.$this->id, - $offset, $limit, $since_id, $before_id, $since); + $ids = Inbox::stream($this->id, $offset, $limit, $since_id, $before_id, $since, false); return Notice::getStreamByIds($ids); } function ownFriendsTimeline($offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $before_id=0, $since=null) { - $ids = Notice::stream(array($this, '_friendsTimelineDirect'), - array(true), - 'user:friends_timeline_own:'.$this->id, - $offset, $limit, $since_id, $before_id, $since); + $ids = Inbox::stream($this->id, $offset, $limit, $since_id, $before_id, $since, true); return Notice::getStreamByIds($ids); } - function _friendsTimelineDirect($own, $offset, $limit, $since_id, $max_id, $since) - { - $qry = - 'SELECT notice.id AS id ' . - 'FROM notice JOIN notice_inbox ON notice.id = notice_inbox.notice_id ' . - 'WHERE notice_inbox.user_id = ' . $this->id . ' ' . - 'AND notice.repeat_of IS NULL '; - - if (!$own) { - // XXX: autoload notice inbox for constant - $inbox = new Notice_inbox(); - - $qry .= 'AND notice_inbox.source != ' . NOTICE_INBOX_SOURCE_GATEWAY . ' '; - } - - if ($since_id != 0) { - $qry .= 'AND notice.id > ' . $since_id . ' '; - } - - if ($max_id != 0) { - $qry .= 'AND notice.id <= ' . $max_id . ' '; - } - - if (!is_null($since)) { - $qry .= 'AND notice.modified > \'' . date('Y-m-d H:i:s', $since) . '\' '; - } - - // NOTE: we sort by fave time, not by notice time! - - $qry .= 'ORDER BY notice_id DESC '; - - if (!is_null($offset)) { - $qry .= "LIMIT $limit OFFSET $offset"; - } - - $ids = array(); - - $notice = new Notice(); - - $notice->query($qry); - - while ($notice->fetch()) { - $ids[] = $notice->id; - } - - $notice->free(); - $notice = NULL; - - return $ids; - } - function blowFavesCache() { $cache = common_memcache(); @@ -777,7 +732,6 @@ class User extends Memcached_DataObject 'Remember_me', 'Foreign_link', 'Invitation', - 'Notice_inbox', ); Event::handle('UserDeleteRelated', array($this, &$related)); @@ -945,56 +899,7 @@ class User extends Memcached_DataObject function repeatedToMe($offset=0, $limit=20, $since_id=null, $max_id=null) { - $ids = Notice::stream(array($this, '_repeatedToMeDirect'), - array(), - 'user:repeated_to_me:'.$this->id, - $offset, $limit, $since_id, $max_id, null); - - return Notice::getStreamByIds($ids); - } - - function _repeatedToMeDirect($offset, $limit, $since_id, $max_id, $since) - { - $qry = - 'SELECT notice.id AS id ' . - 'FROM notice JOIN notice_inbox ON notice.id = notice_inbox.notice_id ' . - 'WHERE notice_inbox.user_id = ' . $this->id . ' ' . - 'AND notice.repeat_of IS NOT NULL '; - - if ($since_id != 0) { - $qry .= 'AND notice.id > ' . $since_id . ' '; - } - - if ($max_id != 0) { - $qry .= 'AND notice.id <= ' . $max_id . ' '; - } - - if (!is_null($since)) { - $qry .= 'AND notice.modified > \'' . date('Y-m-d H:i:s', $since) . '\' '; - } - - // NOTE: we sort by fave time, not by notice time! - - $qry .= 'ORDER BY notice.id DESC '; - - if (!is_null($offset)) { - $qry .= "LIMIT $limit OFFSET $offset"; - } - - $ids = array(); - - $notice = new Notice(); - - $notice->query($qry); - - while ($notice->fetch()) { - $ids[] = $notice->id; - } - - $notice->free(); - $notice = NULL; - - return $ids; + throw new Exception("Not implemented since inbox change."); } function shareLocation() diff --git a/classes/statusnet.ini b/classes/statusnet.ini index 0db2c5d6e3..44088cf6b0 100644 --- a/classes/statusnet.ini +++ b/classes/statusnet.ini @@ -39,6 +39,7 @@ code = K [consumer] consumer_key = 130 +consumer_secret = 130 seed = 130 created = 142 modified = 384 @@ -241,6 +242,13 @@ address = 130 address_type = 130 created = 142 +[inbox] +user_id = 129 +notice_ids = 66 + +[inbox__keys] +user_id = K + [invitation__keys] code = K @@ -341,6 +349,37 @@ created = 142 tag = K notice_id = K +[oauth_application] +id = 129 +owner = 129 +consumer_key = 130 +name = 130 +description = 2 +icon = 130 +source_url = 2 +organization = 2 +homepage = 2 +callback_url = 130 +type = 17 +access_type = 17 +created = 142 +modified = 384 + +[oauth_application__keys] +id = N + +[oauth_application_user] +profile_id = 129 +application_id = 129 +access_type = 17 +token = 2 +created = 142 +modified = 384 + +[oauth_application_user__keys] +profile_id = K +application_id = K + [profile] id = 129 nickname = 130 @@ -477,6 +516,8 @@ tok = 130 secret = 130 type = 145 state = 17 +verifier = 2 +verified_callback = 2 created = 142 modified = 384 diff --git a/db/rc2torc3.sql b/db/rc2torc3.sql new file mode 100644 index 0000000000..886b9adf22 --- /dev/null +++ b/db/rc2torc3.sql @@ -0,0 +1,17 @@ +create table user_location_prefs ( + user_id integer not null comment 'user who has the preference' references user (id), + share_location tinyint default 1 comment 'Whether to share location data', + created datetime not null comment 'date this record was created', + modified timestamp comment 'date this record was modified', + + constraint primary key (user_id) +) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin; + +create table inbox ( + + user_id integer not null comment 'user receiving the notice' references user (id), + notice_ids blob comment 'packed list of notice ids', + + constraint primary key (user_id) + +) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin; diff --git a/db/statusnet.sql b/db/statusnet.sql index 94b03df639..2a9ab74c77 100644 --- a/db/statusnet.sql +++ b/db/statusnet.sql @@ -176,6 +176,7 @@ create table fave ( create table consumer ( consumer_key varchar(255) primary key comment 'unique identifier, root URL', + consumer_secret varchar(255) not null comment 'secret value', seed char(32) not null comment 'seed for new tokens by this consumer', created datetime not null comment 'date this record was created', @@ -188,6 +189,8 @@ create table token ( secret char(32) not null comment 'secret value', type tinyint not null default 0 comment 'request or access', state tinyint default 0 comment 'for requests, 0 = initial, 1 = authorized, 2 = used', + verifier varchar(255) comment 'verifier string for OAuth 1.0a', + verified_callback varchar(255) comment 'verified callback URL for OAuth 1.0a', created datetime not null comment 'date this record was created', modified timestamp comment 'date this record was modified', @@ -207,6 +210,33 @@ create table nonce ( constraint primary key (consumer_key, ts, nonce) ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin; +create table oauth_application ( + id integer auto_increment primary key comment 'unique identifier', + owner integer not null comment 'owner of the application' references profile (id), + consumer_key varchar(255) not null comment 'application consumer key' references consumer (consumer_key), + name varchar(255) not null comment 'name of the application', + description varchar(255) comment 'description of the application', + icon varchar(255) not null comment 'application icon', + source_url varchar(255) comment 'application homepage - used for source link', + organization varchar(255) comment 'name of the organization running the application', + homepage varchar(255) comment 'homepage for the organization', + callback_url varchar(255) comment 'url to redirect to after authentication', + type tinyint default 0 comment 'type of app, 1 = browser, 2 = desktop', + access_type tinyint default 0 comment 'default access type, bit 1 = read, bit 2 = write', + created datetime not null comment 'date this record was created', + modified timestamp comment 'date this record was modified' +) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin; + +create table oauth_application_user ( + profile_id integer not null comment 'user of the application' references profile (id), + application_id integer not null comment 'id of the application' references oauth_application (id), + access_type tinyint default 0 comment 'access type, bit 1 = read, bit 2 = write, bit 3 = revoked', + token varchar(255) comment 'request or access token', + created datetime not null comment 'date this record was created', + modified timestamp comment 'date this record was modified', + constraint primary key (profile_id, application_id) +) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin; + /* These are used by JanRain OpenID library */ create table oid_associations ( @@ -596,3 +626,11 @@ create table user_location_prefs ( constraint primary key (user_id) ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin; +create table inbox ( + + user_id integer not null comment 'user receiving the notice' references user (id), + notice_ids blob comment 'packed list of notice ids', + + constraint primary key (user_id) + +) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin; diff --git a/index.php b/index.php index 47cde87409..b5edc0f947 100644 --- a/index.php +++ b/index.php @@ -29,7 +29,7 @@ * @author Robin Millette * @author Sarven Capadisli * @author Tom Adams - * + * * @license GNU Affero General Public License http://www.gnu.org/licenses/ */ diff --git a/js/geometa.js b/js/geometa.js index 87e3c99a16..bba59b4486 100644 --- a/js/geometa.js +++ b/js/geometa.js @@ -1,5 +1,5 @@ -// A shim to implement the W3C Geolocation API Specification using Gears -if (typeof navigator.geolocation == "undefined" || navigator.geolocation.shim ) (function(){ +// A shim to implement the W3C Geolocation API Specification using Gears or the Ajax API +if (typeof navigator.geolocation == "undefined" || navigator.geolocation.shim ) { (function(){ // -- BEGIN GEARS_INIT (function() { @@ -23,8 +23,7 @@ if (typeof navigator.geolocation == "undefined" || navigator.geolocation.shim ) } } catch (e) { // Safari - if ((typeof navigator.mimeTypes != 'undefined') - && navigator.mimeTypes["application/x-googlegears"]) { + if ((typeof navigator.mimeTypes != 'undefined') && navigator.mimeTypes["application/x-googlegears"]) { factory = document.createElement("object"); factory.style.display = "none"; factory.width = 0; @@ -64,8 +63,8 @@ var GearsGeoLocation = (function() { return function(position) { callback(position); self.lastPosition = position; - } - } + }; + }; // -- PUBLIC return { @@ -96,9 +95,123 @@ var GearsGeoLocation = (function() { }; }); -// If you have Gears installed use that -if (window.google && google.gears) { - navigator.geolocation = GearsGeoLocation(); -} +var AjaxGeoLocation = (function() { + // -- PRIVATE + var loading = false; + var loadGoogleLoader = function() { + if (!hasGoogleLoader() && !loading) { + loading = true; + var s = document.createElement('script'); + s.src = (document.location.protocol == "https:"?"https://":"http://") + 'www.google.com/jsapi?callback=_google_loader_apiLoaded'; + s.type = "text/javascript"; + document.getElementsByTagName('body')[0].appendChild(s); + } + }; + + var queue = []; + var addLocationQueue = function(callback) { + queue.push(callback); + }; + + var runLocationQueue = function() { + if (hasGoogleLoader()) { + while (queue.length > 0) { + var call = queue.pop(); + call(); + } + } + }; + + window['_google_loader_apiLoaded'] = function() { + runLocationQueue(); + }; + + var hasGoogleLoader = function() { + return (window['google'] && google['loader']); + }; + + var checkGoogleLoader = function(callback) { + if (hasGoogleLoader()) { return true; } + + addLocationQueue(callback); + + loadGoogleLoader(); + + return false; + }; + + loadGoogleLoader(); // start to load as soon as possible just in case + + // -- PUBLIC + return { + shim: true, + + type: "ClientLocation", + + lastPosition: null, + + getCurrentPosition: function(successCallback, errorCallback, options) { + var self = this; + if (!checkGoogleLoader(function() { + self.getCurrentPosition(successCallback, errorCallback, options); + })) { return; } + + if (google.loader.ClientLocation) { + var cl = google.loader.ClientLocation; + + var position = { + coords: { + latitude: cl.latitude, + longitude: cl.longitude, + altitude: null, + accuracy: 43000, // same as Gears accuracy over wifi? + altitudeAccuracy: null, + heading: null, + speed: null + }, + // extra info that is outside of the bounds of the core API + address: { + city: cl.address.city, + country: cl.address.country, + country_code: cl.address.country_code, + region: cl.address.region + }, + timestamp: new Date() + }; + + successCallback(position); + + this.lastPosition = position; + } else if (errorCallback === "function") { + errorCallback({ code: 3, message: "Using the Google ClientLocation API and it is not able to calculate a location."}); + } + }, + + watchPosition: function(successCallback, errorCallback, options) { + this.getCurrentPosition(successCallback, errorCallback, options); + + var self = this; + var watchId = setInterval(function() { + self.getCurrentPosition(successCallback, errorCallback, options); + }, 10000); + + return watchId; + }, + + clearWatch: function(watchId) { + clearInterval(watchId); + }, + + getPermission: function(siteName, imageUrl, extraMessage) { + // for now just say yes :) + return true; + } + + }; +}); + +// If you have Gears installed use that, else use Ajax ClientLocation +navigator.geolocation = (window.google && google.gears) ? GearsGeoLocation() : AjaxGeoLocation(); })(); +} diff --git a/js/util.js b/js/util.js index 0314668d9d..a10e9d15ae 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)); } @@ -480,8 +481,9 @@ var SN = { // StatusNet var NDGe = $('#'+SN.C.S.NoticeDataGeo); function removeNoticeDataGeo() { - $('label[for='+SN.C.S.NoticeDataGeo+']').removeClass('checked').attr('title', jQuery.trim($('label[for='+SN.C.S.NoticeDataGeo+']').text())); - $('#'+SN.C.S.NoticeDataGeoSelected).hide(); + $('label[for='+SN.C.S.NoticeDataGeo+']') + .attr('title', jQuery.trim($('label[for='+SN.C.S.NoticeDataGeo+']').text())) + .removeClass('checked'); $('#'+SN.C.S.NoticeLat).val(''); $('#'+SN.C.S.NoticeLon).val(''); @@ -492,7 +494,7 @@ var SN = { // StatusNet $.cookie(SN.C.S.NoticeDataGeoCookie, 'disabled'); } - function getJSONgeocodeURL(geocodeURL, data) { + function getJSONgeocodeURL(geocodeURL, data, position) { $.getJSON(geocodeURL, data, function(location) { var lns, lid; @@ -513,17 +515,8 @@ var SN = { // StatusNet NLN_text = location.name; } - $('#'+SN.C.S.NoticeGeoName) - .replaceWith(''); - - $('#'+SN.C.S.NoticeGeoName) - .attr('href', location.url) - .text(NLN_text) - .click(function() { - window.open(location.url); - - return false; - }); + $('label[for='+SN.C.S.NoticeDataGeo+']') + .attr('title', NoticeDataGeo_text.ShareDisable + ' (' + NLN_text + ')'); $('#'+SN.C.S.NoticeLat).val(data.lat); $('#'+SN.C.S.NoticeLon).val(data.lon); @@ -532,14 +525,13 @@ var SN = { // StatusNet $('#'+SN.C.S.NoticeDataGeo).attr('checked', true); var cookieValue = { - 'NLat': data.lat, - 'NLon': data.lon, - 'NLNS': lns, - 'NLID': lid, - 'NLN': NLN_text, - 'NLNU': location.url, - 'NDG': true, - 'NDGSM': false + NLat: data.lat, + NLon: data.lon, + NLNS: lns, + NLID: lid, + NLN: NLN_text, + NLNU: location.url, + NDG: true }; $.cookie(SN.C.S.NoticeDataGeoCookie, JSON.stringify(cookieValue)); }); @@ -557,62 +549,14 @@ var SN = { // StatusNet var geocodeURL = NGW.attr('title'); NGW.removeAttr('title'); - $('label[for='+SN.C.S.NoticeDataGeo+']').attr('title', jQuery.trim($('label[for='+SN.C.S.NoticeDataGeo+']').text())); + $('label[for='+SN.C.S.NoticeDataGeo+']') + .attr('title', jQuery.trim($('label[for='+SN.C.S.NoticeDataGeo+']').text())); NDGe.change(function() { - var NLN = $('#'+SN.C.S.NoticeGeoName); - if (NLN.length > 0) { - NLN.remove(); - } - if ($('#'+SN.C.S.NoticeDataGeo).attr('checked') === true || $.cookie(SN.C.S.NoticeDataGeoCookie) === null) { - $('label[for='+SN.C.S.NoticeDataGeo+']').addClass('checked').attr('title', NoticeDataGeoShareDisable_text); - - var S = '
'; - var NDGS = $('#'+SN.C.S.NoticeDataGeoSelected); - - if (NDGS.length > 0) { - NDGS.replaceWith(S); - } - else { - $('#'+SN.C.S.FormNotice).append(S); - } - - NDGS = $('#'+SN.C.S.NoticeDataGeoSelected); - NDGS.prepend('Geo '); - - var NLN = $('#'+SN.C.S.NoticeGeoName); - NLN.addClass('processing'); - - $('#'+SN.C.S.NoticeDataGeoSelected+' button.close').click(function(){ - removeNoticeDataGeo(); - - $('#'+SN.C.S.NoticeDataGeoSelected).remove(); - - $('#'+SN.C.S.NoticeDataText).focus(); - - return false; - }); - - $('#'+SN.C.S.NoticeDataGeoSelected+' button.minimize').click(function(){ - $('#'+SN.C.S.NoticeDataGeoSelected).hide(); - - var cookieValue = { - 'NLat': $('#'+SN.C.S.NoticeLat).val(), - 'NLon': $('#'+SN.C.S.NoticeLat).val(), - 'NLNS': $('#'+SN.C.S.NoticeLocationNs).val(), - 'NLID': $('#'+SN.C.S.NoticeLocationId).val(), - 'NLN': $('#'+SN.C.S.NoticeGeoName).text(), - 'NLNU': $('#'+SN.C.S.NoticeGeoName).attr('href'), - 'NDG': true, - 'NDGSM': true - }; - $.cookie(SN.C.S.NoticeDataGeoCookie, JSON.stringify(cookieValue)); - - $('#'+SN.C.S.NoticeDataText).focus(); - - return false; - }); + $('label[for='+SN.C.S.NoticeDataGeo+']') + .attr('title', NoticeDataGeo_text.ShareDisable) + .addClass('checked'); if ($.cookie(SN.C.S.NoticeDataGeoCookie) === null || $.cookie(SN.C.S.NoticeDataGeoCookie) == 'disabled') { if (navigator.geolocation) { @@ -622,18 +566,27 @@ var SN = { // StatusNet $('#'+SN.C.S.NoticeLon).val(position.coords.longitude); var data = { - 'lat': position.coords.latitude, - 'lon': position.coords.longitude, - 'token': $('#token').val() + lat: position.coords.latitude, + lon: position.coords.longitude, + token: $('#token').val() }; - getJSONgeocodeURL(geocodeURL, data); + getJSONgeocodeURL(geocodeURL, data, position); }, function(error) { - if (error.PERMISSION_DENIED == 1) { - removeNoticeDataGeo(); + switch(error.code) { + case error.PERMISSION_DENIED: + removeNoticeDataGeo(); + break; + case error.TIMEOUT: + $('#'+SN.C.S.NoticeDataGeo).attr('checked', false); + break; } + }, + + { + timeout: 10000 } ); } @@ -645,7 +598,7 @@ var SN = { // StatusNet 'token': $('#token').val() }; - getJSONgeocodeURL(geocodeURL, data); + getJSONgeocodeURL(geocodeURL, data, position); } else { removeNoticeDataGeo(); @@ -657,34 +610,20 @@ var SN = { // StatusNet else { var cookieValue = JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie)); - if (cookieValue.NDGSM === true) { - $('#'+SN.C.S.NoticeDataGeoSelected).hide(); - } - $('#'+SN.C.S.NoticeLat).val(cookieValue.NLat); $('#'+SN.C.S.NoticeLon).val(cookieValue.NLon); $('#'+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS); $('#'+SN.C.S.NoticeLocationId).val(cookieValue.NLID); $('#'+SN.C.S.NoticeDataGeo).attr('checked', cookieValue.NDG); - $('#'+SN.C.S.NoticeGeoName) - .replaceWith(''); - - $('#'+SN.C.S.NoticeGeoName) - .attr('href', cookieValue.NLNU) - .text(cookieValue.NLN) - .click(function() { - window.open($(this).attr('href')); - - return false; - }); + $('label[for='+SN.C.S.NoticeDataGeo+']') + .attr('title', NoticeDataGeo_text.ShareDisable + ' (' + cookieValue.NLN + ')') + .addClass('checked'); } } else { removeNoticeDataGeo(); } - - $('#'+SN.C.S.NoticeDataText).focus(); }).change(); } }, diff --git a/lib/action.php b/lib/action.php index 6efa9163dc..a521bcb507 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(_("%1$s - %2$s"), + sprintf(_("%1\$s - %2\$s"), $this->title(), common_config('site', 'name'))); } diff --git a/lib/api.php b/lib/api.php index a6aea5d6d6..794b140507 100644 --- a/lib/api.php +++ b/lib/api.php @@ -53,6 +53,9 @@ if (!defined('STATUSNET')) { class ApiAction extends Action { + const READ_ONLY = 1; + const READ_WRITE = 2; + var $format = null; var $user = null; var $auth_user = null; @@ -62,6 +65,8 @@ class ApiAction extends Action var $since_id = null; var $since = null; + var $access = self::READ_ONLY; // read (default) or read-write + /** * Initialization. * @@ -140,12 +145,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); @@ -166,7 +173,7 @@ class ApiAction extends Action $timezone = 'UTC'; - if ($user->timezone) { + if (!empty($user) && $user->timezone) { $timezone = $user->timezone; } diff --git a/lib/apiauth.php b/lib/apiauth.php index 7102764cba..691db584b7 100644 --- a/lib/apiauth.php +++ b/lib/apiauth.php @@ -28,7 +28,7 @@ * @author Evan Prodromou * @author mEDI * @author Sarven Capadisli - * @author Zach Copley + * @author Zach Copley * @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/ @@ -39,6 +39,7 @@ if (!defined('STATUSNET')) { } require_once INSTALLDIR . '/lib/api.php'; +require_once INSTALLDIR . '/lib/apioauth.php'; /** * Actions extending this class will require auth @@ -52,6 +53,9 @@ require_once INSTALLDIR . '/lib/api.php'; class ApiAuthAction extends ApiAction { + var $access_token; + var $oauth_access_type; + var $oauth_source; /** * Take arguments for running, and output basic auth header if needed @@ -67,12 +71,115 @@ class ApiAuthAction extends ApiAction parent::prepare($args); if ($this->requiresAuth()) { - $this->checkBasicAuthUser(); + + $this->consumer_key = $this->arg('oauth_consumer_key'); + $this->access_token = $this->arg('oauth_token'); + + if (!empty($this->access_token)) { + $this->checkOAuthRequest(); + } else { + $this->checkBasicAuthUser(); + // By default, all basic auth users have read and write access + + $this->access = self::READ_WRITE; + } } return true; } + function handle($args) + { + parent::handle($args); + } + + function checkOAuthRequest() + { + common_debug("We have an OAuth request."); + + $datastore = new ApiStatusNetOAuthDataStore(); + $server = new OAuthServer($datastore); + $hmac_method = new OAuthSignatureMethod_HMAC_SHA1(); + + $server->add_signature_method($hmac_method); + + ApiOauthAction::cleanRequest(); + + try { + + $req = OAuthRequest::from_request(); + $server->verify_request($req); + + $app = Oauth_application::getByConsumerKey($this->consumer_key); + + if (empty($app)) { + + // this should really not happen + common_log(LOG_WARN, + "Couldn't find the OAuth app for consumer key: $this->consumer_key"); + + throw new OAuthException('No application for that consumer key.'); + } + + // set the source attr + + $this->oauth_source = $app->name; + + $appUser = Oauth_application_user::staticGet('token', + $this->access_token); + + // XXX: check that app->id and appUser->application_id and consumer all + // match? + + if (!empty($appUser)) { + + // read or read-write + $this->oauth_access_type = $appUser->access_type; + + // If access_type == 0 we have either a request token + // or a bad / revoked access token + + if ($this->oauth_access_type != 0) { + + // Set the read or read-write access for the api call + $this->access = ($appUser->access_type & Oauth_application::$writeAccess) + ? self::READ_WRITE : self::READ_ONLY; + + $this->auth_user = User::staticGet('id', $appUser->profile_id); + + $msg = "API OAuth authentication for user '%s' (id: %d) on behalf of " . + "application '%s' (id: %d)."; + + common_log(LOG_INFO, sprintf($msg, + $this->auth_user->nickname, + $this->auth_user->id, + $app->name, + $app->id)); + return true; + } else { + throw new OAuthException('Bad access token.'); + } + } else { + + // also should not happen + throw new OAuthException('No user for that token.'); + } + + } catch (OAuthException $e) { + common_log(LOG_WARN, 'API OAuthException - ' . $e->getMessage()); + common_debug(var_export($req, true)); + $this->showOAuthError($e->getMessage()); + exit(); + } + } + + function showOAuthError($msg) + { + header('HTTP/1.1 401 Unauthorized'); + header('Content-Type: text/html; charset=utf-8'); + print $msg . "\n"; + } + /** * Does this API resource require authentication? * @@ -128,6 +235,7 @@ class ApiAuthAction extends ApiAction exit; } } + return true; } diff --git a/lib/apioauth.php b/lib/apioauth.php new file mode 100644 index 0000000000..4cb8a67754 --- /dev/null +++ b/lib/apioauth.php @@ -0,0 +1,122 @@ +. + * + * @category API + * @package StatusNet + * @author Zach Copley + * @copyright 2010 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET')) { + exit(1); +} + +require_once INSTALLDIR . '/lib/apioauthstore.php'; + +/** + * Base action for API OAuth enpoints. Clean up the + * the request, and possibly some other common things + * here. + * + * @category API + * @package StatusNet + * @author Zach Copley + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +class ApiOauthAction extends Action +{ + /** + * Is this a read-only action? + * + * @return boolean false + */ + + function isReadOnly($args) + { + return false; + } + + function prepare($args) + { + parent::prepare($args); + return true; + } + + /** + * Handle input, produce output + * + * Switches on request method; either shows the form or handles its input. + * + * @param array $args $_REQUEST data + * + * @return void + */ + + function handle($args) + { + parent::handle($args); + self::cleanRequest(); + } + + static function cleanRequest() + { + // kill evil effects of magical slashing + + if (get_magic_quotes_gpc() == 1) { + $_POST = array_map('stripslashes', $_POST); + $_GET = array_map('stripslashes', $_GET); + } + + // strip out the p param added in index.php + + // XXX: should we strip anything else? Or alternatively + // only allow a known list of params? + + unset($_GET['p']); + unset($_POST['p']); + } + + function getCallback($url, $params) + { + foreach ($params as $k => $v) { + $url = $this->appendQueryVar($url, + OAuthUtil::urlencode_rfc3986($k), + OAuthUtil::urlencode_rfc3986($v)); + } + + return $url; + } + + function appendQueryVar($url, $k, $v) { + $url = preg_replace('/(.*)(\?|&)' . $k . '=[^&]+?(&)(.*)/i', '$1$2$4', $url . '&'); + $url = substr($url, 0, -1); + if (strpos($url, '?') === false) { + return ($url . '?' . $k . '=' . $v); + } else { + return ($url . '&' . $k . '=' . $v); + } + } + +} diff --git a/lib/apioauthstore.php b/lib/apioauthstore.php new file mode 100644 index 0000000000..32110d0575 --- /dev/null +++ b/lib/apioauthstore.php @@ -0,0 +1,163 @@ +. + */ + +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } + +require_once INSTALLDIR . '/lib/oauthstore.php'; + +class ApiStatusNetOAuthDataStore extends StatusNetOAuthDataStore +{ + + function lookup_consumer($consumer_key) + { + $con = Consumer::staticGet('consumer_key', $consumer_key); + + if (!$con) { + return null; + } + + return new OAuthConsumer($con->consumer_key, + $con->consumer_secret); + } + + function getAppByRequestToken($token_key) + { + // Look up the full req tokenx + + $req_token = $this->lookup_token(null, + 'request', + $token_key); + + if (empty($req_token)) { + common_debug("couldn't get request token from oauth datastore"); + return null; + } + + // Look up the full Token + + $token = new Token(); + $token->tok = $req_token->key; + $result = $token->find(true); + + if (empty($result)) { + common_debug('Couldn\'t find req token in the token table.'); + return null; + } + + // Look up the app + + $app = new Oauth_application(); + $app->consumer_key = $token->consumer_key; + $result = $app->find(true); + + if (!empty($result)) { + return $app; + } else { + common_debug("Couldn't find the app!"); + return null; + } + } + + function new_access_token($token, $consumer) + { + common_debug('new_access_token("'.$token->key.'","'.$consumer->key.'")', __FILE__); + + $rt = new Token(); + $rt->consumer_key = $consumer->key; + $rt->tok = $token->key; + $rt->type = 0; // request + + $app = Oauth_application::getByConsumerKey($consumer->key); + + if (empty($app)) { + common_debug("empty app!"); + } + + if ($rt->find(true) && $rt->state == 1) { // authorized + common_debug('request token found.', __FILE__); + + // find the associated user of the app + + $appUser = new Oauth_application_user(); + $appUser->application_id = $app->id; + $appUser->token = $rt->tok; + $result = $appUser->find(true); + + if (!empty($result)) { + common_debug("Oath app user found."); + } else { + common_debug("Oauth app user not found. app id $app->id token $rt->tok"); + return null; + } + + // go ahead and make the access token + + $at = new Token(); + $at->consumer_key = $consumer->key; + $at->tok = common_good_rand(16); + $at->secret = common_good_rand(16); + $at->type = 1; // access + $at->created = DB_DataObject_Cast::dateTime(); + + if (!$at->insert()) { + $e = $at->_lastError; + common_debug('access token "'.$at->tok.'" not inserted: "'.$e->message.'"', __FILE__); + return null; + } else { + common_debug('access token "'.$at->tok.'" inserted', __FILE__); + // burn the old one + $orig_rt = clone($rt); + $rt->state = 2; // used + if (!$rt->update($orig_rt)) { + return null; + } + common_debug('request token "'.$rt->tok.'" updated', __FILE__); + + // update the token from req to access for the user + + $orig = clone($appUser); + $appUser->token = $at->tok; + + // It's at this point that we change the access type + // to whatever the application's access is. Request + // tokens should always have an access type of 0, and + // therefore be unuseable for making requests for + // protected resources. + + $appUser->access_type = $app->access_type; + + $result = $appUser->update($orig); + + if (empty($result)) { + common_debug('couldn\'t update OAuth app user.'); + return null; + } + + // Okay, good + + return new OAuthToken($at->tok, $at->secret); + } + + } else { + return null; + } + } + +} + diff --git a/lib/applicationeditform.php b/lib/applicationeditform.php new file mode 100644 index 0000000000..6f03a9beda --- /dev/null +++ b/lib/applicationeditform.php @@ -0,0 +1,338 @@ +. + * + * @category Form + * @package StatusNet + * @author Zach Copley + * @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') && !defined('LACONICA')) { + exit(1); +} + +require_once INSTALLDIR . '/lib/form.php'; + +/** + * Form for editing an application + * + * @category Form + * @package StatusNet + * @author Zach Copley + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + * + */ + +class ApplicationEditForm extends Form +{ + /** + * group for user to join + */ + + var $application = null; + + /** + * Constructor + * + * @param Action $out output channel + * @param User_group $group group to join + */ + + function __construct($out=null, $application=null) + { + parent::__construct($out); + + $this->application = $application; + } + + /** + * ID of the form + * + * @return string ID of the form + */ + + function id() + { + if ($this->application) { + return 'form_application_edit-' . $this->application->id; + } else { + return 'form_application_add'; + } + } + + /** + * HTTP method used to submit the form + * + * For image data we need to send multipart/form-data + * so we set that here too + * + * @return string the method to use for submitting + */ + + function method() + { + $this->enctype = 'multipart/form-data'; + return 'post'; + } + + /** + * class of the form + * + * @return string of the form class + */ + + function formClass() + { + return 'form_settings'; + } + + /** + * Action of the form + * + * @return string URL of the action + */ + + function action() + { + $cur = common_current_user(); + + if (!empty($this->application)) { + return common_local_url('editapplication', + array('id' => $this->application->id)); + } else { + return common_local_url('newapplication'); + } + } + + /** + * Name of the form + * + * @return void + */ + + function formLegend() + { + $this->out->element('legend', null, _('Edit application')); + } + + /** + * Data elements of the form + * + * @return void + */ + + function formData() + { + if ($this->application) { + $id = $this->application->id; + $icon = $this->application->icon; + $name = $this->application->name; + $description = $this->application->description; + $source_url = $this->application->source_url; + $organization = $this->application->organization; + $homepage = $this->application->homepage; + $callback_url = $this->application->callback_url; + $this->type = $this->application->type; + $this->access_type = $this->application->access_type; + } else { + $id = ''; + $icon = ''; + $name = ''; + $description = ''; + $source_url = ''; + $organization = ''; + $homepage = ''; + $callback_url = ''; + $this->type = ''; + $this->access_type = ''; + } + + $this->out->hidden('token', common_session_token()); + + $this->out->elementStart('ul', 'form_data'); + + $this->out->elementStart('li', array('id' => 'application_icon')); + + if (!empty($icon)) { + $this->out->element('img', array('src' => $icon)); + } + + $this->out->element('label', array('for' => 'app_icon'), + _('Icon')); + $this->out->element('input', array('name' => 'app_icon', + 'type' => 'file', + 'id' => 'app_icon')); + $this->out->element('p', 'form_guide', _('Icon for this application')); + $this->out->element('input', array('name' => 'MAX_FILE_SIZE', + 'type' => 'hidden', + 'id' => 'MAX_FILE_SIZE', + 'value' => ImageFile::maxFileSizeInt())); + $this->out->elementEnd('li'); + + $this->out->elementStart('li'); + + $this->out->hidden('application_id', $id); + + $this->out->input('name', _('Name'), + ($this->out->arg('name')) ? $this->out->arg('name') : $name); + + $this->out->elementEnd('li'); + + $this->out->elementStart('li'); + + $maxDesc = Oauth_application::maxDesc(); + if ($maxDesc > 0) { + $descInstr = sprintf(_('Describe your application in %d characters'), + $maxDesc); + } else { + $descInstr = _('Describe your application'); + } + $this->out->textarea('description', _('Description'), + ($this->out->arg('description')) ? $this->out->arg('description') : $description, + $descInstr); + + $this->out->elementEnd('li'); + + $this->out->elementStart('li'); + $this->out->input('source_url', _('Source URL'), + ($this->out->arg('source_url')) ? $this->out->arg('source_url') : $source_url, + _('URL of the homepage of this application')); + $this->out->elementEnd('li'); + + $this->out->elementStart('li'); + $this->out->input('organization', _('Organization'), + ($this->out->arg('organization')) ? $this->out->arg('organization') : $organization, + _('Organization responsible for this application')); + $this->out->elementEnd('li'); + + $this->out->elementStart('li'); + $this->out->input('homepage', _('Homepage'), + ($this->out->arg('homepage')) ? $this->out->arg('homepage') : $homepage, + _('URL for the homepage of the organization')); + $this->out->elementEnd('li'); + + $this->out->elementStart('li'); + $this->out->input('callback_url', ('Callback URL'), + ($this->out->arg('callback_url')) ? $this->out->arg('callback_url') : $callback_url, + _('URL to redirect to after authentication')); + $this->out->elementEnd('li'); + + $this->out->elementStart('li', array('id' => 'application_types')); + + $attrs = array('name' => 'app_type', + 'type' => 'radio', + 'id' => 'app_type-browser', + 'class' => 'radio', + 'value' => Oauth_application::$browser); + + // Default to Browser + + if ($this->application->type == Oauth_application::$browser + || empty($this->application->type)) { + $attrs['checked'] = 'checked'; + } + + $this->out->element('input', $attrs); + + $this->out->element('label', array('for' => 'app_type-browser', + 'class' => 'radio'), + _('Browser')); + + $attrs = array('name' => 'app_type', + 'type' => 'radio', + 'id' => 'app_type-dekstop', + 'class' => 'radio', + 'value' => Oauth_application::$desktop); + + if ($this->application->type == Oauth_application::$desktop) { + $attrs['checked'] = 'checked'; + } + + $this->out->element('input', $attrs); + + $this->out->element('label', array('for' => 'app_type-desktop', + 'class' => 'radio'), + _('Desktop')); + $this->out->element('p', 'form_guide', _('Type of application, browser or desktop')); + $this->out->elementEnd('li'); + + $this->out->elementStart('li', array('id' => 'default_access_types')); + + $attrs = array('name' => 'default_access_type', + 'type' => 'radio', + 'id' => 'default_access_type-r', + 'class' => 'radio', + 'value' => 'r'); + + // default to read-only access + + if ($this->application->access_type & Oauth_application::$readAccess + || empty($this->application->access_type)) { + $attrs['checked'] = 'checked'; + } + + $this->out->element('input', $attrs); + + $this->out->element('label', array('for' => 'default_access_type-ro', + 'class' => 'radio'), + _('Read-only')); + + $attrs = array('name' => 'default_access_type', + 'type' => 'radio', + 'id' => 'default_access_type-rw', + 'class' => 'radio', + 'value' => 'rw'); + + if ($this->application->access_type & Oauth_application::$readAccess + && $this->application->access_type & Oauth_application::$writeAccess + ) { + $attrs['checked'] = 'checked'; + } + + $this->out->element('input', $attrs); + + $this->out->element('label', array('for' => 'default_access_type-rw', + 'class' => 'radio'), + _('Read-write')); + $this->out->element('p', 'form_guide', _('Default access for this application: read-only, or read-write')); + + $this->out->elementEnd('li'); + + $this->out->elementEnd('ul'); + } + + /** + * Action elements + * + * @return void + */ + + function formActions() + { + $this->out->submit('cancel', _('Cancel'), 'submit form_action-primary', + 'cancel', _('Cancel')); + $this->out->submit('save', _('Save'), 'submit form_action-secondary', + 'save', _('Save')); + } +} diff --git a/lib/applicationlist.php b/lib/applicationlist.php new file mode 100644 index 0000000000..3abb1f8aa7 --- /dev/null +++ b/lib/applicationlist.php @@ -0,0 +1,168 @@ +. + * + * @category Application + * @package StatusNet + * @author Zach Copley + * @copyright 2008-2009 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET') && !defined('LACONICA')) { + exit(1); +} + +require_once INSTALLDIR . '/lib/widget.php'; + +define('APPS_PER_PAGE', 20); + +/** + * Widget to show a list of OAuth applications + * + * @category Application + * @package StatusNet + * @author Zach Copley + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +class ApplicationList extends Widget +{ + /** Current application, application query */ + var $application = null; + + /** Owner of this list */ + var $owner = null; + + /** Action object using us. */ + var $action = null; + + function __construct($application, $owner=null, $action=null, $connections = false) + { + parent::__construct($action); + + $this->application = $application; + $this->owner = $owner; + $this->action = $action; + $this->connections = $connections; + } + + function show() + { + $this->out->elementStart('ul', 'applications'); + + $cnt = 0; + + while ($this->application->fetch()) { + $cnt++; + if($cnt > APPS_PER_PAGE) { + break; + } + $this->showapplication(); + } + + $this->out->elementEnd('ul'); + + return $cnt; + } + + function showApplication() + { + + $user = common_current_user(); + + $this->out->elementStart('li', array('class' => 'application', + 'id' => 'oauthclient-' . $this->application->id)); + + $this->out->elementStart('span', 'vcard author'); + if (!$this->connections) { + $this->out->elementStart('a', + array('href' => common_local_url('showapplication', + array('id' => $this->application->id)), + 'class' => 'url')); + + } else { + $this->out->elementStart('a', array('href' => $this->application->source_url, + 'class' => 'url')); + } + + if (!empty($this->application->icon)) { + $this->out->element('img', array('src' => $this->application->icon, + 'class' => 'photo avatar')); + } + + $this->out->element('span', 'fn', $this->application->name); + $this->out->elementEnd('a'); + $this->out->elementEnd('span'); + + $this->out->raw(' by '); + + $this->out->element('a', array('href' => $this->application->homepage, + 'class' => 'url'), + $this->application->organization); + + $this->out->element('p', 'note', $this->application->description); + $this->out->elementEnd('li'); + + if ($this->connections) { + $appUser = Oauth_application_user::getByKeys($this->owner, $this->application); + + if (empty($appUser)) { + common_debug("empty appUser!"); + } + + $this->out->elementStart('li'); + + $access = ($this->application->access_type & Oauth_application::$writeAccess) + ? 'read-write' : 'read-only'; + + $txt = 'Approved ' . common_date_string($appUser->modified) . + " - $access access."; + + $this->out->raw($txt); + $this->out->elementEnd('li'); + + $this->out->elementStart('li', 'entity_revoke'); + $this->out->elementStart('form', array('id' => 'form_revoke_app', + 'class' => 'form_revoke_app', + 'method' => 'POST', + 'action' => + common_local_url('oauthconnectionssettings'))); + $this->out->elementStart('fieldset'); + $this->out->hidden('id', $this->application->id); + $this->out->hidden('token', common_session_token()); + $this->out->submit('revoke', _('Revoke')); + $this->out->elementEnd('fieldset'); + $this->out->elementEnd('form'); + $this->out->elementEnd('li'); + } + } + + /* Override this in subclasses. */ + + function showOwnerControls() + { + return; + } + +} diff --git a/lib/authenticationplugin.php b/lib/authenticationplugin.php index de479a5768..17237086c4 100644 --- a/lib/authenticationplugin.php +++ b/lib/authenticationplugin.php @@ -92,6 +92,19 @@ abstract class AuthenticationPlugin extends Plugin return false; } + /** + * Given a username, suggest what the nickname should be + * Used during autoregistration + * Useful if your usernames are ugly, and you want to suggest + * nice looking nicknames when users initially sign on + * @param username + * @return string nickname + */ + function suggestNicknameForUsername($username) + { + return $username; + } + //------------Below are the methods that connect StatusNet to the implementing Auth plugin------------\\ function onInitializePlugin(){ if(!isset($this->provider_name)){ @@ -108,10 +121,22 @@ abstract class AuthenticationPlugin extends Plugin function onAutoRegister($nickname, $provider_name, &$user) { if($provider_name == $this->provider_name && $this->autoregistration){ - $user = $this->autoregister($nickname); - if($user){ - User_username::register($user,$nickname,$this->provider_name); - return false; + $suggested_nickname = $this->suggestNicknameForUsername($nickname); + $test_user = User::staticGet('nickname', $suggested_nickname); + if($test_user) { + //someone already exists with the suggested nickname, so used the passed nickname + $suggested_nickname = $nickname; + } + $test_user = User::staticGet('nickname', $suggested_nickname); + if($test_user) { + //someone already exists with the suggested nickname + //not much else we can do + }else{ + $user = $this->autoregister($suggested_nickname); + if($user){ + User_username::register($user,$nickname,$this->provider_name); + return false; + } } } } @@ -122,23 +147,30 @@ abstract class AuthenticationPlugin extends Plugin $user_username->username=$nickname; $user_username->provider_name=$this->provider_name; if($user_username->find() && $user_username->fetch()){ - $username = $user_username->username; - $authenticated = $this->checkPassword($username, $password); + $authenticated = $this->checkPassword($user_username->username, $password); if($authenticated){ $authenticatedUser = User::staticGet('id', $user_username->user_id); return false; } }else{ - $user = User::staticGet('nickname', $nickname); + //$nickname is the username used to login + //$suggested_nickname is the nickname the auth provider suggests for that username + $suggested_nickname = $this->suggestNicknameForUsername($nickname); + $user = User::staticGet('nickname', $suggested_nickname); if($user){ - //make sure a different provider isn't handling this nickname + //make sure this user isn't claimed $user_username = new User_username(); - $user_username->username=$nickname; - if(!$user_username->find()){ - //no other provider claims this username, so it's safe for us to handle it + $user_username->user_id=$user->id; + $we_can_handle = false; + if($user_username->find()){ + //either this provider, or another one, has already claimed this user + //so we cannot. Let another plugin try. + return; + }else{ + //no other provider claims this user, so it's safe for us to handle it $authenticated = $this->checkPassword($nickname, $password); if($authenticated){ - $authenticatedUser = User::staticGet('nickname', $nickname); + $authenticatedUser = $user; User_username::register($authenticatedUser,$nickname,$this->provider_name); return false; } diff --git a/lib/cache.php b/lib/cache.php index b7b34c0500..635c96ad4c 100644 --- a/lib/cache.php +++ b/lib/cache.php @@ -179,4 +179,23 @@ class Cache return $success; } + + /** + * Close or reconnect any remote connections, such as to give + * daemon processes a chance to reconnect on a fresh socket. + * + * @return boolean success flag + */ + + function reconnect() + { + $success = false; + + if (Event::handle('StartCacheReconnect', array(&$success))) { + $success = true; + Event::handle('EndCacheReconnect', array()); + } + + return $success; + } } diff --git a/lib/command.php b/lib/command.php index 080d83959f..c0a32e1b1a 100644 --- a/lib/command.php +++ b/lib/command.php @@ -85,7 +85,7 @@ class NudgeCommand extends Command { $recipient = User::staticGet('nickname', $this->other); if(! $recipient){ - $channel->error($this->user, sprintf(_('Could not find a user with nickname %s.'), + $channel->error($this->user, sprintf(_('Could not find a user with nickname %s'), $this->other)); }else{ if ($recipient->id == $this->user->id) { @@ -96,7 +96,7 @@ class NudgeCommand extends Command } // XXX: notify by IM // XXX: notify by SMS - $channel->output($this->user, sprintf(_('Nudge sent to %s.'), + $channel->output($this->user, sprintf(_('Nudge sent to %s'), $recipient->nickname)); } } @@ -149,7 +149,7 @@ class FavCommand extends Command $notice = Notice::staticGet(substr($this->other,1)); if (!$notice) { - $channel->error($this->user, _('Notice with that id does not exist.')); + $channel->error($this->user, _('Notice with that id does not exist')); return; } $recipient = $notice->getProfile(); @@ -165,7 +165,7 @@ class FavCommand extends Command } $notice = $recipient->getCurrentNotice(); if (!$notice) { - $channel->error($this->user, _('User has no last notice.')); + $channel->error($this->user, _('User has no last notice')); return; } } @@ -214,7 +214,7 @@ class JoinCommand extends Command } if ($cur->isMember($group)) { - $channel->error($cur, _('You are already a member of that group.')); + $channel->error($cur, _('You are already a member of that group')); return; } if (Group_block::isBlocked($group, $cur->getProfile())) { @@ -222,21 +222,18 @@ class JoinCommand extends Command return; } - $member = new Group_member(); - - $member->group_id = $group->id; - $member->profile_id = $cur->id; - $member->created = common_sql_now(); - - $result = $member->insert(); - if (!$result) { - common_log_db_error($member, 'INSERT', __FILE__); - $channel->error($cur, sprintf(_('Could not join user %1$s to group %2$s.'), - $cur->nickname, $group->nickname)); - return; + try { + if (Event::handle('StartJoinGroup', array($group, $cur))) { + Group_member::join($group->id, $cur->id); + Event::handle('EndJoinGroup', array($group, $cur)); + } + } catch (Exception $e) { + $channel->error($cur, sprintf(_('Could not join user %s to group %s'), + $cur->nickname, $group->nickname)); + return; } - $channel->output($cur, sprintf(_('%1$s joined group %2$s'), + $channel->output($cur, sprintf(_('%s joined group %s'), $cur->nickname, $group->nickname)); } @@ -269,24 +266,18 @@ class DropCommand extends Command return; } - $member = new Group_member(); - - $member->group_id = $group->id; - $member->profile_id = $cur->id; - - if (!$member->find(true)) { - $channel->error($cur,_('Could not find membership record.')); - return; - } - $result = $member->delete(); - if (!$result) { - common_log_db_error($member, 'INSERT', __FILE__); - $channel->error($cur, sprintf(_('Could not remove user %1$s to group %2$s.'), - $cur->nickname, $group->nickname)); - return; + try { + if (Event::handle('StartLeaveGroup', array($group, $cur))) { + Group_member::leave($group->id, $cur->id); + Event::handle('EndLeaveGroup', array($group, $cur)); + } + } catch (Exception $e) { + $channel->error($cur, sprintf(_('Could not remove user %s to group %s'), + $cur->nickname, $group->nickname)); + return; } - $channel->output($cur, sprintf(_('%1$s left group %2$s'), + $channel->output($cur, sprintf(_('%s left group %s'), $cur->nickname, $group->nickname)); } @@ -355,7 +346,7 @@ class MessageCommand extends Command $this->text = common_shorten_links($this->text); if (Message::contentTooLong($this->text)) { - $channel->error($this->user, sprintf(_('Message too long - maximum is %1$d characters, you sent %2$d.'), + $channel->error($this->user, sprintf(_('Message too long - maximum is %d characters, you sent %d'), Message::maxContent(), mb_strlen($this->text))); return; } @@ -373,7 +364,7 @@ class MessageCommand extends Command $message = Message::saveNew($this->user->id, $other->id, $this->text, $channel->source()); if ($message) { $message->notify(); - $channel->output($this->user, sprintf(_('Direct message to %s sent.'), $this->other)); + $channel->output($this->user, sprintf(_('Direct message to %s sent'), $this->other)); } else { $channel->error($this->user, _('Error sending direct message.')); } @@ -396,7 +387,7 @@ class RepeatCommand extends Command $notice = Notice::staticGet(substr($this->other,1)); if (!$notice) { - $channel->error($this->user, _('Notice with that id does not exist.')); + $channel->error($this->user, _('Notice with that id does not exist')); return; } $recipient = $notice->getProfile(); @@ -412,19 +403,19 @@ class RepeatCommand extends Command } $notice = $recipient->getCurrentNotice(); if (!$notice) { - $channel->error($this->user, _('User has no last notice.')); + $channel->error($this->user, _('User has no last notice')); return; } } if($this->user->id == $notice->profile_id) { - $channel->error($this->user, _('Cannot repeat your own notice.')); + $channel->error($this->user, _('Cannot repeat your own notice')); return; } if ($recipient->hasRepeated($notice->id)) { - $channel->error($this->user, _('Already repeated that notice.')); + $channel->error($this->user, _('Already repeated that notice')); return; } @@ -432,7 +423,7 @@ class RepeatCommand extends Command if ($repeat) { common_broadcast_notice($repeat); - $channel->output($this->user, sprintf(_('Notice from %s repeated.'), $recipient->nickname)); + $channel->output($this->user, sprintf(_('Notice from %s repeated'), $recipient->nickname)); } else { $channel->error($this->user, _('Error repeating notice.')); } @@ -457,7 +448,7 @@ class ReplyCommand extends Command $notice = Notice::staticGet(substr($this->other,1)); if (!$notice) { - $channel->error($this->user, _('Notice with that id does not exist.')); + $channel->error($this->user, _('Notice with that id does not exist')); return; } $recipient = $notice->getProfile(); @@ -473,7 +464,7 @@ class ReplyCommand extends Command } $notice = $recipient->getCurrentNotice(); if (!$notice) { - $channel->error($this->user, _('User has no last notice.')); + $channel->error($this->user, _('User has no last notice')); return; } } @@ -488,7 +479,7 @@ class ReplyCommand extends Command $this->text = common_shorten_links($this->text); if (Notice::contentTooLong($this->text)) { - $channel->error($this->user, sprintf(_('Notice too long - maximum is %1$d characters, you sent %2$d.'), + $channel->error($this->user, sprintf(_('Notice too long - maximum is %d characters, you sent %d'), Notice::maxContent(), mb_strlen($this->text))); return; } @@ -497,7 +488,7 @@ class ReplyCommand extends Command array('reply_to' => $notice->id)); if ($notice) { - $channel->output($this->user, sprintf(_('Reply to %s sent.'), $recipient->nickname)); + $channel->output($this->user, sprintf(_('Reply to %s sent'), $recipient->nickname)); } else { $channel->error($this->user, _('Error saving notice.')); } @@ -529,7 +520,7 @@ class GetCommand extends Command } $notice = $target->getCurrentNotice(); if (!$notice) { - $channel->error($this->user, _('User has no last notice.')); + $channel->error($this->user, _('User has no last notice')); return; } $notice_content = $notice->content; @@ -553,7 +544,7 @@ class SubCommand extends Command { if (!$this->other) { - $channel->error($this->user, _('Specify the name of the user to subscribe to.')); + $channel->error($this->user, _('Specify the name of the user to subscribe to')); return; } @@ -581,7 +572,7 @@ class UnsubCommand extends Command function execute($channel) { if(!$this->other) { - $channel->error($this->user, _('Specify the name of the user to unsubscribe from.')); + $channel->error($this->user, _('Specify the name of the user to unsubscribe from')); return; } @@ -647,28 +638,20 @@ class LoginCommand extends Command $disabled = common_config('logincommand','disabled'); $disabled = isset($disabled) && $disabled; if($disabled) { - $channel->error($this->user, _('Login command is disabled.')); + $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)))); + sprintf(_('This link is useable only once, and is good for only 2 minutes: %s'), + 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 fb5e5919e0..ada48b339d 100644 --- a/lib/common.php +++ b/lib/common.php @@ -22,7 +22,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } //exit with 200 response, if this is checking fancy from the installer if (isset($_REQUEST['p']) && $_REQUEST['p'] == 'check-fancy') { exit; } -define('STATUSNET_VERSION', '0.9.0rc2'); +define('STATUSNET_VERSION', '0.9.0beta3'); define('LACONICA_VERSION', STATUSNET_VERSION); // compatibility define('STATUSNET_CODENAME', 'Stand'); @@ -41,15 +41,30 @@ define('FOREIGN_NOTICE_SEND_REPLY', 4); define('FOREIGN_FRIEND_SEND', 1); define('FOREIGN_FRIEND_RECV', 2); +define('NOTICE_INBOX_SOURCE_SUB', 1); +define('NOTICE_INBOX_SOURCE_GROUP', 2); +define('NOTICE_INBOX_SOURCE_REPLY', 3); +define('NOTICE_INBOX_SOURCE_FORWARD', 4); +define('NOTICE_INBOX_SOURCE_GATEWAY', -1); + # append our extlib dir as the last-resort place to find libs set_include_path(get_include_path() . PATH_SEPARATOR . INSTALLDIR . '/extlib/'); -# To protect against upstream libraries which haven't updated -# for PHP 5.3 where dl() function may not be present... +// To protect against upstream libraries which haven't updated +// for PHP 5.3 where dl() function may not be present... if (!function_exists('dl')) { - function dl($library) { - return false; + // function_exists() returns false for things in disable_functions, + // but they still exist and we'll die if we try to redefine them. + // + // Fortunately trying to call the disabled one will only trigger + // a warning, not a fatal, so it's safe to leave it for our case. + // Callers will be suppressing warnings anyway. + $disabled = array_filter(array_map('trim', explode(',', ini_get('disable_functions')))); + if (!in_array('dl', $disabled)) { + function dl($library) { + return false; + } } } @@ -67,159 +82,14 @@ require_once(INSTALLDIR.'/lib/language.php'); require_once(INSTALLDIR.'/lib/event.php'); require_once(INSTALLDIR.'/lib/plugin.php'); -function _sn_to_path($sn) -{ - $past_root = substr($sn, 1); - $last_slash = strrpos($past_root, '/'); - if ($last_slash > 0) { - $p = substr($past_root, 0, $last_slash); - } else { - $p = ''; - } - return $p; -} - -// Save our sanity when code gets loaded through subroutines such as PHPUnit tests -global $default, $config, $_server, $_path; - -// try to figure out where we are. $server and $path -// can be set by including module, else we guess based -// on HTTP info. - -if (isset($server)) { - $_server = $server; -} else { - $_server = array_key_exists('SERVER_NAME', $_SERVER) ? - strtolower($_SERVER['SERVER_NAME']) : - null; -} - -if (isset($path)) { - $_path = $path; -} else { - $_path = (array_key_exists('SERVER_NAME', $_SERVER) && array_key_exists('SCRIPT_NAME', $_SERVER)) ? - _sn_to_path($_SERVER['SCRIPT_NAME']) : - null; -} - -require_once(INSTALLDIR.'/lib/default.php'); - -// Set config values initially to default values - -$config = $default; - -// default configuration, overwritten in config.php - -$config['db'] = &PEAR::getStaticProperty('DB_DataObject','options'); - -$config['db'] = $default['db']; - -// Backward compatibility - -$config['site']['design'] =& $config['design']; - -if (function_exists('date_default_timezone_set')) { - /* Work internally in UTC */ - date_default_timezone_set('UTC'); -} - function addPlugin($name, $attrs = null) { - $name = ucfirst($name); - $pluginclass = "{$name}Plugin"; - - if (!class_exists($pluginclass)) { - - $files = array("local/plugins/{$pluginclass}.php", - "local/plugins/{$name}/{$pluginclass}.php", - "local/{$pluginclass}.php", - "local/{$name}/{$pluginclass}.php", - "plugins/{$pluginclass}.php", - "plugins/{$name}/{$pluginclass}.php"); - - foreach ($files as $file) { - $fullpath = INSTALLDIR.'/'.$file; - if (@file_exists($fullpath)) { - include_once($fullpath); - break; - } - } - } - - $inst = new $pluginclass(); - - if (!empty($attrs)) { - foreach ($attrs as $aname => $avalue) { - $inst->$aname = $avalue; - } - } - return $inst; -} - -// From most general to most specific: -// server-wide, then vhost-wide, then for a path, -// finally for a dir (usually only need one of the last two). - -if (isset($conffile)) { - $_config_files = array($conffile); -} else { - $_config_files = array('/etc/statusnet/statusnet.php', - '/etc/statusnet/laconica.php', - '/etc/laconica/laconica.php', - '/etc/statusnet/'.$_server.'.php', - '/etc/laconica/'.$_server.'.php'); - - if (strlen($_path) > 0) { - $_config_files[] = '/etc/statusnet/'.$_server.'_'.$_path.'.php'; - $_config_files[] = '/etc/laconica/'.$_server.'_'.$_path.'.php'; - } - - $_config_files[] = INSTALLDIR.'/config.php'; -} - -global $_have_a_config; -$_have_a_config = false; - -foreach ($_config_files as $_config_file) { - if (@file_exists($_config_file)) { - include_once($_config_file); - $_have_a_config = true; - } + return StatusNet::addPlugin($name, $attrs); } function _have_config() { - global $_have_a_config; - return $_have_a_config; -} - -// XXX: Throw a conniption if database not installed -// XXX: Find a way to use htmlwriter for this instead of handcoded markup -if (!_have_config()) { - echo '

'. _('No configuration file found. ') .'

'; - echo '

'. _('I looked for configuration files in the following places: ') .'
'. implode($_config_files, '
'); - echo '

'. _('You may wish to run the installer to fix this.') .'

'; - echo ''. _('Go to the installer.') .''; - exit; -} -// Fixup for statusnet.ini - -$_db_name = substr($config['db']['database'], strrpos($config['db']['database'], '/') + 1); - -if ($_db_name != 'statusnet' && !array_key_exists('ini_'.$_db_name, $config['db'])) { - $config['db']['ini_'.$_db_name] = INSTALLDIR.'/classes/statusnet.ini'; -} - -// Backwards compatibility - -if (array_key_exists('memcached', $config)) { - if ($config['memcached']['enabled']) { - addPlugin('Memcache', array('servers' => $config['memcached']['server'])); - } - - if (!empty($config['memcached']['base'])) { - $config['cache']['base'] = $config['memcached']['base']; - } + return StatusNet::haveConfig(); } function __autoload($cls) @@ -238,27 +108,6 @@ function __autoload($cls) } } -// Load default plugins - -foreach ($config['plugins']['default'] as $name => $params) { - if (is_null($params)) { - addPlugin($name); - } else if (is_array($params)) { - if (count($params) == 0) { - addPlugin($name); - } else { - $keys = array_keys($params); - if (is_string($keys[0])) { - addPlugin($name, $params); - } else { - foreach ($params as $paramset) { - addPlugin($name, $paramset); - } - } - } - } -} - // XXX: how many of these could be auto-loaded on use? // XXX: note that these files should not use config options // at compile time since DB config options are not yet loaded. @@ -274,20 +123,19 @@ require_once INSTALLDIR.'/lib/subs.php'; require_once INSTALLDIR.'/lib/clientexception.php'; require_once INSTALLDIR.'/lib/serverexception.php'; -// Load settings from database; note we need autoload for this - -Config::loadSettings(); - -// XXX: if plugins should check the schema at runtime, do that here. - -if ($config['db']['schemacheck'] == 'runtime') { - Event::handle('CheckSchema'); +try { + StatusNet::init(@$server, @$path, @$conffile); +} catch (NoConfigException $e) { + // XXX: Throw a conniption if database not installed + // XXX: Find a way to use htmlwriter for this instead of handcoded markup + echo '

'. _('No configuration file found. ') .'

'; + echo '

'. _('I looked for configuration files in the following places: ') .'
'; + echo implode($e->configFiles, '
'); + echo '

'. _('You may wish to run the installer to fix this.') .'

'; + echo ''. _('Go to the installer.') .''; + exit; } // XXX: other formats here define('NICKNAME_FMT', VALIDATE_NUM.VALIDATE_ALPHA_LOWER); - -// Give plugins a chance to initialize in a fully-prepared environment - -Event::handle('InitializePlugin'); diff --git a/lib/connectsettingsaction.php b/lib/connectsettingsaction.php index e5fb8727ba..b9c14799e0 100644 --- a/lib/connectsettingsaction.php +++ b/lib/connectsettingsaction.php @@ -115,6 +115,11 @@ class ConnectSettingsNav extends Widget array(_('SMS'), _('Updates by SMS')); } + + $menu['oauthconnectionssettings'] = array( + _('Connections'), + _('Authorized connected applications') + ); foreach ($menu as $menuaction => $menudesc) { $this->action->menuItem(common_local_url($menuaction), @@ -131,4 +136,3 @@ class ConnectSettingsNav extends Widget } - diff --git a/lib/dbqueuemanager.php b/lib/dbqueuemanager.php index 750300928e..889365b649 100644 --- a/lib/dbqueuemanager.php +++ b/lib/dbqueuemanager.php @@ -22,16 +22,20 @@ * @category QueueManager * @package StatusNet * @author Evan Prodromou - * @copyright 2009 StatusNet, Inc. + * @author Brion Vibber + * @copyright 2009-2010 StatusNet, Inc. * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ class DBQueueManager extends QueueManager { - var $qis = array(); - - function enqueue($object, $queue) + /** + * Saves a notice object reference into the queue item table. + * @return boolean true on success + * @throws ServerException on failure + */ + public function enqueue($object, $queue) { $notice = $object; @@ -47,70 +51,95 @@ class DBQueueManager extends QueueManager throw new ServerException('DB error inserting queue item'); } + $this->stats('enqueued', $queue); + return true; } - function service($queue, $handler) + /** + * Poll every minute for new events during idle periods. + * We'll look in more often when there's data available. + * + * @return int seconds + */ + public function pollInterval() { - while (true) { - $this->_log(LOG_DEBUG, 'Checking for notices...'); - $timeout = $handler->timeout(); - $notice = $this->_nextItem($queue, $timeout); - if (empty($notice)) { - $this->_log(LOG_DEBUG, 'No notices waiting; idling.'); - // Nothing in the queue. Do you - // have other tasks, like servicing your - // XMPP connection, to do? - $handler->idle(QUEUE_HANDLER_MISS_IDLE); - } else { - $this->_log(LOG_INFO, 'Got notice '. $notice->id); - // Yay! Got one! - if ($handler->handle_notice($notice)) { - $this->_log(LOG_INFO, 'Successfully handled notice '. $notice->id); - $this->_done($notice, $queue); - } else { - $this->_log(LOG_INFO, 'Failed to handle notice '. $notice->id); - $this->_fail($notice, $queue); - } - // Chance to e.g. service your XMPP connection - $this->_log(LOG_DEBUG, 'Idling after success.'); - $handler->idle(QUEUE_HANDLER_HIT_IDLE); - } - // XXX: when do we give up? - } + return 60; } - function _nextItem($queue, $timeout=null) + /** + * Run a polling cycle during idle processing in the input loop. + * @return boolean true if we had a hit + */ + public function poll() + { + $this->_log(LOG_DEBUG, 'Checking for notices...'); + $item = $this->_nextItem(); + if ($item === false) { + $this->_log(LOG_DEBUG, 'No notices waiting; idling.'); + return false; + } + if ($item === true) { + // We dequeued an entry for a deleted or invalid notice. + // Consider it a hit for poll rate purposes. + return true; + } + + list($queue, $notice) = $item; + $this->_log(LOG_INFO, 'Got notice '. $notice->id . ' for transport ' . $queue); + + // Yay! Got one! + $handler = $this->getHandler($queue); + if ($handler) { + if ($handler->handle_notice($notice)) { + $this->_log(LOG_INFO, "[$queue:notice $notice->id] Successfully handled notice"); + $this->_done($notice, $queue); + } else { + $this->_log(LOG_INFO, "[$queue:notice $notice->id] Failed to handle notice"); + $this->_fail($notice, $queue); + } + } else { + $this->_log(LOG_INFO, "[$queue:notice $notice->id] No handler for queue $queue; discarding."); + $this->_done($notice, $queue); + } + return true; + } + + /** + * Pop the oldest unclaimed item off the queue set and claim it. + * + * @return mixed false if no items; true if bogus hit; otherwise array(string, Notice) + * giving the queue transport name. + */ + protected function _nextItem() { $start = time(); $result = null; - $sleeptime = 1; + $qi = Queue_item::top(); + if (empty($qi)) { + return false; + } - do { - $qi = Queue_item::top($queue); - if (empty($qi)) { - $this->_log(LOG_DEBUG, "No new queue items, sleeping $sleeptime seconds."); - sleep($sleeptime); - $sleeptime *= 2; - } else { - $notice = Notice::staticGet('id', $qi->notice_id); - if (!empty($notice)) { - $result = $notice; - } else { - $this->_log(LOG_INFO, 'dequeued non-existent notice ' . $notice->id); - $qi->delete(); - $qi->free(); - $qi = null; - } - $sleeptime = 1; - } - } while (empty($result) && (is_null($timeout) || (time() - $start) < $timeout)); + $queue = $qi->transport; + $notice = Notice::staticGet('id', $qi->notice_id); + if (empty($notice)) { + $this->_log(LOG_INFO, "[$queue:notice $notice->id] dequeued non-existent notice"); + $qi->delete(); + return true; + } - return $result; + $result = $notice; + return array($queue, $notice); } - function _done($object, $queue) + /** + * Delete our claimed item from the queue after successful processing. + * + * @param Notice $object + * @param string $queue + */ + protected function _done($object, $queue) { // XXX: right now, we only handle notices @@ -120,24 +149,29 @@ class DBQueueManager extends QueueManager 'transport' => $queue)); if (empty($qi)) { - $this->_log(LOG_INFO, 'Cannot find queue item for notice '.$notice->id.', queue '.$queue); + $this->_log(LOG_INFO, "[$queue:notice $notice->id] Cannot find queue item"); } else { if (empty($qi->claimed)) { - $this->_log(LOG_WARNING, 'Reluctantly releasing unclaimed queue item '. - 'for '.$notice->id.', queue '.$queue); + $this->_log(LOG_WARNING, "[$queue:notice $notice->id] Reluctantly releasing unclaimed queue item"); } $qi->delete(); $qi->free(); - $qi = null; } - $this->_log(LOG_INFO, 'done with notice ID = ' . $notice->id); + $this->_log(LOG_INFO, "[$queue:notice $notice->id] done with item"); + $this->stats('handled', $queue); $notice->free(); - $notice = null; } - function _fail($object, $queue) + /** + * Free our claimed queue item for later reprocessing in case of + * temporary failure. + * + * @param Notice $object + * @param string $queue + */ + protected function _fail($object, $queue) { // XXX: right now, we only handle notices @@ -147,11 +181,10 @@ class DBQueueManager extends QueueManager 'transport' => $queue)); if (empty($qi)) { - $this->_log(LOG_INFO, 'Cannot find queue item for notice '.$notice->id.', queue '.$queue); + $this->_log(LOG_INFO, "[$queue:notice $notice->id] Cannot find queue item"); } else { if (empty($qi->claimed)) { - $this->_log(LOG_WARNING, 'Ignoring failure for unclaimed queue item '. - 'for '.$notice->id.', queue '.$queue); + $this->_log(LOG_WARNING, "[$queue:notice $notice->id] Ignoring failure for unclaimed queue item"); } else { $orig = clone($qi); $qi->claimed = null; @@ -160,13 +193,13 @@ class DBQueueManager extends QueueManager } } - $this->_log(LOG_INFO, 'done with notice ID = ' . $notice->id); + $this->_log(LOG_INFO, "[$queue:notice $notice->id] done with queue item"); + $this->stats('error', $queue); $notice->free(); - $notice = null; } - function _log($level, $msg) + protected function _log($level, $msg) { common_log($level, 'DBQueueManager: '.$msg); } diff --git a/lib/default.php b/lib/default.php index fa862f3ff1..82578fea86 100644 --- a/lib/default.php +++ b/lib/default.php @@ -79,6 +79,8 @@ $default = 'queue_basename' => '/queue/statusnet/', 'stomp_username' => null, 'stomp_password' => null, + 'monitor' => null, // URL to monitor ping endpoint (work in progress) + 'softlimit' => '90%', // total size or % of memory_limit at which to restart queue threads gracefully ), 'license' => array('url' => 'http://creativecommons.org/licenses/by/3.0/', @@ -202,6 +204,8 @@ $default = 'uploads' => true, 'filecommand' => '/usr/bin/file', ), + 'application' => + array('desclimit' => null), 'group' => array('maxaliases' => 3, 'desclimit' => null), diff --git a/lib/event.php b/lib/event.php index 4819b71b4c..41fb53ffe9 100644 --- a/lib/event.php +++ b/lib/event.php @@ -138,4 +138,12 @@ class Event { } return false; } + + /** + * Disables any and all handlers that have been set up so far; + * use only if you know it's safe to reinitialize all plugins. + */ + public static function clearHandlers() { + Event::$_handlers = array(); + } } diff --git a/lib/iomanager.php b/lib/iomanager.php new file mode 100644 index 0000000000..ee2ff958b9 --- /dev/null +++ b/lib/iomanager.php @@ -0,0 +1,193 @@ +. + * + * @category QueueManager + * @package StatusNet + * @author Evan Prodromou + * @author Sarven Capadisli + * @author Brion Vibber + * @copyright 2009-2010 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +abstract class IoManager +{ + const SINGLE_ONLY = 0; + const INSTANCE_PER_SITE = 1; + const INSTANCE_PER_PROCESS = 2; + + /** + * Factory function to get an appropriate subclass. + */ + public abstract static function get(); + + /** + * Tell the i/o queue master if and how we can handle multi-site + * processes. + * + * Return one of: + * IoManager::SINGLE_ONLY + * IoManager::INSTANCE_PER_SITE + * IoManager::INSTANCE_PER_PROCESS + */ + public static function multiSite() + { + return IoManager::SINGLE_ONLY; + } + + /** + * If in a multisite configuration, the i/o master will tell + * your manager about each site you'll have to handle so you + * can do any necessary per-site setup. + * + * @param string $site target site server name + */ + public function addSite($site) + { + /* no-op */ + } + + /** + * This method is called when data is available on one of your + * i/o manager's sockets. The socket with data is passed in, + * in case you have multiple sockets. + * + * If your i/o manager is based on polling during idle processing, + * you don't need to implement this. + * + * @param resource $socket + * @return boolean true on success, false on failure + */ + public function handleInput($socket) + { + return true; + } + + /** + * Return any open sockets that the run loop should listen + * for input on. If input comes in on a listed socket, + * the matching manager's handleInput method will be called. + * + * @return array of resources + */ + function getSockets() + { + return array(); + } + + /** + * Maximum planned time between poll() calls when input isn't waiting. + * Actual time may vary! + * + * When we get a polling hit, the timeout will be cut down to 0 while + * input is coming in, then will back off to this amount if no further + * input shows up. + * + * By default polling is disabled; you must override this to enable + * polling for this manager. + * + * @return int max poll interval in seconds, or 0 to disable polling + */ + function pollInterval() + { + return 0; + } + + /** + * Request a maximum timeout for listeners before the next idle period. + * Actual wait may be shorter, so don't go crazy in your idle()! + * Wait could be longer if other handlers performed some slow activity. + * + * Return 0 to request that listeners return immediately if there's no + * i/o and speed up the idle as much as possible; but don't do that all + * the time as this will burn CPU. + * + * @return int seconds + */ + function timeout() + { + return 60; + } + + /** + * Called by IoManager after each handled item or empty polling cycle. + * This is a good time to e.g. service your XMPP connection. + * + * Doesn't need to be overridden if there's no maintenance to do. + */ + function idle() + { + return true; + } + + /** + * The meat of a polling manager... check for something to do + * and do it! Note that you should not take too long, as other + * i/o managers may need to do some work too! + * + * On a successful hit, the next poll() call will come as soon + * as possible followed by exponential backoff up to pollInterval() + * if no more data is available. + * + * @return boolean true if events were hit + */ + public function poll() + { + return false; + } + + /** + * Initialization, run when the queue manager starts. + * If this function indicates failure, the handler run will be aborted. + * + * @param IoMaster $master process/event controller + * @return boolean true on success, false on failure + */ + public function start($master) + { + $this->master = $master; + return true; + } + + /** + * Cleanup, run when the queue manager ends. + * If this function indicates failure, a warning will be logged. + * + * @return boolean true on success, false on failure + */ + public function finish() + { + return true; + } + + /** + * Ping iomaster's queue status monitor with a stats update. + * Only valid during input loop! + * + * @param string $counter keyword for counter to increment + */ + public function stats($counter, $owners=array()) + { + $this->master->stats($counter, $owners); + } +} + diff --git a/lib/iomaster.php b/lib/iomaster.php new file mode 100644 index 0000000000..ce77b53b2e --- /dev/null +++ b/lib/iomaster.php @@ -0,0 +1,361 @@ +. + * + * @category QueueManager + * @package StatusNet + * @author Brion Vibber + * @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 IoMaster +{ + public $id; + + protected $multiSite = false; + protected $managers = array(); + protected $singletons = array(); + + protected $pollTimeouts = array(); + protected $lastPoll = array(); + + /** + * @param string $id process ID to use in logging/monitoring + */ + public function __construct($id) + { + $this->id = $id; + $this->monitor = new QueueMonitor(); + } + + public function init($multiSite=null) + { + if ($multiSite !== null) { + $this->multiSite = $multiSite; + } + if ($this->multiSite) { + $this->sites = $this->findAllSites(); + } else { + $this->sites = array(common_config('site', 'server')); + } + + if (empty($this->sites)) { + throw new Exception("Empty status_network table, cannot init"); + } + + foreach ($this->sites as $site) { + if ($site != common_config('site', 'server')) { + StatusNet::init($site); + } + + $classes = array(); + if (Event::handle('StartIoManagerClasses', array(&$classes))) { + $classes[] = 'QueueManager'; + if (common_config('xmpp', 'enabled') && !defined('XMPP_EMERGENCY_FLAG')) { + $classes[] = 'XmppManager'; // handles pings/reconnects + $classes[] = 'XmppConfirmManager'; // polls for outgoing confirmations + } + } + Event::handle('EndIoManagerClasses', array(&$classes)); + + foreach ($classes as $class) { + $this->instantiate($class); + } + } + } + + /** + * Pull all local sites from status_network table. + * @return array of hostnames + */ + protected function findAllSites() + { + $hosts = array(); + $sn = new Status_network(); + $sn->find(); + while ($sn->fetch()) { + $hosts[] = $sn->hostname; + } + return $hosts; + } + + /** + * Instantiate an i/o manager class for the current site. + * If a multi-site capable handler is already present, + * we don't need to build a new one. + * + * @param string $class + */ + protected function instantiate($class) + { + if (isset($this->singletons[$class])) { + // Already instantiated a multi-site-capable handler. + // Just let it know it should listen to this site too! + $this->singletons[$class]->addSite(common_config('site', 'server')); + return; + } + + $manager = $this->getManager($class); + + if ($this->multiSite) { + $caps = $manager->multiSite(); + if ($caps == IoManager::SINGLE_ONLY) { + throw new Exception("$class can't run with --all; aborting."); + } + if ($caps == IoManager::INSTANCE_PER_PROCESS) { + // Save this guy for later! + // We'll only need the one to cover multiple sites. + $this->singletons[$class] = $manager; + $manager->addSite(common_config('site', 'server')); + } + } + + $this->managers[] = $manager; + } + + protected function getManager($class) + { + return call_user_func(array($class, 'get')); + } + + /** + * Basic run loop... + * + * Initialize all io managers, then sit around waiting for input. + * Between events or timeouts, pass control back to idle() method + * to allow for any additional background processing. + */ + function service() + { + $this->logState('init'); + $this->start(); + + while (true) { + $timeouts = array_values($this->pollTimeouts); + $timeouts[] = 60; // default max timeout + + // Wait for something on one of our sockets + $sockets = array(); + $managers = array(); + foreach ($this->managers as $manager) { + foreach ($manager->getSockets() as $socket) { + $sockets[] = $socket; + $managers[] = $manager; + } + $timeouts[] = intval($manager->timeout()); + } + + $timeout = min($timeouts); + if ($sockets) { + $read = $sockets; + $write = array(); + $except = array(); + $this->logState('listening'); + common_log(LOG_INFO, "Waiting up to $timeout seconds for socket data..."); + $ready = stream_select($read, $write, $except, $timeout, 0); + + if ($ready === false) { + common_log(LOG_ERR, "Error selecting on sockets"); + } else if ($ready > 0) { + foreach ($read as $socket) { + $index = array_search($socket, $sockets, true); + if ($index !== false) { + $this->logState('queue'); + $managers[$index]->handleInput($socket); + } else { + common_log(LOG_ERR, "Saw input on a socket we didn't listen to"); + } + } + } + } + + if ($timeout > 0 && empty($sockets)) { + // If we had no listeners, sleep until the pollers' next requested wakeup. + common_log(LOG_INFO, "Sleeping $timeout seconds until next poll cycle..."); + $this->logState('sleep'); + sleep($timeout); + } + + $this->logState('poll'); + $this->poll(); + + $this->logState('idle'); + $this->idle(); + + $memoryLimit = $this->softMemoryLimit(); + if ($memoryLimit > 0) { + $usage = memory_get_usage(); + if ($usage > $memoryLimit) { + common_log(LOG_INFO, "Queue thread hit soft memory limit ($usage > $memoryLimit); gracefully restarting."); + break; + } + } + } + + $this->logState('shutdown'); + $this->finish(); + } + + /** + * Return fully-parsed soft memory limit in bytes. + * @return intval 0 or -1 if not set + */ + function softMemoryLimit() + { + $softLimit = trim(common_config('queue', 'softlimit')); + if (substr($softLimit, -1) == '%') { + $limit = trim(ini_get('memory_limit')); + $limit = $this->parseMemoryLimit($limit); + if ($limit > 0) { + return intval(substr($softLimit, 0, -1) * $limit / 100); + } else { + return -1; + } + } else { + return $this->parseMemoryLimit($softLimit); + } + return $softLimit; + } + + /** + * Interpret PHP shorthand for memory_limit and friends. + * Why don't they just expose the actual numeric value? :P + * @param string $mem + * @return int + */ + protected function parseMemoryLimit($mem) + { + // http://www.php.net/manual/en/faq.using.php#faq.using.shorthandbytes + $size = array('k' => 1024, + 'm' => 1024*1024, + 'g' => 1024*1024*1024); + if (empty($mem)) { + return 0; + } else if (is_numeric($mem)) { + return intval($mem); + } else { + $mult = strtolower(substr($mem, -1)); + if (isset($size[$mult])) { + return substr($mem, 0, -1) * $size[$mult]; + } else { + return intval($mem); + } + } + } + + function start() + { + foreach ($this->managers as $index => $manager) { + $manager->start($this); + // @fixme error check + if ($manager->pollInterval()) { + // We'll want to check for input on the first pass + $this->pollTimeouts[$index] = 0; + $this->lastPoll[$index] = 0; + } + } + } + + function finish() + { + foreach ($this->managers as $manager) { + $manager->finish(); + // @fixme error check + } + } + + /** + * Called during the idle portion of the runloop to see which handlers + */ + function poll() + { + foreach ($this->managers as $index => $manager) { + $interval = $manager->pollInterval(); + if ($interval <= 0) { + // Not a polling manager. + continue; + } + + if (isset($this->pollTimeouts[$index])) { + $timeout = $this->pollTimeouts[$index]; + if (time() - $this->lastPoll[$index] < $timeout) { + // Not time to poll yet. + continue; + } + } else { + $timeout = 0; + } + $hit = $manager->poll(); + + $this->lastPoll[$index] = time(); + if ($hit) { + // Do the next poll quickly, there may be more input! + $this->pollTimeouts[$index] = 0; + } else { + // Empty queue. Exponential backoff up to the maximum poll interval. + if ($timeout > 0) { + $timeout = min($timeout * 2, $interval); + } else { + $timeout = 1; + } + $this->pollTimeouts[$index] = $timeout; + } + } + } + + /** + * Called after each handled item or empty polling cycle. + * This is a good time to e.g. service your XMPP connection. + */ + function idle() + { + foreach ($this->managers as $manager) { + $manager->idle(); + } + } + + /** + * Send thread state update to the monitoring server, if configured. + * + * @param string $state ('init', 'queue', 'shutdown' etc) + * @param string $substate (optional, eg queue name 'omb' 'sms' etc) + */ + protected function logState($state, $substate='') + { + $this->monitor->logState($this->id, $state, $substate); + } + + /** + * Send thread stats. + * Thread ID will be implicit; other owners can be listed as well + * for per-queue and per-site records. + * + * @param string $key counter name + * @param array $owners list of owner keys like 'queue:jabber' or 'site:stat01' + */ + public function stats($key, $owners=array()) + { + $owners[] = "thread:" . $this->id; + $this->monitor->stats($key, $owners); + } +} + diff --git a/lib/jabber.php b/lib/jabber.php index a821856a8b..4cdfa67465 100644 --- a/lib/jabber.php +++ b/lib/jabber.php @@ -86,7 +86,11 @@ class Sharing_XMPP extends XMPPHP_XMPP } /** - * connect the configured Jabber account to the configured server + * Lazy-connect the configured Jabber account to the configured server; + * if already opened, the same connection will be returned. + * + * In a multi-site background process, each site configuration + * will get its own connection. * * @param string $resource Resource to connect (defaults to configured resource) * @@ -95,16 +99,19 @@ class Sharing_XMPP extends XMPPHP_XMPP function jabber_connect($resource=null) { - static $conn = null; - if (!$conn) { + static $connections = array(); + $site = common_config('site', 'server'); + if (empty($connections[$site])) { + if (empty($resource)) { + $resource = common_config('xmpp', 'resource'); + } $conn = new Sharing_XMPP(common_config('xmpp', 'host') ? common_config('xmpp', 'host') : common_config('xmpp', 'server'), common_config('xmpp', 'port'), common_config('xmpp', 'user'), common_config('xmpp', 'password'), - ($resource) ? $resource : - common_config('xmpp', 'resource'), + $resource, common_config('xmpp', 'server'), common_config('xmpp', 'debug') ? true : false, @@ -115,12 +122,16 @@ function jabber_connect($resource=null) if (!$conn) { return false; } + $connections[$site] = $conn; $conn->autoSubscribe(); $conn->useEncryption(common_config('xmpp', 'encryption')); try { - $conn->connect(true); // true = persistent connection + common_log(LOG_INFO, __METHOD__ . ": connecting " . + common_config('xmpp', 'user') . '/' . $resource); + //$conn->connect(true); // true = persistent connection + $conn->connect(); // persistent connections break multisite } catch (XMPPHP_Exception $e) { common_log(LOG_ERR, $e->getMessage()); return false; @@ -128,7 +139,7 @@ function jabber_connect($resource=null) $conn->processUntil('session_start'); } - return $conn; + return $connections[$site]; } /** @@ -345,77 +356,42 @@ function jabber_broadcast_notice($notice) $conn = jabber_connect(); - // First, get users to whom this is a direct reply - $user = new User(); - $UT = common_config('db','type')=='pgsql'?'"user"':'user'; - $user->query("SELECT $UT.id, $UT.jabber " . - "FROM $UT JOIN reply ON $UT.id = reply.profile_id " . - 'WHERE reply.notice_id = ' . $notice->id . ' ' . - "AND $UT.jabber is not null " . - "AND $UT.jabbernotify = 1 " . - "AND $UT.jabberreplies = 1 "); + $ni = $notice->whoGets(); + + foreach ($ni as $user_id => $reason) { + $user = User::staticGet($user_id); + if (empty($user) || + empty($user->jabber) || + !$user->jabbernotify) { + // either not a local user, or just not found + continue; + } + switch ($reason) { + case NOTICE_INBOX_SOURCE_REPLY: + if (!$user->jabberreplies) { + continue 2; + } + break; + case NOTICE_INBOX_SOURCE_SUB: + $sub = Subscription::pkeyGet(array('subscriber' => $user->id, + 'subscribed' => $notice->profile_id)); + if (empty($sub) || !$sub->jabber) { + continue 2; + } + break; + case NOTICE_INBOX_SOURCE_GROUP: + break; + default: + throw new Exception(sprintf(_("Unknown inbox source %d."), $reason)); + } - while ($user->fetch()) { common_log(LOG_INFO, - 'Sending reply notice ' . $notice->id . ' to ' . $user->jabber, + 'Sending notice ' . $notice->id . ' to ' . $user->jabber, __FILE__); $conn->message($user->jabber, $msg, 'chat', null, $entry); $conn->processTime(0); - $sent_to[$user->id] = 1; } - $user->free(); - - // Now, get users subscribed to this profile - - $user = new User(); - $user->query("SELECT $UT.id, $UT.jabber " . - "FROM $UT JOIN subscription " . - "ON $UT.id = subscription.subscriber " . - 'WHERE subscription.subscribed = ' . $notice->profile_id . ' ' . - "AND $UT.jabber is not null " . - "AND $UT.jabbernotify = 1 " . - 'AND subscription.jabber = 1 '); - - while ($user->fetch()) { - if (!array_key_exists($user->id, $sent_to)) { - common_log(LOG_INFO, - 'Sending notice ' . $notice->id . ' to ' . $user->jabber, - __FILE__); - $conn->message($user->jabber, $msg, 'chat', null, $entry); - // To keep the incoming queue from filling up, - // we service it after each send. - $conn->processTime(0); - $sent_to[$user->id] = 1; - } - } - - // Now, get users who have it in their inbox because of groups - - $user = new User(); - $user->query("SELECT $UT.id, $UT.jabber " . - "FROM $UT JOIN notice_inbox " . - "ON $UT.id = notice_inbox.user_id " . - 'WHERE notice_inbox.notice_id = ' . $notice->id . ' ' . - 'AND notice_inbox.source = 2 ' . - "AND $UT.jabber is not null " . - "AND $UT.jabbernotify = 1 "); - - while ($user->fetch()) { - if (!array_key_exists($user->id, $sent_to)) { - common_log(LOG_INFO, - 'Sending notice ' . $notice->id . ' to ' . $user->jabber, - __FILE__); - $conn->message($user->jabber, $msg, 'chat', null, $entry); - // To keep the incoming queue from filling up, - // we service it after each send. - $conn->processTime(0); - $sent_to[$user->id] = 1; - } - } - - $user->free(); - return true; } diff --git a/scripts/jabberqueuehandler.php b/lib/jabberqueuehandler.php old mode 100755 new mode 100644 similarity index 52% rename from scripts/jabberqueuehandler.php rename to lib/jabberqueuehandler.php index 8f3a56944d..b1518866d7 --- a/scripts/jabberqueuehandler.php +++ b/lib/jabberqueuehandler.php @@ -1,4 +1,3 @@ -#!/usr/bin/env php . */ -define('INSTALLDIR', realpath(dirname(__FILE__) . '/..')); +if (!defined('STATUSNET') && !defined('LACONICA')) { + exit(1); +} -$shortoptions = 'i::'; -$longoptions = array('id::'); - -$helptext = << 0) { - $id = $args[0]; -} else { - $id = null; -} - -$handler = new JabberQueueHandler($id); - -$handler->runOnce(); diff --git a/lib/liberalstomp.php b/lib/liberalstomp.php new file mode 100644 index 0000000000..c9233843a4 --- /dev/null +++ b/lib/liberalstomp.php @@ -0,0 +1,133 @@ + + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +class LiberalStomp extends Stomp +{ + /** + * We need to be able to get the socket so advanced daemons can + * do a select() waiting for input both from the queue and from + * other sources such as an XMPP connection. + * + * @return resource + */ + function getSocket() + { + return $this->_socket; + } + + /** + * Make socket connection to the server + * We also set the stream to non-blocking mode, since we'll be + * select'ing to wait for updates. In blocking mode it seems + * to get confused sometimes. + * + * @throws StompException + */ + protected function _makeConnection () + { + parent::_makeConnection(); + stream_set_blocking($this->_socket, 0); + } + + /** + * Version 1.0.0 of the Stomp library gets confused if messages + * come in too fast over the connection. This version will read + * out as many frames as are ready to be read from the socket. + * + * Modified from Stomp::readFrame() + * + * @return StompFrame False when no frame to read + */ + public function readFrames () + { + if (!$this->hasFrameToRead()) { + return false; + } + + $rb = 1024; + $data = ''; + $end = false; + $frames = array(); + + do { + // @fixme this sometimes hangs in blocking mode... + // shouldn't we have been idle until we found there's more data? + $read = fread($this->_socket, $rb); + if ($read === false) { + $this->_reconnect(); + // @fixme this will lose prior items + return $this->readFrames(); + } + $data .= $read; + if (strpos($data, "\x00") !== false) { + // Frames are null-delimited, but some servers + // may append an extra \n according to old bug reports. + $data = str_replace("\x00\n", "\x00", $data); + $chunks = explode("\x00", $data); + + $data = array_pop($chunks); + $frames = array_merge($frames, $chunks); + if ($data == '') { + // We're at the end of a frame; stop reading. + break; + } else { + // In the middle of a frame; keep going. + } + } + // @fixme find out why this len < 2 check was there + //$len = strlen($data); + } while (true);//$len < 2 || $end == false); + + return array_map(array($this, 'parseFrame'), $frames); + } + + /** + * Parse a raw Stomp frame into an object. + * Extracted from Stomp::readFrame() + * + * @param string $data + * @return StompFrame + */ + function parseFrame($data) + { + list ($header, $body) = explode("\n\n", $data, 2); + $header = explode("\n", $header); + $headers = array(); + $command = null; + foreach ($header as $v) { + if (isset($command)) { + list ($name, $value) = explode(':', $v, 2); + $headers[$name] = $value; + } else { + $command = $v; + } + } + $frame = new StompFrame($command, $headers, trim($body)); + if (isset($frame->headers['transformation']) && $frame->headers['transformation'] == 'jms-map-json') { + require_once 'Stomp/Message/Map.php'; + return new StompMessageMap($frame); + } else { + return $frame; + } + return $frame; + } +} + diff --git a/lib/mail.php b/lib/mail.php index 472a88e061..c724764cc8 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/mediafile.php b/lib/mediafile.php index 29d752f0c6..e3d5b1dbcc 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 5545d03ae9..62df5c9410 100644 --- a/lib/noticeform.php +++ b/lib/noticeform.php @@ -209,10 +209,12 @@ class NoticeForm extends Form $this->out->elementStart('div', array('id' => 'notice_data-geo_wrap', 'title' => common_local_url('geocode'))); - $this->out->checkbox('notice_data-geo', _('Share my location.'), true); + $this->out->checkbox('notice_data-geo', _('Share my location'), true); $this->out->elementEnd('div'); - $this->out->inlineScript(' var NoticeDataGeoShareDisable_text = "'._('Do not share my location.').'";'. - ' var NoticeDataGeoInfoMinimize_text = "'._('Hide this info').'";'); + $this->out->inlineScript(' var NoticeDataGeo_text = {'. + 'ShareDisable: "'._('Do not share my location').'",'. + 'ErrorTimeout: "'._('Sorry, retrieving your geo location is taking longer than expected, please try again later').'"'. + '}'); } Event::handle('EndShowNoticeFormData', array($this)); diff --git a/scripts/ombqueuehandler.php b/lib/ombqueuehandler.php old mode 100755 new mode 100644 similarity index 57% rename from scripts/ombqueuehandler.php rename to lib/ombqueuehandler.php index be33b98218..3ffc1313bc --- a/scripts/ombqueuehandler.php +++ b/lib/ombqueuehandler.php @@ -1,4 +1,3 @@ -#!/usr/bin/env php . */ -define('INSTALLDIR', realpath(dirname(__FILE__) . '/..')); - -$shortoptions = 'i::'; -$longoptions = array('id::'); - -$helptext = <<log(LOG_INFO, "INITIALIZE"); - return true; - } - + /** + * @fixme doesn't currently report failure back to the queue manager + * because omb_broadcast_notice() doesn't report it to us + */ function handle_notice($notice) { if ($this->is_remote($notice)) { $this->log(LOG_DEBUG, 'Ignoring remote notice ' . $notice->id); return true; } else { - return omb_broadcast_notice($notice); + require_once(INSTALLDIR.'/lib/omb.php'); + omb_broadcast_notice($notice); + return true; } } - function finish() - { - } - function is_remote($notice) { $user = User::staticGet($notice->profile_id); return is_null($user); } } - -if (have_option('i')) { - $id = get_option_value('i'); -} else if (have_option('--id')) { - $id = get_option_value('--id'); -} else if (count($args) > 0) { - $id = $args[0]; -} else { - $id = null; -} - -$handler = new OmbQueueHandler($id); - -$handler->runOnce(); diff --git a/lib/pingqueuehandler.php b/lib/pingqueuehandler.php new file mode 100644 index 0000000000..8bb2180786 --- /dev/null +++ b/lib/pingqueuehandler.php @@ -0,0 +1,37 @@ +. + */ + +if (!defined('STATUSNET') && !defined('LACONICA')) { + exit(1); +} + +/** + * Queue handler for pushing new notices to ping servers. + */ +class PingQueueHandler extends QueueHandler { + + function transport() { + return 'ping'; + } + + function handle_notice($notice) { + require_once INSTALLDIR . '/lib/ping.php'; + return ping_broadcast_notice($notice); + } +} diff --git a/scripts/pluginqueuehandler.php b/lib/pluginqueuehandler.php old mode 100755 new mode 100644 similarity index 61% rename from scripts/pluginqueuehandler.php rename to lib/pluginqueuehandler.php index fa39bdda6a..24d5046997 --- a/scripts/pluginqueuehandler.php +++ b/lib/pluginqueuehandler.php @@ -1,4 +1,3 @@ -#!/usr/bin/env php . */ -define('INSTALLDIR', realpath(dirname(__FILE__) . '/..')); - -$shortoptions = 'i::'; -$longoptions = array('id::'); - -$helptext = <<log(LOG_INFO, "INITIALIZE"); - return true; - } - function handle_notice($notice) { Event::handle('HandleQueuedNotice', array(&$notice)); return true; } } - -if (have_option('i', 'id')) { - $id = get_option_value('i', 'id'); -} else { - $id = null; -} - -$handler = new PluginQueueHandler($id); -$handler->runOnce(); diff --git a/scripts/publicqueuehandler.php b/lib/publicqueuehandler.php old mode 100755 new mode 100644 similarity index 52% rename from scripts/publicqueuehandler.php rename to lib/publicqueuehandler.php index 50a11bcba0..9ea9ee73a3 --- a/scripts/publicqueuehandler.php +++ b/lib/publicqueuehandler.php @@ -1,4 +1,3 @@ -#!/usr/bin/env php . */ -define('INSTALLDIR', realpath(dirname(__FILE__) . '/..')); +if (!defined('STATUSNET') && !defined('LACONICA')) { + exit(1); +} -$shortoptions = 'i::'; -$longoptions = array('id::'); - -$helptext = <<log(LOG_ERR, "Got an XMPPHP_Exception: " . $e->getMessage()); die($e->getMessage()); } + return true; } } - -// Abort immediately if xmpp is not enabled, otherwise the daemon chews up -// lots of CPU trying to connect to unconfigured servers -if (common_config('xmpp','enabled')==false) { - print "Aborting daemon - xmpp is disabled\n"; - exit(); -} - -if (have_option('i')) { - $id = get_option_value('i'); -} else if (have_option('--id')) { - $id = get_option_value('--id'); -} else if (count($args) > 0) { - $id = $args[0]; -} else { - $id = null; -} - -$handler = new PublicQueueHandler($id); - -$handler->runOnce(); diff --git a/lib/queuehandler.php b/lib/queuehandler.php index cd43b1e09a..613be6e330 100644 --- a/lib/queuehandler.php +++ b/lib/queuehandler.php @@ -19,14 +19,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } -require_once(INSTALLDIR.'/lib/daemon.php'); -require_once(INSTALLDIR.'/classes/Queue_item.php'); -require_once(INSTALLDIR.'/classes/Notice.php'); - -define('CLAIM_TIMEOUT', 1200); -define('QUEUE_HANDLER_MISS_IDLE', 10); -define('QUEUE_HANDLER_HIT_IDLE', 0); - /** * Base class for queue handlers. * @@ -36,24 +28,20 @@ define('QUEUE_HANDLER_HIT_IDLE', 0); * * Subclasses must override at least the following methods: * - transport - * - start - * - finish * - handle_notice - * - * Some subclasses will also want to override the idle handler: - * - idle */ -class QueueHandler extends Daemon +#class QueueHandler extends Daemon +class QueueHandler { - function __construct($id=null, $daemonize=true) - { - parent::__construct($daemonize); - - if ($id) { - $this->set_id($id); - } - } +# function __construct($id=null, $daemonize=true) +# { +# parent::__construct($daemonize); +# +# if ($id) { +# $this->set_id($id); +# } +# } /** * How many seconds a polling-based queue manager should wait between @@ -61,22 +49,23 @@ class QueueHandler extends Daemon * * Defaults to 60 seconds; override to speed up or slow down. * + * @fixme not really compatible with global queue manager * @return int timeout in seconds */ - function timeout() - { - return 60; - } +# function timeout() +# { +# return 60; +# } - function class_name() - { - return ucfirst($this->transport()) . 'Handler'; - } +# function class_name() +# { +# return ucfirst($this->transport()) . 'Handler'; +# } - function name() - { - return strtolower($this->class_name().'.'.$this->get_id()); - } +# function name() +# { +# return strtolower($this->class_name().'.'.$this->get_id()); +# } /** * Return transport keyword which identifies items this queue handler @@ -92,30 +81,6 @@ class QueueHandler extends Daemon return null; } - /** - * Initialization, run when the queue handler starts. - * If this function indicates failure, the handler run will be aborted. - * - * @fixme run() will abort if this doesn't return true, - * but some subclasses don't bother. - * @return boolean true on success, false on failure - */ - function start() - { - } - - /** - * Cleanup, run when the queue handler ends. - * If this function indicates failure, a warning will be logged. - * - * @fixme run() will throw warnings if this doesn't return true, - * but many subclasses don't bother. - * @return boolean true on success, false on failure - */ - function finish() - { - } - /** * Here's the meat of your queue handler -- you're handed a Notice * object, which you may do as you will with. @@ -169,29 +134,10 @@ class QueueHandler extends Daemon return true; } - /** - * Called by QueueHandler after each handled item or empty polling cycle. - * This is a good time to e.g. service your XMPP connection. - * - * Doesn't need to be overridden if there's no maintenance to do. - * - * @param int $timeout seconds to sleep if there's nothing to do - */ - function idle($timeout=0) - { - if ($timeout > 0) { - sleep($timeout); - } - } function log($level, $msg) { common_log($level, $this->class_name() . ' ('. $this->get_id() .'): '.$msg); } - - function getSockets() - { - return array(); - } } diff --git a/lib/queuemanager.php b/lib/queuemanager.php index 43105b7a86..291174d3c4 100644 --- a/lib/queuemanager.php +++ b/lib/queuemanager.php @@ -2,7 +2,7 @@ /** * StatusNet, the distributed open-source microblogging tool * - * Abstract class for queue managers + * Abstract class for i/o managers * * PHP version 5 * @@ -23,16 +23,32 @@ * @package StatusNet * @author Evan Prodromou * @author Sarven Capadisli - * @copyright 2009 StatusNet, Inc. + * @author Brion Vibber + * @copyright 2009-2010 StatusNet, Inc. * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ -class QueueManager +/** + * Completed child classes must implement the enqueue() method. + * + * For background processing, classes should implement either socket-based + * input (handleInput(), getSockets()) or idle-loop polling (idle()). + */ +abstract class QueueManager extends IoManager { static $qm = null; - static function get() + /** + * Factory function to pull the appropriate QueueManager object + * for this site's configuration. It can then be used to queue + * events for later processing or to spawn a processing loop. + * + * Plugins can add to the built-in types by hooking StartNewQueueManager. + * + * @return QueueManager + */ + public static function get() { if (empty(self::$qm)) { @@ -62,13 +78,136 @@ class QueueManager return self::$qm; } - function enqueue($object, $queue) + /** + * @fixme wouldn't necessarily work with other class types. + * Better to change the interface...? + */ + public static function multiSite() { - throw ServerException("Unimplemented function 'enqueue' called"); + if (common_config('queue', 'subsystem') == 'stomp') { + return IoManager::INSTANCE_PER_PROCESS; + } else { + return IoManager::SINGLE_ONLY; + } } - function service($queue, $handler) + function __construct() { - throw ServerException("Unimplemented function 'service' called"); + $this->initialize(); + } + + /** + * Store an object (usually/always a Notice) into the given queue + * for later processing. No guarantee is made on when it will be + * processed; it could be immediately or at some unspecified point + * in the future. + * + * Must be implemented by any queue manager. + * + * @param Notice $object + * @param string $queue + */ + abstract function enqueue($object, $queue); + + /** + * Instantiate the appropriate QueueHandler class for the given queue. + * + * @param string $queue + * @return mixed QueueHandler or null + */ + function getHandler($queue) + { + if (isset($this->handlers[$queue])) { + $class = $this->handlers[$queue]; + if (class_exists($class)) { + return new $class(); + } else { + common_log(LOG_ERR, "Nonexistent handler class '$class' for queue '$queue'"); + } + } else { + common_log(LOG_ERR, "Requested handler for unkown queue '$queue'"); + } + return null; + } + + /** + * Get a list of all registered queue transport names. + * + * @return array of strings + */ + function getQueues() + { + return array_keys($this->handlers); + } + + /** + * Initialize the list of queue handlers + * + * @event StartInitializeQueueManager + * @event EndInitializeQueueManager + */ + function initialize() + { + if (Event::handle('StartInitializeQueueManager', array($this))) { + if (!defined('XMPP_ONLY_FLAG')) { // hack! + $this->connect('plugin', 'PluginQueueHandler'); + $this->connect('omb', 'OmbQueueHandler'); + $this->connect('ping', 'PingQueueHandler'); + if (common_config('sms', 'enabled')) { + $this->connect('sms', 'SmsQueueHandler'); + } + } + + // XMPP output handlers... + if (common_config('xmpp', 'enabled') && !defined('XMPP_EMERGENCY_FLAG')) { + $this->connect('jabber', 'JabberQueueHandler'); + $this->connect('public', 'PublicQueueHandler'); + + // @fixme this should move up a level or should get an actual queue + $this->connect('confirm', 'XmppConfirmHandler'); + } + + if (!defined('XMPP_ONLY_FLAG')) { // hack! + // For compat with old plugins not registering their own handlers. + $this->connect('plugin', 'PluginQueueHandler'); + } + } + if (!defined('XMPP_ONLY_FLAG')) { // hack! + Event::handle('EndInitializeQueueManager', array($this)); + } + } + + /** + * Register a queue transport name and handler class for your plugin. + * Only registered transports will be reliably picked up! + * + * @param string $transport + * @param string $class + */ + public function connect($transport, $class) + { + $this->handlers[$transport] = $class; + } + + /** + * Send a statistic ping to the queue monitoring system, + * optionally with a per-queue id. + * + * @param string $key + * @param string $queue + */ + function stats($key, $queue=false) + { + $owners = array(); + if ($queue) { + $owners[] = "queue:$queue"; + $owners[] = "site:" . common_config('site', 'server'); + } + if (isset($this->master)) { + $this->master->stats($key, $owners); + } else { + $monitor = new QueueMonitor(); + $monitor->stats($key, $owners); + } } } diff --git a/lib/queuemonitor.php b/lib/queuemonitor.php new file mode 100644 index 0000000000..1c306a6298 --- /dev/null +++ b/lib/queuemonitor.php @@ -0,0 +1,116 @@ +. + * + * @category QueueManager + * @package StatusNet + * @author Brion Vibber + * @copyright 2010 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +class QueueMonitor +{ + protected $monSocket = null; + + /** + * Increment monitoring statistics for a given counter, if configured. + * Only explicitly listed thread/site/queue owners will be incremented. + * + * @param string $key counter name + * @param array $owners list of owner keys like 'queue:jabber' or 'site:stat01' + */ + public function stats($key, $owners=array()) + { + $this->ping(array('counter' => $key, + 'owners' => $owners)); + } + + /** + * Send thread state update to the monitoring server, if configured. + * + * @param string $thread ID (eg 'generic.1') + * @param string $state ('init', 'queue', 'shutdown' etc) + * @param string $substate (optional, eg queue name 'omb' 'sms' etc) + */ + public function logState($threadId, $state, $substate='') + { + $this->ping(array('thread_id' => $threadId, + 'state' => $state, + 'substate' => $substate, + 'ts' => microtime(true))); + } + + /** + * General call to the monitoring server + */ + protected function ping($data) + { + $target = common_config('queue', 'monitor'); + if (empty($target)) { + return; + } + + $data = $this->prepMonitorData($data); + + if (substr($target, 0, 4) == 'udp:') { + $this->pingUdp($target, $data); + } else if (substr($target, 0, 5) == 'http:') { + $this->pingHttp($target, $data); + } else { + common_log(LOG_ERR, __METHOD__ . ' unknown monitor target type ' . $target); + } + } + + protected function pingUdp($target, $data) + { + if (!$this->monSocket) { + $this->monSocket = stream_socket_client($target, $errno, $errstr); + } + if ($this->monSocket) { + $post = http_build_query($data, '', '&'); + stream_socket_sendto($this->monSocket, $post); + } else { + common_log(LOG_ERR, __METHOD__ . " UDP logging fail: $errstr"); + } + } + + protected function pingHttp($target, $data) + { + $client = new HTTPClient(); + $result = $client->post($target, array(), $data); + + if (!$result->isOk()) { + common_log(LOG_ERR, __METHOD__ . ' HTTP ' . $result->getStatus() . + ': ' . $result->getBody()); + } + } + + protected function prepMonitorData($data) + { + #asort($data); + #$macdata = http_build_query($data, '', '&'); + #$key = 'This is a nice old key'; + #$data['hmac'] = hash_hmac('sha256', $macdata, $key); + return $data; + } + +} diff --git a/lib/router.php b/lib/router.php index 287d3c79fd..42bff27788 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 @@ -137,8 +140,8 @@ class Router // settings - foreach (array('profile', 'avatar', 'password', 'im', - 'email', 'sms', 'userdesign', 'other') as $s) { + foreach (array('profile', 'avatar', 'password', 'im', 'oauthconnections', + 'oauthapps', 'email', 'sms', 'userdesign', 'other') as $s) { $m->connect('settings/'.$s, array('action' => $s.'settings')); } @@ -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 @@ -638,6 +641,27 @@ class Router array('nickname' => '[a-zA-Z0-9]{1,64}')); } + $m->connect('settings/oauthapps/show/:id', + array('action' => 'showapplication'), + array('id' => '[0-9]+') + ); + $m->connect('settings/oauthapps/new', + array('action' => 'newapplication') + ); + $m->connect('settings/oauthapps/edit/:id', + array('action' => 'editapplication'), + array('id' => '[0-9]+') + ); + + $m->connect('api/oauth/request_token', + array('action' => 'apioauthrequesttoken')); + + $m->connect('api/oauth/access_token', + array('action' => 'apioauthaccesstoken')); + + $m->connect('api/oauth/authorize', + array('action' => 'apioauthauthorize')); + foreach (array('subscriptions', 'subscribers') as $a) { $m->connect(':nickname/'.$a.'/:tag', array('action' => $a), diff --git a/scripts/smsqueuehandler.php b/lib/smsqueuehandler.php old mode 100755 new mode 100644 similarity index 54% rename from scripts/smsqueuehandler.php rename to lib/smsqueuehandler.php index 6583a77da8..48a96409d0 --- a/scripts/smsqueuehandler.php +++ b/lib/smsqueuehandler.php @@ -1,4 +1,3 @@ -#!/usr/bin/env php . */ -define('INSTALLDIR', realpath(dirname(__FILE__) . '/..')); - -$shortoptions = 'i::'; -$longoptions = array('id::'); - -$helptext = <<log(LOG_INFO, "INITIALIZE"); - return true; - } - function handle_notice($notice) { + require_once(INSTALLDIR.'/lib/mail.php'); return mail_broadcast_notice_sms($notice); } - - function finish() - { - } } - -if (have_option('i')) { - $id = get_option_value('i'); -} else if (have_option('--id')) { - $id = get_option_value('--id'); -} else if (count($args) > 0) { - $id = $args[0]; -} else { - $id = null; -} - -$handler = new SmsQueueHandler($id); - -$handler->runOnce(); diff --git a/lib/snapshot.php b/lib/snapshot.php index 2a10c6b935..a16087ac00 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/statusnet.php b/lib/statusnet.php new file mode 100644 index 0000000000..29e9030267 --- /dev/null +++ b/lib/statusnet.php @@ -0,0 +1,298 @@ +. + * + */ + +if (!defined('STATUSNET') && !defined('LACONICA')) { + exit(1); +} + +global $config, $_server, $_path; + +/** + * Global configuration setup and management. + */ +class StatusNet +{ + protected static $have_config; + + /** + * Configure and instantiate a plugin into the current configuration. + * Class definitions will be loaded from standard paths if necessary. + * Note that initialization events won't be fired until later. + * + * @param string $name class name & plugin file/subdir name + * @param array $attrs key/value pairs of public attributes to set on plugin instance + * + * @throws ServerException if plugin can't be found + */ + public static function addPlugin($name, $attrs = null) + { + $name = ucfirst($name); + $pluginclass = "{$name}Plugin"; + + if (!class_exists($pluginclass)) { + + $files = array("local/plugins/{$pluginclass}.php", + "local/plugins/{$name}/{$pluginclass}.php", + "local/{$pluginclass}.php", + "local/{$name}/{$pluginclass}.php", + "plugins/{$pluginclass}.php", + "plugins/{$name}/{$pluginclass}.php"); + + foreach ($files as $file) { + $fullpath = INSTALLDIR.'/'.$file; + if (@file_exists($fullpath)) { + include_once($fullpath); + break; + } + } + if (!class_exists($pluginclass)) { + throw new ServerException(500, "Plugin $name not found."); + } + } + + $inst = new $pluginclass(); + if (!empty($attrs)) { + foreach ($attrs as $aname => $avalue) { + $inst->$aname = $avalue; + } + } + return true; + } + + /** + * Initialize, or re-initialize, StatusNet global configuration + * and plugins. + * + * If switching site configurations during script execution, be + * careful when working with leftover objects -- global settings + * affect many things and they may not behave as you expected. + * + * @param $server optional web server hostname for picking config + * @param $path optional URL path for picking config + * @param $conffile optional configuration file path + * + * @throws NoConfigException if config file can't be found + */ + public static function init($server=null, $path=null, $conffile=null) + { + StatusNet::initDefaults($server, $path); + StatusNet::loadConfigFile($conffile); + + // Load settings from database; note we need autoload for this + Config::loadSettings(); + + self::initPlugins(); + } + + /** + * Fire initialization events for all instantiated plugins. + */ + protected static function initPlugins() + { + // Load default plugins + foreach (common_config('plugins', 'default') as $name => $params) { + if (is_null($params)) { + addPlugin($name); + } else if (is_array($params)) { + if (count($params) == 0) { + addPlugin($name); + } else { + $keys = array_keys($params); + if (is_string($keys[0])) { + addPlugin($name, $params); + } else { + foreach ($params as $paramset) { + addPlugin($name, $paramset); + } + } + } + } + } + + // XXX: if plugins should check the schema at runtime, do that here. + if (common_config('db', 'schemacheck') == 'runtime') { + Event::handle('CheckSchema'); + } + + // Give plugins a chance to initialize in a fully-prepared environment + Event::handle('InitializePlugin'); + } + + /** + * Quick-check if configuration has been established. + * Useful for functions which may get used partway through + * initialization to back off from fancier things. + * + * @return bool + */ + public function haveConfig() + { + return self::$have_config; + } + + /** + * Build default configuration array + * @return array + */ + protected static function defaultConfig() + { + global $_server, $_path; + require(INSTALLDIR.'/lib/default.php'); + return $default; + } + + /** + * Establish default configuration based on given or default server and path + * Sets global $_server, $_path, and $config + */ + protected static function initDefaults($server, $path) + { + global $_server, $_path, $config; + + Event::clearHandlers(); + + // try to figure out where we are. $server and $path + // can be set by including module, else we guess based + // on HTTP info. + + if (isset($server)) { + $_server = $server; + } else { + $_server = array_key_exists('SERVER_NAME', $_SERVER) ? + strtolower($_SERVER['SERVER_NAME']) : + null; + } + + if (isset($path)) { + $_path = $path; + } else { + $_path = (array_key_exists('SERVER_NAME', $_SERVER) && array_key_exists('SCRIPT_NAME', $_SERVER)) ? + self::_sn_to_path($_SERVER['SCRIPT_NAME']) : + null; + } + + // Set config values initially to default values + $default = self::defaultConfig(); + $config = $default; + + // default configuration, overwritten in config.php + // Keep DB_DataObject's db config synced to ours... + + $config['db'] = &PEAR::getStaticProperty('DB_DataObject','options'); + + $config['db'] = $default['db']; + + // Backward compatibility + + $config['site']['design'] =& $config['design']; + + if (function_exists('date_default_timezone_set')) { + /* Work internally in UTC */ + date_default_timezone_set('UTC'); + } + } + + protected function _sn_to_path($sn) + { + $past_root = substr($sn, 1); + $last_slash = strrpos($past_root, '/'); + if ($last_slash > 0) { + $p = substr($past_root, 0, $last_slash); + } else { + $p = ''; + } + return $p; + } + + /** + * Load the default or specified configuration file. + * Modifies global $config and may establish plugins. + * + * @throws NoConfigException + */ + protected function loadConfigFile($conffile=null) + { + global $_server, $_path, $config; + + // From most general to most specific: + // server-wide, then vhost-wide, then for a path, + // finally for a dir (usually only need one of the last two). + + if (isset($conffile)) { + $config_files = array($conffile); + } else { + $config_files = array('/etc/statusnet/statusnet.php', + '/etc/statusnet/laconica.php', + '/etc/laconica/laconica.php', + '/etc/statusnet/'.$_server.'.php', + '/etc/laconica/'.$_server.'.php'); + + if (strlen($_path) > 0) { + $config_files[] = '/etc/statusnet/'.$_server.'_'.$_path.'.php'; + $config_files[] = '/etc/laconica/'.$_server.'_'.$_path.'.php'; + } + + $config_files[] = INSTALLDIR.'/config.php'; + } + + self::$have_config = false; + + foreach ($config_files as $_config_file) { + if (@file_exists($_config_file)) { + include($_config_file); + self::$have_config = true; + } + } + + if (!self::$have_config) { + throw new NoConfigException("No configuration file found.", + $config_files); + } + + // Fixup for statusnet.ini + $_db_name = substr($config['db']['database'], strrpos($config['db']['database'], '/') + 1); + + if ($_db_name != 'statusnet' && !array_key_exists('ini_'.$_db_name, $config['db'])) { + $config['db']['ini_'.$_db_name] = INSTALLDIR.'/classes/statusnet.ini'; + } + + // Backwards compatibility + + if (array_key_exists('memcached', $config)) { + if ($config['memcached']['enabled']) { + addPlugin('Memcache', array('servers' => $config['memcached']['server'])); + } + + if (!empty($config['memcached']['base'])) { + $config['cache']['base'] = $config['memcached']['base']; + } + } + } +} + +class NoConfigException extends Exception +{ + public $config_files; + + function __construct($msg, $config_files) { + parent::__construct($msg); + $this->config_files = $config_files; + } +} diff --git a/lib/stompqueuemanager.php b/lib/stompqueuemanager.php index f059b42f00..00590fdb69 100644 --- a/lib/stompqueuemanager.php +++ b/lib/stompqueuemanager.php @@ -30,31 +30,202 @@ require_once 'Stomp.php'; -class LiberalStomp extends Stomp -{ - function getSocket() - { - return $this->_socket; - } -} -class StompQueueManager +class StompQueueManager extends QueueManager { var $server = null; var $username = null; var $password = null; var $base = null; var $con = null; + + protected $master = null; + protected $sites = array(); function __construct() { + parent::__construct(); $this->server = common_config('queue', 'stomp_server'); $this->username = common_config('queue', 'stomp_username'); $this->password = common_config('queue', 'stomp_password'); $this->base = common_config('queue', 'queue_basename'); } - function _connect() + /** + * Tell the i/o master we only need a single instance to cover + * all sites running in this process. + */ + public static function multiSite() + { + return IoManager::INSTANCE_PER_PROCESS; + } + + /** + * Record each site we'll be handling input for in this process, + * so we can listen to the necessary queues for it. + * + * @fixme possibly actually do subscription here to save another + * loop over all sites later? + * @fixme possibly don't assume it's the current site + */ + public function addSite($server) + { + $this->sites[] = $server; + $this->initialize(); + } + + + /** + * Instantiate the appropriate QueueHandler class for the given queue. + * + * @param string $queue + * @return mixed QueueHandler or null + */ + function getHandler($queue) + { + $handlers = $this->handlers[common_config('site', 'server')]; + if (isset($handlers[$queue])) { + $class = $handlers[$queue]; + if (class_exists($class)) { + return new $class(); + } else { + common_log(LOG_ERR, "Nonexistent handler class '$class' for queue '$queue'"); + } + } else { + common_log(LOG_ERR, "Requested handler for unkown queue '$queue'"); + } + return null; + } + + /** + * Get a list of all registered queue transport names. + * + * @return array of strings + */ + function getQueues() + { + $site = common_config('site', 'server'); + if (empty($this->handlers[$site])) { + return array(); + } else { + return array_keys($this->handlers[$site]); + } + } + + /** + * Register a queue transport name and handler class for your plugin. + * Only registered transports will be reliably picked up! + * + * @param string $transport + * @param string $class + */ + public function connect($transport, $class) + { + $this->handlers[common_config('site', 'server')][$transport] = $class; + } + + /** + * Saves a notice object reference into the queue item table. + * @return boolean true on success + */ + public function enqueue($object, $queue) + { + $notice = $object; + + $this->_connect(); + + // XXX: serialize and send entire notice + + $result = $this->con->send($this->queueName($queue), + $notice->id, // BODY of the message + array ('created' => $notice->created)); + + if (!$result) { + common_log(LOG_ERR, 'Error sending to '.$queue.' queue'); + return false; + } + + common_log(LOG_DEBUG, 'complete remote queueing notice ID = ' + . $notice->id . ' for ' . $queue); + $this->stats('enqueued', $queue); + } + + /** + * Send any sockets we're listening on to the IO manager + * to wait for input. + * + * @return array of resources + */ + public function getSockets() + { + return array($this->con->getSocket()); + } + + /** + * We've got input to handle on our socket! + * Read any waiting Stomp frame(s) and process them. + * + * @param resource $socket + * @return boolean ok on success + */ + public function handleInput($socket) + { + assert($socket === $this->con->getSocket()); + $ok = true; + $frames = $this->con->readFrames(); + foreach ($frames as $frame) { + $ok = $ok && $this->_handleNotice($frame); + } + return $ok; + } + + /** + * Initialize our connection and subscribe to all the queues + * we're going to need to handle... + * + * Side effects: in multi-site mode, may reset site configuration. + * + * @param IoMaster $master process/event controller + * @return bool return false on failure + */ + public function start($master) + { + parent::start($master); + if ($this->sites) { + foreach ($this->sites as $server) { + StatusNet::init($server); + $this->doSubscribe(); + } + } else { + $this->doSubscribe(); + } + return true; + } + + /** + * Subscribe to all the queues we're going to need to handle... + * + * Side effects: in multi-site mode, may reset site configuration. + * + * @return bool return false on failure + */ + public function finish() + { + if ($this->sites) { + foreach ($this->sites as $server) { + StatusNet::init($server); + $this->doUnsubscribe(); + } + } else { + $this->doUnsubscribe(); + } + return true; + } + + /** + * Lazy open connection to Stomp queue server. + */ + protected function _connect() { if (empty($this->con)) { $this->_log(LOG_INFO, "Connecting to '$this->server' as '$this->username'..."); @@ -69,97 +240,119 @@ class StompQueueManager } } - function enqueue($object, $queue) + /** + * Subscribe to all enabled notice queues for the current site. + */ + protected function doSubscribe() { - $notice = $object; - $this->_connect(); + foreach ($this->getQueues() as $queue) { + $rawqueue = $this->queueName($queue); + $this->_log(LOG_INFO, "Subscribing to $rawqueue"); + $this->con->subscribe($rawqueue); + } + } + + /** + * Subscribe from all enabled notice queues for the current site. + */ + protected function doUnsubscribe() + { + $this->_connect(); + foreach ($this->getQueues() as $queue) { + $this->con->unsubscribe($this->queueName($queue)); + } + } - // XXX: serialize and send entire notice + /** + * Handle and acknowledge a notice event that's come in through a queue. + * + * If the queue handler reports failure, the message is requeued for later. + * Missing notices or handler classes will drop the message. + * + * Side effects: in multi-site mode, may reset site configuration to + * match the site that queued the event. + * + * @param StompFrame $frame + * @return bool + */ + protected function _handleNotice($frame) + { + list($site, $queue) = $this->parseDestination($frame->headers['destination']); + if ($site != common_config('site', 'server')) { + $this->stats('switch'); + StatusNet::init($site); + } - $result = $this->con->send($this->_queueName($queue), - $notice->id, // BODY of the message - array ('created' => $notice->created)); + $id = intval($frame->body); + $info = "notice $id posted at {$frame->headers['created']} in queue $queue"; - if (!$result) { - common_log(LOG_ERR, 'Error sending to '.$queue.' queue'); + $notice = Notice::staticGet('id', $id); + if (empty($notice)) { + $this->_log(LOG_WARNING, "Skipping missing $info"); + $this->con->ack($frame); + $this->stats('badnotice', $queue); return false; } - common_log(LOG_DEBUG, 'complete remote queueing notice ID = ' - . $notice->id . ' for ' . $queue); - } - - function service($queue, $handler) - { - $result = null; - - $this->_connect(); - - $this->con->setReadTimeout($handler->timeout()); - - $this->con->subscribe($this->_queueName($queue)); - - while (true) { - - // Wait for something on one of our sockets - - $stompsock = $this->con->getSocket(); - - $handsocks = $handler->getSockets(); - - $socks = array_merge(array($stompsock), $handsocks); - - $read = $socks; - $write = array(); - $except = array(); - - $ready = stream_select($read, $write, $except, $handler->timeout(), 0); - - if ($ready === false) { - $this->_log(LOG_ERR, "Error selecting on sockets"); - } else if ($ready > 0) { - if (in_array($stompsock, $read)) { - $this->_handleNotice($queue, $handler); - } - $handler->idle(QUEUE_HANDLER_HIT_IDLE); - } + $handler = $this->getHandler($queue); + if (!$handler) { + $this->_log(LOG_ERROR, "Missing handler class; skipping $info"); + $this->con->ack($frame); + $this->stats('badhandler', $queue); + return false; } - $this->con->unsubscribe($this->_queueName($queue)); - } + $ok = $handler->handle_notice($notice); - function _handleNotice($queue, $handler) - { - $frame = $this->con->readFrame(); - - if (!empty($frame)) { - $notice = Notice::staticGet('id', $frame->body); - - if (empty($notice)) { - $this->_log(LOG_WARNING, 'Got ID '. $frame->body .' for non-existent notice in queue '. $queue); - $this->con->ack($frame); - } else { - if ($handler->handle_notice($notice)) { - $this->_log(LOG_INFO, 'Successfully handled notice '. $notice->id .' posted at ' . $frame->headers['created'] . ' in queue '. $queue); - $this->con->ack($frame); - } else { - $this->_log(LOG_WARNING, 'Failed handling notice '. $notice->id .' posted at ' . $frame->headers['created'] . ' in queue '. $queue); - // FIXME we probably shouldn't have to do - // this kind of queue management ourselves - $this->con->ack($frame); - $this->enqueue($notice, $queue); - } - unset($notice); - } - - unset($frame); + if (!$ok) { + $this->_log(LOG_WARNING, "Failed handling $info"); + // FIXME we probably shouldn't have to do + // this kind of queue management ourselves; + // if we don't ack, it should resend... + $this->con->ack($frame); + $this->enqueue($notice, $queue); + $this->stats('requeued', $queue); + return false; } + + $this->_log(LOG_INFO, "Successfully handled $info"); + $this->con->ack($frame); + $this->stats('handled', $queue); + return true; } - function _queueName($queue) + /** + * Combines the queue_basename from configuration with the + * site server name and queue name to give eg: + * + * /queue/statusnet/identi.ca/sms + * + * @param string $queue + * @return string + */ + protected function queueName($queue) { - return common_config('queue', 'queue_basename') . $queue; + return common_config('queue', 'queue_basename') . + common_config('site', 'server') . '/' . $queue; + } + + /** + * Returns the site and queue name from the server-side queue. + * + * @param string queue destination (eg '/queue/statusnet/identi.ca/sms') + * @return array of site and queue: ('identi.ca','sms') or false if unrecognized + */ + protected function parseDestination($dest) + { + $prefix = common_config('queue', 'queue_basename'); + if (substr($dest, 0, strlen($prefix)) == $prefix) { + $rest = substr($dest, strlen($prefix)); + return explode("/", $rest, 2); + } else { + common_log(LOG_ERR, "Got a message from unrecognized stomp queue: $dest"); + return array(false, false); + } } function _log($level, $msg) @@ -167,3 +360,4 @@ class StompQueueManager common_log($level, 'StompQueueManager: '.$msg); } } + diff --git a/lib/subs.php b/lib/subs.php index 4b6b03967a..5ac1a75a5c 100644 --- a/lib/subs.php +++ b/lib/subs.php @@ -56,35 +56,44 @@ function subs_subscribe_to($user, $other) return _('User has blocked you.'); } - if (!$user->subscribeTo($other)) { - return _('Could not subscribe.'); - return; - } + try { + if (Event::handle('StartSubscribe', array($user, $other))) { - subs_notify($other, $user); + if (!$user->subscribeTo($other)) { + return _('Could not subscribe.'); + return; + } - $cache = common_memcache(); + subs_notify($other, $user); - if ($cache) { - $cache->delete(common_cache_key('user:notices_with_friends:' . $user->id)); - } + $cache = common_memcache(); - $profile = $user->getProfile(); + if ($cache) { + $cache->delete(common_cache_key('user:notices_with_friends:' . $user->id)); + } - $profile->blowSubscriptionsCount(); - $other->blowSubscribersCount(); + $profile = $user->getProfile(); - if ($other->autosubscribe && !$other->isSubscribed($user) && !$user->hasBlocked($other)) { - if (!$other->subscribeTo($user)) { - return _('Could not subscribe other to you.'); + $profile->blowSubscriptionsCount(); + $other->blowSubscribersCount(); + + if ($other->autosubscribe && !$other->isSubscribed($user) && !$user->hasBlocked($other)) { + if (!$other->subscribeTo($user)) { + return _('Could not subscribe other to you.'); + } + $cache = common_memcache(); + + if ($cache) { + $cache->delete(common_cache_key('user:notices_with_friends:' . $other->id)); + } + + subs_notify($user, $other); + } + + Event::handle('EndSubscribe', array($user, $other)); } - $cache = common_memcache(); - - if ($cache) { - $cache->delete(common_cache_key('user:notices_with_friends:' . $other->id)); - } - - subs_notify($user, $other); + } catch (Exception $e) { + return $e->getMessage(); } return true; @@ -133,28 +142,37 @@ function subs_unsubscribe_to($user, $other) return _('Couldn\'t delete self-subscription.'); } - $sub = DB_DataObject::factory('subscription'); + try { + if (Event::handle('StartUnsubscribe', array($user, $other))) { - $sub->subscriber = $user->id; - $sub->subscribed = $other->id; + $sub = DB_DataObject::factory('subscription'); - $sub->find(true); + $sub->subscriber = $user->id; + $sub->subscribed = $other->id; - // note we checked for existence above + $sub->find(true); - if (!$sub->delete()) - return _('Couldn\'t delete subscription.'); + // note we checked for existence above - $cache = common_memcache(); + if (!$sub->delete()) + return _('Couldn\'t delete subscription.'); - if ($cache) { - $cache->delete(common_cache_key('user:notices_with_friends:' . $user->id)); - } + $cache = common_memcache(); - $profile = $user->getProfile(); + if ($cache) { + $cache->delete(common_cache_key('user:notices_with_friends:' . $user->id)); + } - $profile->blowSubscriptionsCount(); - $other->blowSubscribersCount(); + $profile = $user->getProfile(); + + $profile->blowSubscriptionsCount(); + $other->blowSubscribersCount(); + + Event::handle('EndUnsubscribe', array($user, $other)); + } + } catch (Exception $e) { + return $e->getMessage(); + } return true; } diff --git a/lib/subscriptionlist.php b/lib/subscriptionlist.php index 89f63e3211..e1207774fd 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/unqueuemanager.php b/lib/unqueuemanager.php index 72dbc4eede..5595eac052 100644 --- a/lib/unqueuemanager.php +++ b/lib/unqueuemanager.php @@ -23,57 +23,35 @@ * @package StatusNet * @author Evan Prodromou * @author Sarven Capadisli + * @author Brion Vibber * @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 UnQueueManager +class UnQueueManager extends QueueManager { + + /** + * Dummy queue storage manager: instead of saving events for later, + * we just process them immediately. This is only suitable for events + * that can be processed quickly and don't need polling or long-running + * connections to another server such as XMPP. + * + * @param Notice $object + * @param string $queue + */ function enqueue($object, $queue) { $notice = $object; - - switch ($queue) - { - case 'omb': - if ($this->_isLocal($notice)) { - require_once(INSTALLDIR.'/lib/omb.php'); - omb_broadcast_notice($notice); - } - break; - case 'public': - if ($this->_isLocal($notice)) { - require_once(INSTALLDIR.'/lib/jabber.php'); - jabber_public_notice($notice); - } - break; - case 'ping': - if ($this->_isLocal($notice)) { - require_once INSTALLDIR . '/lib/ping.php'; - return ping_broadcast_notice($notice); - } - case 'sms': - require_once(INSTALLDIR.'/lib/mail.php'); - mail_broadcast_notice_sms($notice); - break; - case 'jabber': - require_once(INSTALLDIR.'/lib/jabber.php'); - jabber_broadcast_notice($notice); - break; - case 'plugin': - Event::handle('HandleQueuedNotice', array(&$notice)); - break; - default: + + $handler = $this->getHandler($queue); + if ($handler) { + $handler->handle_notice($notice); + } else { if (Event::handle('UnqueueHandleNotice', array(&$notice, $queue))) { throw new ServerException("UnQueueManager: Unknown queue: $queue"); } } } - - function _isLocal($notice) - { - return ($notice->is_local == Notice::LOCAL_PUBLIC || - $notice->is_local == Notice::LOCAL_NONPUBLIC); - } -} \ No newline at end of file +} diff --git a/lib/util.php b/lib/util.php index 50bd0e2ac9..ef8a5d1f02 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,10 +171,19 @@ function common_ensure_session() if (common_config('sessions', 'handle')) { Session::setSaveHandler(); } + if (array_key_exists(session_name(), $_GET)) { + $id = $_GET[session_name()]; + } else if (array_key_exists(session_name(), $_COOKIE)) { + $id = $_COOKIE[session_name()]; + } + 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'); } @@ -241,7 +255,6 @@ function common_rememberme($user=null) if (!$user) { $user = common_current_user(); if (!$user) { - common_debug('No current user to remember', __FILE__); return false; } } @@ -259,14 +272,11 @@ function common_rememberme($user=null) if (!$result) { common_log_db_error($rm, 'INSERT', __FILE__); - common_debug('Error adding rememberme record for ' . $user->nickname, __FILE__); return false; } $rm->query('COMMIT'); - common_debug('Inserted rememberme record (' . $rm->code . ', ' . $rm->user_id . '); result = ' . $result . '.', __FILE__); - $cookieval = $rm->user_id . ':' . $rm->code; common_log(LOG_INFO, 'adding rememberme cookie "' . $cookieval . '" for ' . $user->nickname); @@ -374,8 +384,6 @@ function common_current_user() $_cur = common_remembered_user(); if ($_cur) { - common_debug("Got User " . $_cur->nickname); - common_debug("Faking session on remembered user"); // XXX: Is this necessary? $_SESSION['userid'] = $_cur->id; } @@ -809,20 +817,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 +1048,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 @@ -1085,8 +1128,9 @@ function common_log_line($priority, $msg) function common_request_id() { $pid = getmypid(); + $server = common_config('site', 'server'); if (php_sapi_name() == 'cli') { - return $pid; + return "$server:$pid"; } else { static $req_id = null; if (!isset($req_id)) { @@ -1096,7 +1140,7 @@ function common_request_id() $url = $_SERVER['REQUEST_URI']; } $method = $_SERVER['REQUEST_METHOD']; - return "$pid.$req_id $method $url"; + return "$server:$pid.$req_id $method $url"; } } diff --git a/lib/xmppconfirmmanager.php b/lib/xmppconfirmmanager.php new file mode 100644 index 0000000000..ee4e294fd4 --- /dev/null +++ b/lib/xmppconfirmmanager.php @@ -0,0 +1,168 @@ +. + */ + +if (!defined('STATUSNET') && !defined('LACONICA')) { + exit(1); +} + +/** + * Event handler for pushing new confirmations to Jabber users. + * @fixme recommend redoing this on a queue-trigger model + * @fixme expiration of old items got dropped in the past, put it back? + */ +class XmppConfirmManager extends IoManager +{ + + /** + * @return mixed XmppConfirmManager, or false if unneeded + */ + public static function get() + { + if (common_config('xmpp', 'enabled')) { + $site = common_config('site', 'server'); + return new XmppConfirmManager(); + } else { + return false; + } + } + + /** + * Tell the i/o master we need one instance for each supporting site + * being handled in this process. + */ + public static function multiSite() + { + return IoManager::INSTANCE_PER_SITE; + } + + function __construct() + { + $this->site = common_config('site', 'server'); + } + + /** + * 10 seconds? Really? That seems a bit frequent. + */ + function pollInterval() + { + return 10; + } + + /** + * Ping! + * @return boolean true if we found something + */ + function poll() + { + $this->switchSite(); + $confirm = $this->next_confirm(); + if ($confirm) { + $this->handle_confirm($confirm); + return true; + } else { + return false; + } + } + + protected function handle_confirm($confirm) + { + require_once INSTALLDIR . '/lib/jabber.php'; + + common_log(LOG_INFO, 'Sending confirmation for ' . $confirm->address); + $user = User::staticGet($confirm->user_id); + if (!$user) { + common_log(LOG_WARNING, 'Confirmation for unknown user ' . $confirm->user_id); + return; + } + $success = jabber_confirm_address($confirm->code, + $user->nickname, + $confirm->address); + if (!$success) { + common_log(LOG_ERR, 'Confirmation failed for ' . $confirm->address); + # Just let the claim age out; hopefully things work then + return; + } else { + common_log(LOG_INFO, 'Confirmation sent for ' . $confirm->address); + # Mark confirmation sent; need a dupe so we don't have the WHERE clause + $dupe = Confirm_address::staticGet('code', $confirm->code); + if (!$dupe) { + common_log(LOG_WARNING, 'Could not refetch confirm', __FILE__); + return; + } + $orig = clone($dupe); + $dupe->sent = $dupe->claimed; + $result = $dupe->update($orig); + if (!$result) { + common_log_db_error($dupe, 'UPDATE', __FILE__); + # Just let the claim age out; hopefully things work then + return; + } + } + return true; + } + + protected function next_confirm() + { + $confirm = new Confirm_address(); + $confirm->whereAdd('claimed IS null'); + $confirm->whereAdd('sent IS null'); + # XXX: eventually we could do other confirmations in the queue, too + $confirm->address_type = 'jabber'; + $confirm->orderBy('modified DESC'); + $confirm->limit(1); + if ($confirm->find(true)) { + common_log(LOG_INFO, 'Claiming confirmation for ' . $confirm->address); + # working around some weird DB_DataObject behaviour + $confirm->whereAdd(''); # clears where stuff + $original = clone($confirm); + $confirm->claimed = common_sql_now(); + $result = $confirm->update($original); + if ($result) { + common_log(LOG_INFO, 'Succeeded in claim! '. $result); + return $confirm; + } else { + common_log(LOG_INFO, 'Failed in claim!'); + return false; + } + } + return null; + } + + protected function clear_old_confirm_claims() + { + $confirm = new Confirm(); + $confirm->claimed = null; + $confirm->whereAdd('now() - claimed > '.CLAIM_TIMEOUT); + $confirm->update(DB_DATAOBJECT_WHEREADD_ONLY); + $confirm->free(); + unset($confirm); + } + + /** + * Make sure we're on the right site configuration + */ + protected function switchSite() + { + if ($this->site != common_config('site', 'server')) { + common_log(LOG_DEBUG, __METHOD__ . ": switching to site $this->site"); + $this->stats('switch'); + StatusNet::init($this->site); + } + } +} diff --git a/lib/xmppmanager.php b/lib/xmppmanager.php new file mode 100644 index 0000000000..dfff63a30c --- /dev/null +++ b/lib/xmppmanager.php @@ -0,0 +1,277 @@ +. + */ + +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } + +/** + * XMPP background connection manager for XMPP-using queue handlers, + * allowing them to send outgoing messages on the right connection. + * + * Input is handled during socket select loop, keepalive pings during idle. + * Any incoming messages will be forwarded to the main XmppDaemon process, + * which handles direct user interaction. + * + * In a multi-site queuedaemon.php run, one connection will be instantiated + * for each site being handled by the current process that has XMPP enabled. + */ + +class XmppManager extends IoManager +{ + protected $site = null; + protected $pingid = 0; + protected $lastping = null; + + static protected $singletons = array(); + + const PING_INTERVAL = 120; + + /** + * Fetch the singleton XmppManager for the current site. + * @return mixed XmppManager, or false if unneeded + */ + public static function get() + { + if (common_config('xmpp', 'enabled')) { + $site = common_config('site', 'server'); + if (empty(self::$singletons[$site])) { + self::$singletons[$site] = new XmppManager(); + } + return self::$singletons[$site]; + } else { + return false; + } + } + + /** + * Tell the i/o master we need one instance for each supporting site + * being handled in this process. + */ + public static function multiSite() + { + return IoManager::INSTANCE_PER_SITE; + } + + function __construct() + { + $this->site = common_config('site', 'server'); + } + + /** + * Initialize connection to server. + * @return boolean true on success + */ + public function start($master) + { + parent::start($master); + $this->switchSite(); + + require_once INSTALLDIR . "/lib/jabber.php"; + + # Low priority; we don't want to receive messages + + common_log(LOG_INFO, "INITIALIZE"); + $this->conn = jabber_connect($this->resource()); + + if (empty($this->conn)) { + common_log(LOG_ERR, "Couldn't connect to server."); + return false; + } + + $this->conn->addEventHandler('message', 'forward_message', $this); + $this->conn->addEventHandler('reconnect', 'handle_reconnect', $this); + $this->conn->setReconnectTimeout(600); + jabber_send_presence("Send me a message to post a notice", 'available', null, 'available', -1); + + return !is_null($this->conn); + } + + /** + * Message pump is triggered on socket input, so we only need an idle() + * call often enough to trigger our outgoing pings. + */ + function timeout() + { + return self::PING_INTERVAL; + } + + /** + * Lists the XMPP connection socket to allow i/o master to wake + * when input comes in here as well as from the queue source. + * + * @return array of resources + */ + public function getSockets() + { + if ($this->conn) { + return array($this->conn->getSocket()); + } else { + return array(); + } + } + + /** + * Process XMPP events that have come in over the wire. + * Side effects: may switch site configuration + * @fixme may kill process on XMPP error + * @param resource $socket + */ + public function handleInput($socket) + { + $this->switchSite(); + + # Process the queue for as long as needed + try { + if ($this->conn) { + assert($socket === $this->conn->getSocket()); + + common_log(LOG_DEBUG, "Servicing the XMPP queue."); + $this->stats('xmpp_process'); + $this->conn->processTime(0); + } + } catch (XMPPHP_Exception $e) { + common_log(LOG_ERR, "Got an XMPPHP_Exception: " . $e->getMessage()); + die($e->getMessage()); + } + } + + /** + * Idle processing for io manager's execution loop. + * Send keepalive pings to server. + * + * Side effect: kills process on exception from XMPP library. + * + * @fixme non-dying error handling + */ + public function idle($timeout=0) + { + if ($this->conn) { + $now = time(); + if (empty($this->lastping) || $now - $this->lastping > self::PING_INTERVAL) { + $this->switchSite(); + try { + $this->sendPing(); + $this->lastping = $now; + } catch (XMPPHP_Exception $e) { + common_log(LOG_ERR, "Got an XMPPHP_Exception: " . $e->getMessage()); + die($e->getMessage()); + } + } + } + } + + /** + * Send a keepalive ping to the XMPP server. + */ + protected function sendPing() + { + $jid = jabber_daemon_address().'/'.$this->resource(); + $server = common_config('xmpp', 'server'); + + if (!isset($this->pingid)) { + $this->pingid = 0; + } else { + $this->pingid++; + } + + common_log(LOG_DEBUG, "Sending ping #{$this->pingid}"); + + $this->conn->send(""); + } + + /** + * Callback for Jabber reconnect event + * @param $pl + */ + function handle_reconnect(&$pl) + { + common_log(LOG_NOTICE, 'XMPP reconnected'); + + $this->conn->processUntil('session_start'); + $this->conn->presence(null, 'available', null, 'available', -1); + } + + /** + * Callback for Jabber message event. + * + * This connection handles output; if we get a message straight to us, + * forward it on to our XmppDaemon listener for processing. + * + * @param $pl + */ + function forward_message(&$pl) + { + if ($pl['type'] != 'chat') { + common_log(LOG_DEBUG, 'Ignoring message of type ' . $pl['type'] . ' from ' . $pl['from']); + return; + } + $listener = $this->listener(); + if (strtolower($listener) == strtolower($pl['from'])) { + common_log(LOG_WARNING, 'Ignoring loop message.'); + return; + } + common_log(LOG_INFO, 'Forwarding message from ' . $pl['from'] . ' to ' . $listener); + $this->conn->message($this->listener(), $pl['body'], 'chat', null, $this->ofrom($pl['from'])); + } + + /** + * Build an block with an ofrom entry for forwarded messages + * + * @param string $from Jabber ID of original sender + * @return string XML fragment + */ + protected function ofrom($from) + { + $address = "\n"; + $address .= "
\n"; + $address .= "\n"; + return $address; + } + + /** + * Build the complete JID of the XmppDaemon process which + * handles primary XMPP input for this site. + * + * @return string Jabber ID + */ + protected function listener() + { + if (common_config('xmpp', 'listener')) { + return common_config('xmpp', 'listener'); + } else { + return jabber_daemon_address() . '/' . common_config('xmpp','resource') . 'daemon'; + } + } + + protected function resource() + { + return 'queue' . posix_getpid(); // @fixme PIDs won't be host-unique + } + + /** + * Make sure we're on the right site configuration + */ + protected function switchSite() + { + if ($this->site != common_config('site', 'server')) { + common_log(LOG_DEBUG, __METHOD__ . ": switching to site $this->site"); + $this->stats('switch'); + StatusNet::init($this->site); + } + } +} diff --git a/lib/xmppqueuehandler.php b/lib/xmppqueuehandler.php deleted file mode 100644 index f28fc9088c..0000000000 --- a/lib/xmppqueuehandler.php +++ /dev/null @@ -1,142 +0,0 @@ -. - */ - -if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } - -require_once(INSTALLDIR.'/lib/queuehandler.php'); - -define('PING_INTERVAL', 120); - -/** - * Common superclass for all XMPP-using queue handlers. They all need to - * service their message queues on idle, and forward any incoming messages - * to the XMPP listener connection. So, we abstract out common code to a - * superclass. - */ - -class XmppQueueHandler extends QueueHandler -{ - var $pingid = 0; - var $lastping = null; - - function start() - { - # Low priority; we don't want to receive messages - - $this->log(LOG_INFO, "INITIALIZE"); - $this->conn = jabber_connect($this->_id.$this->transport()); - - if (empty($this->conn)) { - $this->log(LOG_ERR, "Couldn't connect to server."); - return false; - } - - $this->conn->addEventHandler('message', 'forward_message', $this); - $this->conn->addEventHandler('reconnect', 'handle_reconnect', $this); - $this->conn->setReconnectTimeout(600); - jabber_send_presence("Send me a message to post a notice", 'available', null, 'available', -1); - - return !is_null($this->conn); - } - - function timeout() - { - return 10; - } - - function handle_reconnect(&$pl) - { - $this->log(LOG_NOTICE, 'reconnected'); - - $this->conn->processUntil('session_start'); - $this->conn->presence(null, 'available', null, 'available', -1); - } - - function idle($timeout=0) - { - # Process the queue for as long as needed - try { - if ($this->conn) { - $this->log(LOG_DEBUG, "Servicing the XMPP queue."); - $this->conn->processTime($timeout); - $now = time(); - if (empty($this->lastping) || $now - $this->lastping > PING_INTERVAL) { - $this->sendPing(); - $this->lastping = $now; - } - } - } catch (XMPPHP_Exception $e) { - $this->log(LOG_ERR, "Got an XMPPHP_Exception: " . $e->getMessage()); - die($e->getMessage()); - } - } - - function sendPing() - { - $jid = jabber_daemon_address().'/'.$this->_id.$this->transport(); - $server = common_config('xmpp', 'server'); - - if (!isset($this->pingid)) { - $this->pingid = 0; - } else { - $this->pingid++; - } - - $this->log(LOG_DEBUG, "Sending ping #{$this->pingid}"); - - $this->conn->send(""); - } - - function forward_message(&$pl) - { - if ($pl['type'] != 'chat') { - $this->log(LOG_DEBUG, 'Ignoring message of type ' . $pl['type'] . ' from ' . $pl['from']); - return; - } - $listener = $this->listener(); - if (strtolower($listener) == strtolower($pl['from'])) { - $this->log(LOG_WARNING, 'Ignoring loop message.'); - return; - } - $this->log(LOG_INFO, 'Forwarding message from ' . $pl['from'] . ' to ' . $listener); - $this->conn->message($this->listener(), $pl['body'], 'chat', null, $this->ofrom($pl['from'])); - } - - function ofrom($from) - { - $address = "\n"; - $address .= "
\n"; - $address .= "\n"; - return $address; - } - - function listener() - { - if (common_config('xmpp', 'listener')) { - return common_config('xmpp', 'listener'); - } else { - return jabber_daemon_address() . '/' . common_config('xmpp','resource') . 'daemon'; - } - } - - function getSockets() - { - return array($this->conn->getSocket()); - } -} diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po index 90941c3da8..4565870408 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-10 00:46+0000\n" -"PO-Revision-Date: 2010-01-10 00:47:02+0000\n" +"POT-Creation-Date: 2010-01-15 19:15+0000\n" +"PO-Revision-Date: 2010-01-16 17:51:26+0000\n" "Language-Team: Arabic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60878); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r61138); 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" @@ -35,25 +35,30 @@ msgstr "لا صÙحة كهذه" #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 +#: actions/apistatusesupdate.php:149 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 #: 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 #: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 -#: lib/command.php:163 lib/command.php:311 lib/command.php:364 -#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/command.php:163 lib/command.php:302 lib/command.php:355 +#: lib/command.php:401 lib/command.php:462 lib/command.php:518 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/subs.php:34 lib/subs.php:125 msgid "No such user." msgstr "لا مستخدم كهذا." +#: actions/all.php:84 +#, php-format +msgid "%1$s and friends, page %2$d" +msgstr "%1$s والأصدقاء, الصÙحة %2$d" + #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 +#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -105,7 +110,7 @@ msgstr "" msgid "You and friends" msgstr "أنت والأصدقاء" -#: actions/allrss.php:119 actions/apitimelinefriends.php:122 +#: actions/allrss.php:119 actions/apitimelinefriends.php:121 #: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" @@ -116,6 +121,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:155 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." @@ -129,7 +151,7 @@ msgstr "لم يتم العثور على وسيلة API." #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:114 +#: actions/apistatusesupdate.php:119 msgid "This method requires a POST." msgstr "تتطلب هذه الطريقة POST." @@ -158,8 +180,9 @@ msgstr "لم يمكن Ø­Ùظ الملÙ." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257 -#: actions/designadminpanel.php:122 actions/newnotice.php:94 +#: actions/apistatusesupdate.php:132 actions/avatarsettings.php:257 +#: actions/designadminpanel.php:122 actions/editapplication.php:118 +#: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format msgid "" @@ -171,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 msgid "Unable to save your design settings." msgstr "" @@ -211,26 +237,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 "لا نص ÙÙŠ الرسالة!" @@ -254,16 +260,16 @@ msgid "No status found with that ID." msgstr "" #: 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." @@ -283,8 +289,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." @@ -316,7 +322,8 @@ msgstr "" msgid "Not a valid nickname." msgstr "ليس اسمًا مستعارًا صحيحًا." -#: actions/apigroupcreate.php:196 actions/editgroup.php:195 +#: actions/apigroupcreate.php:196 actions/editapplication.php:212 +#: actions/editgroup.php:195 actions/newapplication.php:200 #: actions/newgroup.php:139 actions/profilesettings.php:222 #: actions/register.php:217 msgid "Homepage is not a valid URL." @@ -328,7 +335,8 @@ msgstr "الصÙحة الرئيسية ليست عنونًا صالحًا." msgid "Full name is too long (max 255 chars)." msgstr "الاسم الكامل طويل جدا (الأقصى 255 حرÙًا)" -#: actions/apigroupcreate.php:213 +#: actions/apigroupcreate.php:213 actions/editapplication.php:187 +#: actions/newapplication.php:169 #, php-format msgid "Description is too long (max %d chars)." msgstr "" @@ -368,7 +376,7 @@ msgstr "" msgid "Group not found!" msgstr "لم توجد المجموعة!" -#: actions/apigroupjoin.php:110 lib/command.php:217 +#: actions/apigroupjoin.php:110 actions/joingroup.php:90 msgid "You are already a member of that group." msgstr "" @@ -376,19 +384,19 @@ msgstr "" msgid "You have been blocked from that group by the admin." msgstr "" -#: actions/apigroupjoin.php:138 lib/command.php:234 -#, fuzzy, php-format +#: actions/apigroupjoin.php:138 actions/joingroup.php:124 +#, php-format msgid "Could not join user %1$s to group %2$s." -msgstr "تعذّر إنشاء المجموعة." +msgstr "لم يمكن ضم المستخدم %1$s إلى المجموعة %2$s." #: actions/apigroupleave.php:114 msgid "You are not a member of this group." msgstr "" -#: actions/apigroupleave.php:124 actions/leavegroup.php:127 -#, fuzzy, php-format +#: actions/apigroupleave.php:124 actions/leavegroup.php:119 +#, php-format msgid "Could not remove user %1$s from group %2$s." -msgstr "تعذّر إنشاء المجموعة." +msgstr "لم يمكن إزالة المستخدم %1$s من المجموعة %2$s." #: actions/apigrouplist.php:95 #, php-format @@ -405,6 +413,97 @@ msgstr "مجموعات %s" msgid "groups on %s" msgstr "مجموعات %s" +#: actions/apioauthauthorize.php:108 actions/apioauthauthorize.php:114 +msgid "Bad request." +msgstr "" + +#: actions/apioauthauthorize.php:134 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:115 actions/makeadmin.php:66 +#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 +#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:139 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 +#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/subscribe.php:46 actions/tagother.php:166 +#: 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 "" + +#: actions/apioauthauthorize.php:146 +msgid "Invalid nickname / password!" +msgstr "اسم/كلمة سر غير صحيحة!" + +#: actions/apioauthauthorize.php:170 +msgid "DB error deleting OAuth app user." +msgstr "خطأ قاعدة البيانات أثناء حذ٠المستخدم OAuth app" + +#: actions/apioauthauthorize.php:196 +msgid "DB error inserting OAuth app user." +msgstr "خطأ قاعدة البيانات أثناء إدخال المستخدم OAuth app" + +#: actions/apioauthauthorize.php:231 +#, php-format +msgid "" +"The request token %s has been authorized. Please exchange it for an access " +"token." +msgstr "" + +#: actions/apioauthauthorize.php:241 +#, php-format +msgid "The request token %s has been denied." +msgstr "" + +#: actions/apioauthauthorize.php:246 actions/avatarsettings.php:281 +#: actions/designadminpanel.php:103 actions/editapplication.php:139 +#: actions/emailsettings.php:256 actions/grouplogo.php:319 +#: actions/imsettings.php:220 actions/newapplication.php:121 +#: actions/oauthconnectionssettings.php:151 actions/recoverpassword.php:44 +#: actions/smssettings.php:248 lib/designsettings.php:304 +msgid "Unexpected form submission." +msgstr "" + +#: actions/apioauthauthorize.php:273 +msgid "An application would like to connect to your account" +msgstr "" + +#: actions/apioauthauthorize.php:290 +msgid "Allow or deny access" +msgstr "" + +#: actions/apioauthauthorize.php:320 lib/action.php:435 +msgid "Account" +msgstr "الحساب" + +#: actions/apioauthauthorize.php:323 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/apioauthauthorize.php:326 actions/login.php:233 +#: actions/register.php:429 lib/accountsettingsaction.php:116 +msgid "Password" +msgstr "كلمة السر" + +#: actions/apioauthauthorize.php:338 +msgid "Deny" +msgstr "ارÙض" + +#: actions/apioauthauthorize.php:344 +msgid "Allow" +msgstr "اسمح" + +#: actions/apioauthauthorize.php:361 +msgid "Allow or deny access to your account information." +msgstr "" + #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." msgstr "" @@ -418,11 +517,11 @@ msgstr "" msgid "No such notice." msgstr "لا إشعار كهذا." -#: actions/apistatusesretweet.php:83 lib/command.php:422 +#: actions/apistatusesretweet.php:83 msgid "Cannot repeat your own notice." msgstr "لا يمكنك تكرار ملحوظتك الخاصة." -#: actions/apistatusesretweet.php:91 lib/command.php:427 +#: actions/apistatusesretweet.php:91 msgid "Already repeated that notice." msgstr "كرر بالÙعل هذه الملاحظة." @@ -434,17 +533,17 @@ msgstr "Ø­ÙØ°ÙÙت الحالة." msgid "No status with that ID found." msgstr "" -#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:162 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" -#: actions/apistatusesupdate.php:198 +#: actions/apistatusesupdate.php:203 msgid "Not found" msgstr "لم يوجد" -#: actions/apistatusesupdate.php:221 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:226 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -528,8 +627,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 "لا اسم مستعار." @@ -552,8 +654,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 "" @@ -585,29 +687,6 @@ 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/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 -#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 -#: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 -#: actions/subscribe.php:46 actions/tagother.php:166 -#: 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 "" - -#: actions/avatarsettings.php:281 actions/designadminpanel.php:103 -#: actions/emailsettings.php:256 actions/grouplogo.php:319 -#: actions/imsettings.php:220 actions/recoverpassword.php:44 -#: actions/smssettings.php:248 lib/designsettings.php:304 -msgid "Unexpected form submission." -msgstr "" - #: actions/avatarsettings.php:328 msgid "Pick a square area of the image to be your avatar" msgstr "" @@ -666,19 +745,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:260 +msgid "No such group." +msgstr "لا مجموعة كهذه." #: actions/blockedfromgroup.php:90 #, php-format @@ -686,9 +761,9 @@ msgid "%s blocked profiles" msgstr "" #: actions/blockedfromgroup.php:93 -#, fuzzy, php-format +#, php-format msgid "%1$s blocked profiles, page %2$d" -msgstr "مشتركو %sØŒ الصÙحة %d" +msgstr "%1$s ملÙات ممنوعة, الصÙحة %2$d" #: actions/blockedfromgroup.php:108 msgid "A list of the users blocked from joining this group." @@ -745,8 +820,8 @@ msgid "Couldn't delete email confirmation." msgstr "تعذّر حذ٠تأكيد البريد الإلكتروني." #: actions/confirmaddress.php:144 -msgid "Confirm Address" -msgstr "عنوان التأكيد" +msgid "Confirm address" +msgstr "أكد العنوان" #: actions/confirmaddress.php:159 #, php-format @@ -798,10 +873,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 "لا يمكنك حذ٠المستخدمين." @@ -931,7 +1002,8 @@ msgstr "ارجع إلى المبدئي" #: actions/pathsadminpanel.php:324 actions/profilesettings.php:174 #: actions/siteadminpanel.php:388 actions/smssettings.php:181 #: actions/subscriptions.php:203 actions/tagother.php:154 -#: actions/useradminpanel.php:313 lib/designsettings.php:256 +#: actions/useradminpanel.php:313 lib/applicationeditform.php:335 +#: lib/applicationeditform.php:336 lib/designsettings.php:256 #: lib/groupeditform.php:202 msgid "Save" msgstr "أرسل" @@ -952,6 +1024,76 @@ msgstr "أض٠إلى المÙضلات" msgid "No such document." msgstr "لا مستند كهذا." +#: actions/editapplication.php:54 lib/applicationeditform.php:136 +msgid "Edit application" +msgstr "" + +#: actions/editapplication.php:66 +msgid "You must be logged in to edit an application." +msgstr "يجب أن تكون مسجل الدخول لتعدل تطبيقا." + +#: actions/editapplication.php:77 actions/showapplication.php:94 +msgid "You are not the owner of this application." +msgstr "أنت لست مالك هذا التطبيق." + +#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:163 +#: actions/showapplication.php:87 +msgid "No such application." +msgstr "لا تطبيق كهذا." + +#: actions/editapplication.php:127 actions/newapplication.php:110 +#: actions/showapplication.php:118 lib/action.php:1167 +msgid "There was a problem with your session token." +msgstr "" + +#: actions/editapplication.php:161 +msgid "Use this form to edit your application." +msgstr "استخدم هذا النموذج لتعدل تطبيقك." + +#: actions/editapplication.php:177 actions/newapplication.php:159 +msgid "Name is required." +msgstr "الاسم مطلوب." + +#: actions/editapplication.php:180 actions/newapplication.php:162 +msgid "Name is too long (max 255 chars)." +msgstr "الاسم طويل جدا (الأقصى 255 حرÙا)." + +#: actions/editapplication.php:183 actions/newapplication.php:165 +msgid "Description is required." +msgstr "الوص٠مطلوب." + +#: actions/editapplication.php:191 +msgid "Source URL is too long." +msgstr "" + +#: actions/editapplication.php:197 actions/newapplication.php:182 +msgid "Source URL is not valid." +msgstr "مسار المصدر ليس صحيحا." + +#: actions/editapplication.php:200 actions/newapplication.php:185 +msgid "Organization is required." +msgstr "" + +#: actions/editapplication.php:203 actions/newapplication.php:188 +msgid "Organization is too long (max 255 chars)." +msgstr "المنظمة طويلة جدا (الأقصى 255 حرÙا)." + +#: actions/editapplication.php:206 actions/newapplication.php:191 +msgid "Organization homepage is required." +msgstr "" + +#: actions/editapplication.php:215 actions/newapplication.php:203 +msgid "Callback is too long." +msgstr "" + +#: actions/editapplication.php:222 actions/newapplication.php:212 +msgid "Callback URL is not valid." +msgstr "" + +#: actions/editapplication.php:255 +msgid "Could not update application." +msgstr "لم يمكن تحديث التطبيق." + #: actions/editgroup.php:56 #, php-format msgid "Edit %s group" @@ -963,8 +1105,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." @@ -988,7 +1130,7 @@ msgid "Options saved." msgstr "Ø­ÙÙظت الخيارات." #: actions/emailsettings.php:60 -msgid "Email Settings" +msgid "Email settings" msgstr "إعدادات البريد الإلكتروني" #: actions/emailsettings.php:71 @@ -1018,12 +1160,13 @@ msgid "" msgstr "" #: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 +#: actions/smssettings.php:126 lib/applicationeditform.php:333 +#: lib/applicationeditform.php:334 msgid "Cancel" msgstr "ألغÙ" #: actions/emailsettings.php:121 -msgid "Email Address" +msgid "Email address" msgstr "عنوان البريد الإلكتروني" #: actions/emailsettings.php:123 @@ -1097,9 +1240,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." @@ -1273,13 +1417,6 @@ 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:79 msgid "No such file." msgstr "لا مل٠كهذا." @@ -1296,7 +1433,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 "لا مل٠شخصي بهذه الهوية." @@ -1341,9 +1478,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." @@ -1364,12 +1501,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 "" @@ -1384,6 +1515,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 "" @@ -1402,9 +1537,9 @@ msgid "%s group members" msgstr "أعضاء مجموعة %s" #: actions/groupmembers.php:96 -#, fuzzy, php-format +#, php-format msgid "%1$s group members, page %2$d" -msgstr "مجموعات %sØŒ صÙحة %d" +msgstr "%1$s أعضاء المجموعة, الصÙحة %2$d" #: actions/groupmembers.php:111 msgid "A list of the users in this group." @@ -1502,7 +1637,7 @@ msgid "Error removing the block." msgstr "خطأ أثناء منع الحجب." #: actions/imsettings.php:59 -msgid "IM Settings" +msgid "IM settings" msgstr "إعدادات المراسلة الÙورية" #: actions/imsettings.php:70 @@ -1528,7 +1663,7 @@ msgid "" msgstr "" #: actions/imsettings.php:124 -msgid "IM Address" +msgid "IM address" msgstr "عنوان المراسلة الÙورية" #: actions/imsettings.php:126 @@ -1620,7 +1755,7 @@ msgstr "دعوة مستخدمين جدد" msgid "You are already subscribed to these users:" msgstr "" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:315 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -1661,7 +1796,7 @@ msgstr "رسالة شخصية" msgid "Optionally add a personal message to the invitation." msgstr "" -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236 msgid "Send" msgstr "أرسل" @@ -1705,92 +1840,64 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "" -#: actions/joingroup.php:90 -msgid "You are already a member of that group" -msgstr "" - -#: actions/joingroup.php:128 -#, fuzzy, php-format -msgid "Could not join user %1$s to group %2$s" -msgstr "تعذّر إنشاء المجموعة." - -#: actions/joingroup.php:135 lib/command.php:239 -#, fuzzy, php-format +#: actions/joingroup.php:131 +#, php-format msgid "%1$s joined group %2$s" -msgstr "%s انضم إلى مجموعة %s" +msgstr "%1$s انضم للمجموعة %2$s" #: actions/leavegroup.php:60 msgid "You must be logged in to leave a group." msgstr "" -#: actions/leavegroup.php:90 lib/command.php:268 +#: actions/leavegroup.php:90 lib/command.php:265 msgid "You are not a member of that group." msgstr "لست عضوا ÙÙŠ تلك المجموعة." -#: actions/leavegroup.php:119 lib/command.php:278 -msgid "Could not find membership record." -msgstr "" - -#: actions/leavegroup.php:134 lib/command.php:289 -#, fuzzy, php-format +#: actions/leavegroup.php:127 +#, php-format msgid "%1$s left group %2$s" -msgstr "%s انضم إلى مجموعة %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:460 +#: 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 -#: lib/groupeditform.php:152 lib/userprofile.php:131 -msgid "Nickname" -msgstr "الاسم المستعار" - -#: actions/login.php:253 actions/register.php:428 -#: 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]" @@ -1808,18 +1915,38 @@ msgstr "" #: actions/makeadmin.php:132 #, php-format -msgid "Can't get membership record for %1$s in group %2$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 %1$s an admin for group %2$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 "لا حالة حالية" +#: actions/newapplication.php:52 +msgid "New application" +msgstr "" + +#: actions/newapplication.php:64 +msgid "You must be logged in to register an application." +msgstr "يجب أن تكون مسجل الدخول لتسجل تطبيقا." + +#: actions/newapplication.php:143 +msgid "Use this form to register a new application." +msgstr "استخدم هذا النموذج لتسجل تطبيقا جديدا." + +#: actions/newapplication.php:173 +msgid "Source URL is required." +msgstr "" + +#: actions/newapplication.php:255 actions/newapplication.php:264 +msgid "Could not create application." +msgstr "لم يمكن إنشاء التطبيق." + #: actions/newgroup.php:53 msgid "New group" msgstr "مجموعة جديدة" @@ -1832,12 +1959,12 @@ msgstr "استخدم هذا النموذج لإنشاء مجموعة جديدة. msgid "New message" msgstr "رسالة جديدة" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 msgid "You can't send a message to this user." msgstr "" -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:484 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 +#: lib/command.php:475 msgid "No content!" msgstr "لا محتوى!" @@ -1845,7 +1972,7 @@ msgstr "لا محتوى!" msgid "No recipient specified." msgstr "لا مستلم Ø­Ùدّد." -#: actions/newmessage.php:164 lib/command.php:370 +#: actions/newmessage.php:164 lib/command.php:361 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -1856,8 +1983,8 @@ msgstr "Ø£Ùرسلت الرسالة" #: 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" @@ -1883,9 +2010,9 @@ msgid "Text search" msgstr "بحث ÙÙŠ النصوص" #: actions/noticesearch.php:91 -#, fuzzy, php-format +#, php-format msgid "Search results for \"%1$s\" on %2$s" -msgstr "نتائج البحث عن \"%s\" ÙÙŠ %s" +msgstr "نتائج البحث Ù„\"%1$s\" على %2$s" #: actions/noticesearch.php:121 #, php-format @@ -1924,6 +2051,48 @@ msgstr "أرسل التنبيه" msgid "Nudge sent!" msgstr "Ø£Ùرسل التنبيه!" +#: actions/oauthappssettings.php:59 +msgid "You must be logged in to list your applications." +msgstr "يجب أن تكون مسجل الدخول لعرض تطبيقاتك." + +#: actions/oauthappssettings.php:74 +msgid "OAuth applications" +msgstr "تطبيقات OAuth" + +#: actions/oauthappssettings.php:85 +msgid "Applications you have registered" +msgstr "" + +#: actions/oauthappssettings.php:135 +#, php-format +msgid "You have not registered any applications yet." +msgstr "" + +#: actions/oauthconnectionssettings.php:71 +msgid "Connected applications" +msgstr "" + +#: actions/oauthconnectionssettings.php:87 +msgid "You have allowed the following applications to access you account." +msgstr "" + +#: actions/oauthconnectionssettings.php:170 +msgid "You are not a user of that application." +msgstr "أنت لست مستخدما لهذا التطبيق." + +#: actions/oauthconnectionssettings.php:180 +msgid "Unable to revoke access for app: " +msgstr "" + +#: actions/oauthconnectionssettings.php:192 +#, php-format +msgid "You have not authorized any applications to use your account." +msgstr "" + +#: actions/oauthconnectionssettings.php:205 +msgid "Developers can edit the registration settings for their applications " +msgstr "" + #: actions/oembed.php:79 actions/shownotice.php:100 msgid "Notice has no profile" msgstr "" @@ -1941,8 +2110,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:1038 +#: lib/api.php:1066 lib/api.php:1176 msgid "Not a supported data format." msgstr "ليس نسق بيانات مدعوم." @@ -1955,7 +2124,7 @@ msgid "Notice Search" msgstr "بحث الإشعارات" #: actions/othersettings.php:60 -msgid "Other Settings" +msgid "Other settings" msgstr "إعدادات أخرى" #: actions/othersettings.php:71 @@ -1986,6 +2155,26 @@ msgstr "أظهر أو أخÙ٠تصاميم الملÙات الشخصية." msgid "URL shortening service is too long (max 50 chars)." msgstr "" +#: 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 #, php-format msgid "Outbox for %s" @@ -2020,7 +2209,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 "أكّد" @@ -2182,8 +2371,8 @@ msgid "When to use SSL" msgstr "" #: actions/pathsadminpanel.php:308 -msgid "SSL Server" -msgstr "خادوم SSL" +msgid "SSL server" +msgstr "خادم SSL" #: actions/pathsadminpanel.php:309 msgid "Server to direct SSL requests to" @@ -2240,42 +2429,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 -#: lib/groupeditform.php:161 +#: actions/profilesettings.php:115 actions/register.php:453 +#: lib/applicationeditform.php:230 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 "" @@ -2572,7 +2761,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 "عذرًا، الأشخاص المدعوون وحدهم يستطيعون التسجيل." @@ -2584,7 +2773,7 @@ msgstr "عذرا، رمز دعوة غير صالح." msgid "Registration successful" msgstr "نجح التسجيل" -#: actions/register.php:114 actions/register.php:502 lib/action.php:457 +#: actions/register.php:114 actions/register.php:503 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "سجّل" @@ -2597,64 +2786,60 @@ 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, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -2673,7 +2858,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.)" @@ -2811,6 +2996,80 @@ msgstr "" msgid "User is already sandboxed." msgstr "" +#: actions/showapplication.php:82 +msgid "You must be logged in to view an application." +msgstr "يجب أن تكون مسجل الدخول لرؤية تطبيق." + +#: actions/showapplication.php:158 +msgid "Application profile" +msgstr "" + +#: actions/showapplication.php:160 lib/applicationeditform.php:182 +msgid "Icon" +msgstr "" + +#: actions/showapplication.php:170 actions/version.php:195 +#: lib/applicationeditform.php:197 +msgid "Name" +msgstr "الاسم" + +#: actions/showapplication.php:179 lib/applicationeditform.php:224 +msgid "Organization" +msgstr "المنظمة" + +#: actions/showapplication.php:188 actions/version.php:198 +#: lib/applicationeditform.php:211 lib/groupeditform.php:172 +msgid "Description" +msgstr "الوصÙ" + +#: actions/showapplication.php:193 actions/showgroup.php:429 +#: lib/profileaction.php:174 +msgid "Statistics" +msgstr "إحصاءات" + +#: actions/showapplication.php:204 +#, php-format +msgid "created by %1$s - %2$s access by default - %3$d users" +msgstr "" + +#: actions/showapplication.php:214 +msgid "Application actions" +msgstr "" + +#: actions/showapplication.php:233 +msgid "Reset key & secret" +msgstr "" + +#: actions/showapplication.php:241 +msgid "Application info" +msgstr "" + +#: actions/showapplication.php:243 +msgid "Consumer key" +msgstr "" + +#: actions/showapplication.php:248 +msgid "Consumer secret" +msgstr "" + +#: actions/showapplication.php:253 +msgid "Request token URL" +msgstr "" + +#: actions/showapplication.php:258 +msgid "Access token URL" +msgstr "" + +#: actions/showapplication.php:263 +msgid "Authorize URL" +msgstr "اسمح بالمسار" + +#: actions/showapplication.php:268 +msgid "" +"Note: We support HMAC-SHA1 signatures. We do not support the plaintext " +"signature method." +msgstr "" + #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "" @@ -2912,7 +3171,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 "(لا شيء)" @@ -2920,10 +3179,6 @@ msgstr "(لا شيء)" msgid "All members" msgstr "جميع الأعضاء" -#: actions/showgroup.php:429 lib/profileaction.php:174 -msgid "Statistics" -msgstr "إحصاءات" - #: actions/showgroup.php:432 msgid "Created" msgstr "أنشئ" @@ -3060,13 +3315,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." @@ -3245,7 +3500,7 @@ msgid "Save site settings" msgstr "اذ٠إعدادت الموقع" #: actions/smssettings.php:58 -msgid "SMS Settings" +msgid "SMS settings" msgstr "إعدادات الرسائل القصيرة" #: actions/smssettings.php:69 @@ -3274,8 +3529,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" #: actions/smssettings.php:140 msgid "Phone number, no punctuation or spaces, with area code" @@ -3358,9 +3613,9 @@ msgid "%s subscribers" msgstr "مشتركو %s" #: actions/subscribers.php:52 -#, fuzzy, php-format +#, php-format msgid "%1$s subscribers, page %2$d" -msgstr "مشتركو %sØŒ الصÙحة %d" +msgstr "مشتركو %1$s, الصÙحة %2$d" #: actions/subscribers.php:63 msgid "These are the people who listen to your notices." @@ -3395,9 +3650,9 @@ msgid "%s subscriptions" msgstr "اشتراكات %s" #: actions/subscriptions.php:54 -#, fuzzy, php-format +#, php-format msgid "%1$s subscriptions, page %2$d" -msgstr "اشتراكات %sØŒ الصÙحة %d" +msgstr "اشتراكات%1$s, الصÙحة %2$d" #: actions/subscriptions.php:65 msgid "These are the people whose notices you listen to." @@ -3510,10 +3765,6 @@ 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 "" @@ -3704,10 +3955,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 "تصميم المل٠الشخصي" @@ -3737,9 +3984,9 @@ msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" #: actions/version.php:73 -#, fuzzy, php-format +#, php-format msgid "StatusNet %s" -msgstr "إحصاءات" +msgstr "ستاتس نت %s" #: actions/version.php:153 #, php-format @@ -3749,9 +3996,8 @@ msgid "" msgstr "" #: actions/version.php:157 -#, fuzzy msgid "StatusNet" -msgstr "Ø­ÙØ°ÙÙت الحالة." +msgstr "ستاتس نت" #: actions/version.php:161 msgid "Contributors" @@ -3784,42 +4030,48 @@ msgstr "" msgid "Plugins" msgstr "" -#: actions/version.php:195 -#, fuzzy -msgid "Name" -msgstr "الاسم المستعار" - #: actions/version.php:196 lib/action.php:741 -#, fuzzy msgid "Version" -msgstr "الجلسات" +msgstr "النسخة" #: actions/version.php:197 -#, fuzzy msgid "Author(s)" -msgstr "المؤلÙ" +msgstr "المؤلÙ(ون)" -#: actions/version.php:198 lib/groupeditform.php:172 -msgid "Description" -msgstr "الوصÙ" - -#: classes/File.php:137 +#: 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/Group_member.php:41 +msgid "Group join failed." +msgstr "الانضمام للمجموعة Ùشل." + +#: classes/Group_member.php:53 +msgid "Not part of group." +msgstr "ليس جزءا من المجموعة." + +#: classes/Group_member.php:60 +msgid "Group leave failed." +msgstr "ترك المجموعة Ùشل." + +#: classes/Login_token.php:76 +#, 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 "أنت ممنوع من إرسال رسائل مباشرة." @@ -3832,49 +4084,49 @@ msgstr "تعذّر إدراج الرسالة." msgid "Could not update message with new URI." msgstr "" -#: classes/Notice.php:172 +#: classes/Notice.php:171 #, php-format msgid "DB error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:226 +#: classes/Notice.php:225 msgid "Problem saving notice. Too long." msgstr "مشكلة ÙÙŠ Ø­Ùظ الإشعار. طويل جدًا." -#: classes/Notice.php:230 +#: classes/Notice.php:229 msgid "Problem saving notice. Unknown user." msgstr "مشكلة ÙÙŠ Ø­Ùظ الإشعار. مستخدم غير معروÙ." -#: classes/Notice.php:235 +#: classes/Notice.php:234 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:241 +#: classes/Notice.php:240 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:247 +#: classes/Notice.php:246 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:309 classes/Notice.php:334 +#: classes/Notice.php:305 classes/Notice.php:330 msgid "Problem saving notice." msgstr "مشكلة أثناء Ø­Ùظ الإشعار." -#: classes/Notice.php:1034 +#: classes/Notice.php:1052 #, php-format msgid "DB error inserting reply: %s" msgstr "" -#: classes/Notice.php:1359 +#: classes/Notice.php:1423 #, php-format msgid "RT @%1$s %2$s" msgstr "آر تي @%1$s %2$s" -#: classes/User.php:368 +#: classes/User.php:382 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "أهلا بكم ÙÙŠ %1$s يا @%2$s!" @@ -3915,6 +4167,11 @@ msgstr "أخرى" msgid "Other options" msgstr "خيارات أخرى" +#: lib/action.php:144 +#, php-format +msgid "%1$s - %2$s" +msgstr "%1$s - %2$s" + #: lib/action.php:159 msgid "Untitled page" msgstr "صÙحة غير Ù…Ùعنونة" @@ -3931,10 +4188,6 @@ msgstr "الرئيسية" msgid "Personal profile and friends timeline" msgstr "المل٠الشخصي ومسار الأصدقاء الزمني" -#: lib/action.php:435 -msgid "Account" -msgstr "الحساب" - #: lib/action.php:435 msgid "Change your email, avatar, password, profile" msgstr "" @@ -4089,18 +4342,13 @@ msgstr "بعد" msgid "Before" msgstr "قبل" -#: lib/action.php:1167 -msgid "There was a problem with your session token." -msgstr "" - #: lib/adminpanelaction.php:96 msgid "You cannot make changes to this site." msgstr "" #: lib/adminpanelaction.php:107 -#, fuzzy msgid "Changes to that panel are not allowed." -msgstr "لا ÙŠÙسمح بالتسجيل." +msgstr "التغييرات لهذه اللوحة غير مسموح بها." #: lib/adminpanelaction.php:206 msgid "showForm() not implemented." @@ -4126,6 +4374,67 @@ msgstr "ضبط التصميم" msgid "Paths configuration" msgstr "ضبط المسارات" +#: lib/applicationeditform.php:186 +msgid "Icon for this application" +msgstr "" + +#: lib/applicationeditform.php:206 +#, php-format +msgid "Describe your application in %d characters" +msgstr "" + +#: lib/applicationeditform.php:209 +msgid "Describe your application" +msgstr "ص٠تطبيقك" + +#: lib/applicationeditform.php:218 +msgid "Source URL" +msgstr "مسار المصدر" + +#: lib/applicationeditform.php:220 +msgid "URL of the homepage of this application" +msgstr "" + +#: lib/applicationeditform.php:226 +msgid "Organization responsible for this application" +msgstr "" + +#: lib/applicationeditform.php:232 +msgid "URL for the homepage of the organization" +msgstr "" + +#: lib/applicationeditform.php:238 +msgid "URL to redirect to after authentication" +msgstr "" + +#: lib/applicationeditform.php:260 +msgid "Browser" +msgstr "" + +#: lib/applicationeditform.php:276 +msgid "Desktop" +msgstr "" + +#: lib/applicationeditform.php:277 +msgid "Type of application, browser or desktop" +msgstr "" + +#: lib/applicationeditform.php:299 +msgid "Read-only" +msgstr "" + +#: lib/applicationeditform.php:317 +msgid "Read-write" +msgstr "" + +#: lib/applicationeditform.php:318 +msgid "Default access for this application: read-only, or read-write" +msgstr "" + +#: lib/applicationlist.php:154 +msgid "Revoke" +msgstr "اسحب" + #: lib/attachmentlist.php:87 msgid "Attachments" msgstr "مرÙقات" @@ -4146,15 +4455,13 @@ msgstr "" msgid "Tags for this attachment" msgstr "وسوم هذا المرÙÙ‚" -#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 -#, fuzzy +#: lib/authenticationplugin.php:214 lib/authenticationplugin.php:219 msgid "Password changing failed" -msgstr "تغيير كلمة السر" +msgstr "تغيير كلمة السر Ùشل" -#: lib/authenticationplugin.php:197 -#, fuzzy +#: lib/authenticationplugin.php:229 msgid "Password changing is not allowed" -msgstr "تغيير كلمة السر" +msgstr "تغيير كلمة السر غير مسموح به" #: lib/channel.php:138 lib/channel.php:158 msgid "Command results" @@ -4173,18 +4480,18 @@ msgid "Sorry, this command is not yet implemented." msgstr "" #: lib/command.php:88 -#, fuzzy, php-format -msgid "Could not find a user with nickname %s." -msgstr "تعذّر إيجاد المستخدم الهدÙ." +#, php-format +msgid "Could not find a user with nickname %s" +msgstr "لم يمكن إيجاد مستخدم بالاسم %s" #: lib/command.php:92 msgid "It does not make a lot of sense to nudge yourself!" msgstr "" #: lib/command.php:99 -#, fuzzy, php-format -msgid "Nudge sent to %s." -msgstr "أرسل التنبيه" +#, php-format +msgid "Nudge sent to %s" +msgstr "التنبيه تم إرساله إلى %s" #: lib/command.php:126 #, php-format @@ -4197,140 +4504,160 @@ msgstr "" "المشتركون: %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 "لا مل٠بهذه الهوية." +#: lib/command.php:152 lib/command.php:390 lib/command.php:451 +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." +#: lib/command.php:168 lib/command.php:406 lib/command.php:467 +#: lib/command.php:523 +msgid "User has no last notice" msgstr "ليس للمستخدم إشعار أخير" #: lib/command.php:190 msgid "Notice marked as fave." msgstr "" -#: lib/command.php:284 -#, fuzzy, php-format -msgid "Could not remove user %1$s to group %2$s." -msgstr "تعذّر إنشاء المجموعة." +#: lib/command.php:217 +msgid "You are already a member of that group" +msgstr "أنت بالÙعل عضو ÙÙŠ هذه المجموعة" -#: lib/command.php:318 +#: lib/command.php:231 +#, php-format +msgid "Could not join user %s to group %s" +msgstr "لم يمكن ضم المستخدم %s إلى المجموعة %s" + +#: lib/command.php:236 +#, php-format +msgid "%s joined group %s" +msgstr "%s انضم إلى مجموعة %s" + +#: lib/command.php:275 +#, php-format +msgid "Could not remove user %s to group %s" +msgstr "لم يمكن إزالة المستخدم %s من المجموعة %s" + +#: lib/command.php:280 +#, php-format +msgid "%s left group %s" +msgstr "%s ترك المجموعة %s" + +#: lib/command.php:309 #, php-format msgid "Fullname: %s" msgstr "الاسم الكامل: %s" -#: lib/command.php:321 +#: lib/command.php:312 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "الموقع: %s" -#: lib/command.php:324 +#: lib/command.php:315 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "الصÙحة الرئيسية: %s" -#: lib/command.php:327 +#: lib/command.php:318 #, php-format msgid "About: %s" msgstr "عن: %s" -#: lib/command.php:358 +#: lib/command.php:349 #, php-format -msgid "Message too long - maximum is %1$d characters, you sent %2$d." +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:367 +#, php-format +msgid "Direct message to %s sent" +msgstr "رسالة مباشرة إلى %s تم إرسالها" -#: lib/command.php:378 +#: lib/command.php:369 msgid "Error sending direct message." msgstr "" -#: lib/command.php:435 -#, fuzzy, php-format -msgid "Notice from %s repeated." +#: lib/command.php:413 +msgid "Cannot repeat your own notice" +msgstr "لا يمكنك تكرار ملاحظتك الخاصة" + +#: lib/command.php:418 +msgid "Already repeated that notice" +msgstr "كرر بالÙعل هذا الإشعار" + +#: lib/command.php:426 +#, php-format +msgid "Notice from %s repeated" msgstr "الإشعار من %s مكرر" -#: lib/command.php:437 +#: lib/command.php:428 msgid "Error repeating notice." msgstr "خطأ تكرار الإشعار." -#: lib/command.php:491 +#: lib/command.php:482 #, php-format -msgid "Notice too long - maximum is %1$d characters, you sent %2$d." +msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:500 -#, fuzzy, php-format -msgid "Reply to %s sent." +#: lib/command.php:491 +#, php-format +msgid "Reply to %s sent" msgstr "رÙد على رسالة %s" -#: lib/command.php:502 +#: lib/command.php:493 msgid "Error saving notice." msgstr "خطأ أثناء Ø­Ùظ الإشعار." -#: lib/command.php:556 -msgid "Specify the name of the user to subscribe to." +#: lib/command.php:547 +msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:563 +#: lib/command.php:554 #, php-format msgid "Subscribed to %s" msgstr "Ù…Ùشترك ب%s" -#: lib/command.php:584 -msgid "Specify the name of the user to unsubscribe from." +#: lib/command.php:575 +msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:591 +#: lib/command.php:582 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:609 lib/command.php:632 +#: lib/command.php:600 lib/command.php:623 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:612 +#: lib/command.php:603 msgid "Notification off." msgstr "" -#: lib/command.php:614 +#: lib/command.php:605 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:635 +#: lib/command.php:626 msgid "Notification on." msgstr "" -#: lib/command.php:637 +#: lib/command.php:628 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:650 -msgid "Login command is disabled." +#: lib/command.php:641 +msgid "Login command is disabled" msgstr "" -#: lib/command.php:664 -#, fuzzy, php-format -msgid "Could not create login token for %s." -msgstr "لم يمكن إنشاء توكن الولوج Ù„%s" - -#: lib/command.php:669 +#: lib/command.php:652 #, php-format -msgid "This link is useable only once, and is good for only 2 minutes: %s." +msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:685 +#: lib/command.php:668 msgid "You are not subscribed to anyone." msgstr "لست Ù…Ùشتركًا بأي أحد." -#: lib/command.php:687 +#: lib/command.php:670 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "لست مشتركًا بأحد." @@ -4340,11 +4667,11 @@ msgstr[3] "أنت مشترك بهؤلاء الأشخاص:" msgstr[4] "" msgstr[5] "" -#: lib/command.php:707 +#: lib/command.php:690 msgid "No one is subscribed to you." msgstr "لا أحد مشترك بك." -#: lib/command.php:709 +#: lib/command.php:692 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "لا أحد مشترك بك." @@ -4354,11 +4681,11 @@ msgstr[3] "هؤلاء الأشخاص مشتركون بك:" msgstr[4] "" msgstr[5] "" -#: lib/command.php:729 +#: lib/command.php:712 msgid "You are not a member of any groups." msgstr "لست عضوًا ÙÙŠ أي مجموعة." -#: lib/command.php:731 +#: lib/command.php:714 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "لست عضوًا ÙÙŠ أي مجموعة." @@ -4368,7 +4695,7 @@ msgstr[3] "أنت عضو ÙÙŠ هذه المجموعات:" msgstr[4] "" msgstr[5] "" -#: lib/command.php:745 +#: lib/command.php:728 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4409,19 +4736,19 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:199 +#: lib/common.php:131 msgid "No configuration file found. " msgstr "" -#: lib/common.php:200 +#: lib/common.php:132 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:201 +#: lib/common.php:134 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:202 +#: lib/common.php:135 msgid "Go to the installer." msgstr "اذهب إلى المÙثبّت." @@ -4437,6 +4764,14 @@ msgstr "" msgid "Updates by SMS" msgstr "" +#: lib/connectsettingsaction.php:120 +msgid "Connections" +msgstr "اتصالات" + +#: lib/connectsettingsaction.php:121 +msgid "Authorized connected applications" +msgstr "" + #: lib/dberroraction.php:60 msgid "Database error" msgstr "خطأ قاعدة بيانات" @@ -4619,11 +4954,16 @@ msgstr "ميجابايت" msgid "kB" msgstr "كيلوبايت" -#: lib/jabber.php:191 +#: lib/jabber.php:202 #, php-format msgid "[%s]" msgstr "[%s]" +#: lib/jabber.php:385 +#, php-format +msgid "Unknown inbox source %d." +msgstr "مصدر صندوق وارد غير معرو٠%d." + #: lib/joinform.php:114 msgid "Join" msgstr "انضم" @@ -4681,22 +5021,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 "السيرة: %s\n" +msgid "Bio: %s" +msgstr "السيرة: %s" #: lib/mail.php:286 #, php-format @@ -4847,9 +5175,9 @@ msgid "Sorry, no incoming email allowed." msgstr "" #: lib/mailhandler.php:228 -#, fuzzy, php-format +#, php-format msgid "Unsupported message type: %s" -msgstr "نسق غير مدعوم." +msgstr "نوع رسالة غير مدعوم: %s" #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." @@ -4882,7 +5210,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 @@ -4890,8 +5218,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!" -msgstr "" +msgid "Could not determine file's MIME type." +msgstr "لم يمكن تحديد نوع MIME للملÙ." #: lib/mediafile.php:270 #, php-format @@ -4900,7 +5228,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 @@ -4933,17 +5261,17 @@ msgid "Attach a file" msgstr "أرÙÙ‚ ملÙًا" #: lib/noticeform.php:212 -#, fuzzy -msgid "Share my location." -msgstr "لم يمكن Ø­Ùظ تÙضيلات الموقع." - -#: lib/noticeform.php:214 -#, fuzzy -msgid "Do not share my location." -msgstr "لم يمكن Ø­Ùظ تÙضيلات الموقع." +msgid "Share my location" +msgstr "شارك موقعي" #: lib/noticeform.php:215 -msgid "Hide this info" +msgid "Do not share my location" +msgstr "لا تشارك موقعي" + +#: lib/noticeform.php:216 +msgid "" +"Sorry, retrieving your geo location is taking longer than expected, please " +"try again later" msgstr "" #: lib/noticelist.php:428 @@ -5061,9 +5389,8 @@ msgid "Tags in %s's notices" msgstr "" #: lib/plugin.php:114 -#, fuzzy msgid "Unknown" -msgstr "إجراء غير معروÙ" +msgstr "غير معروÙ" #: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82 msgid "Subscriptions" @@ -5204,23 +5531,23 @@ msgstr "Ù…Ùشترك أصلا!" msgid "User has blocked you." msgstr "لقد منعك المستخدم." -#: lib/subs.php:60 +#: lib/subs.php:63 msgid "Could not subscribe." msgstr "تعذّر الاشتراك." -#: lib/subs.php:79 +#: lib/subs.php:82 msgid "Could not subscribe other to you." msgstr "" -#: lib/subs.php:128 +#: lib/subs.php:137 msgid "Not subscribed!" msgstr "غير مشترك!" -#: lib/subs.php:133 +#: lib/subs.php:142 msgid "Couldn't delete self-subscription." msgstr "لم يمكن حذ٠اشتراك ذاتي." -#: lib/subs.php:146 +#: lib/subs.php:158 msgid "Couldn't delete subscription." msgstr "تعذّر حذ٠الاشتراك." @@ -5234,10 +5561,6 @@ msgstr "" msgid "People Tagcloud as tagged" msgstr "" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(لا شيء)" - #: lib/tagcloudsection.php:56 msgid "None" msgstr "لا شيء" @@ -5298,47 +5621,47 @@ msgstr "رسالة" msgid "Moderate" msgstr "" -#: lib/util.php:837 +#: lib/util.php:875 msgid "a few seconds ago" msgstr "قبل لحظات قليلة" -#: lib/util.php:839 +#: lib/util.php:877 msgid "about a minute ago" msgstr "قبل دقيقة تقريبًا" -#: lib/util.php:841 +#: lib/util.php:879 #, php-format msgid "about %d minutes ago" msgstr "" -#: lib/util.php:843 +#: lib/util.php:881 msgid "about an hour ago" msgstr "قبل ساعة تقريبًا" -#: lib/util.php:845 +#: lib/util.php:883 #, php-format msgid "about %d hours ago" msgstr "" -#: lib/util.php:847 +#: lib/util.php:885 msgid "about a day ago" msgstr "قبل يوم تقريبا" -#: lib/util.php:849 +#: lib/util.php:887 #, php-format msgid "about %d days ago" msgstr "" -#: lib/util.php:851 +#: lib/util.php:889 msgid "about a month ago" msgstr "قبل شهر تقريبًا" -#: lib/util.php:853 +#: lib/util.php:891 #, php-format msgid "about %d months ago" msgstr "" -#: lib/util.php:855 +#: lib/util.php:893 msgid "about a year ago" msgstr "قبل سنة تقريبًا" @@ -5354,5 +5677,5 @@ msgstr "" #: scripts/xmppdaemon.php:301 #, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" diff --git a/locale/arz/LC_MESSAGES/statusnet.po b/locale/arz/LC_MESSAGES/statusnet.po index 2c6db293ed..8de26e44b9 100644 --- a/locale/arz/LC_MESSAGES/statusnet.po +++ b/locale/arz/LC_MESSAGES/statusnet.po @@ -1,5 +1,6 @@ # Translation of StatusNet to Egyptian Spoken Arabic # +# Author@translatewiki.net: Ghaly # Author@translatewiki.net: Meno25 # -- # This file is distributed under the same license as the StatusNet package. @@ -8,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-10 00:46+0000\n" -"PO-Revision-Date: 2010-01-10 00:47:07+0000\n" +"POT-Creation-Date: 2010-01-15 19:15+0000\n" +"PO-Revision-Date: 2010-01-16 17:51:30+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 (r60878); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r61138); 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" @@ -34,25 +35,30 @@ msgstr "لا صÙحه كهذه" #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 +#: actions/apistatusesupdate.php:149 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 #: 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 #: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 -#: lib/command.php:163 lib/command.php:311 lib/command.php:364 -#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/command.php:163 lib/command.php:302 lib/command.php:355 +#: lib/command.php:401 lib/command.php:462 lib/command.php:518 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/subs.php:34 lib/subs.php:125 msgid "No such user." msgstr "لا مستخدم كهذا." +#: actions/all.php:84 +#, php-format +msgid "%1$s and friends, page %2$d" +msgstr "%1$s والأصدقاء, الصÙحه %2$d" + #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 +#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -104,7 +110,7 @@ msgstr "" msgid "You and friends" msgstr "أنت والأصدقاء" -#: actions/allrss.php:119 actions/apitimelinefriends.php:122 +#: actions/allrss.php:119 actions/apitimelinefriends.php:121 #: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" @@ -115,6 +121,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:155 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." @@ -128,7 +151,7 @@ msgstr "لم يتم العثور على وسيله API." #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:114 +#: actions/apistatusesupdate.php:119 msgid "This method requires a POST." msgstr "تتطلب هذه الطريقه POST." @@ -157,8 +180,9 @@ msgstr "لم يمكن Ø­Ùظ الملÙ." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257 -#: actions/designadminpanel.php:122 actions/newnotice.php:94 +#: actions/apistatusesupdate.php:132 actions/avatarsettings.php:257 +#: actions/designadminpanel.php:122 actions/editapplication.php:118 +#: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format msgid "" @@ -170,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 msgid "Unable to save your design settings." msgstr "" @@ -210,26 +237,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 "لا نص ÙÙ‰ الرسالة!" @@ -253,16 +260,16 @@ msgid "No status found with that ID." msgstr "" #: 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." @@ -282,8 +289,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." @@ -315,7 +322,8 @@ msgstr "" msgid "Not a valid nickname." msgstr "ليس اسمًا مستعارًا صحيحًا." -#: actions/apigroupcreate.php:196 actions/editgroup.php:195 +#: actions/apigroupcreate.php:196 actions/editapplication.php:212 +#: actions/editgroup.php:195 actions/newapplication.php:200 #: actions/newgroup.php:139 actions/profilesettings.php:222 #: actions/register.php:217 msgid "Homepage is not a valid URL." @@ -327,7 +335,8 @@ msgstr "الصÙحه الرئيسيه ليست عنونًا صالحًا." msgid "Full name is too long (max 255 chars)." msgstr "الاسم الكامل طويل جدا (الأقصى 255 حرÙًا)" -#: actions/apigroupcreate.php:213 +#: actions/apigroupcreate.php:213 actions/editapplication.php:187 +#: actions/newapplication.php:169 #, php-format msgid "Description is too long (max %d chars)." msgstr "" @@ -367,7 +376,7 @@ msgstr "" msgid "Group not found!" msgstr "لم توجد المجموعة!" -#: actions/apigroupjoin.php:110 lib/command.php:217 +#: actions/apigroupjoin.php:110 actions/joingroup.php:90 msgid "You are already a member of that group." msgstr "" @@ -375,19 +384,19 @@ msgstr "" msgid "You have been blocked from that group by the admin." msgstr "" -#: actions/apigroupjoin.php:138 lib/command.php:234 -#, fuzzy, php-format +#: actions/apigroupjoin.php:138 actions/joingroup.php:124 +#, php-format msgid "Could not join user %1$s to group %2$s." -msgstr "تعذّر إنشاء المجموعه." +msgstr "لم يمكن ضم المستخدم %1$s إلى المجموعه %2$s." #: actions/apigroupleave.php:114 msgid "You are not a member of this group." msgstr "" -#: actions/apigroupleave.php:124 actions/leavegroup.php:127 -#, fuzzy, php-format +#: actions/apigroupleave.php:124 actions/leavegroup.php:119 +#, php-format msgid "Could not remove user %1$s from group %2$s." -msgstr "تعذّر إنشاء المجموعه." +msgstr "لم يمكن إزاله المستخدم %1$s من المجموعه %2$s." #: actions/apigrouplist.php:95 #, php-format @@ -404,6 +413,97 @@ msgstr "مجموعات %s" msgid "groups on %s" msgstr "مجموعات %s" +#: actions/apioauthauthorize.php:108 actions/apioauthauthorize.php:114 +msgid "Bad request." +msgstr "" + +#: actions/apioauthauthorize.php:134 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:115 actions/makeadmin.php:66 +#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 +#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:139 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 +#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/subscribe.php:46 actions/tagother.php:166 +#: 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 "" + +#: actions/apioauthauthorize.php:146 +msgid "Invalid nickname / password!" +msgstr "اسم/كلمه سر غير صحيحة!" + +#: actions/apioauthauthorize.php:170 +msgid "DB error deleting OAuth app user." +msgstr "خطأ قاعده البيانات أثناء حذ٠المستخدم OAuth app" + +#: actions/apioauthauthorize.php:196 +msgid "DB error inserting OAuth app user." +msgstr "خطأ قاعده البيانات أثناء إدخال المستخدم OAuth app" + +#: actions/apioauthauthorize.php:231 +#, php-format +msgid "" +"The request token %s has been authorized. Please exchange it for an access " +"token." +msgstr "" + +#: actions/apioauthauthorize.php:241 +#, php-format +msgid "The request token %s has been denied." +msgstr "" + +#: actions/apioauthauthorize.php:246 actions/avatarsettings.php:281 +#: actions/designadminpanel.php:103 actions/editapplication.php:139 +#: actions/emailsettings.php:256 actions/grouplogo.php:319 +#: actions/imsettings.php:220 actions/newapplication.php:121 +#: actions/oauthconnectionssettings.php:151 actions/recoverpassword.php:44 +#: actions/smssettings.php:248 lib/designsettings.php:304 +msgid "Unexpected form submission." +msgstr "" + +#: actions/apioauthauthorize.php:273 +msgid "An application would like to connect to your account" +msgstr "" + +#: actions/apioauthauthorize.php:290 +msgid "Allow or deny access" +msgstr "" + +#: actions/apioauthauthorize.php:320 lib/action.php:435 +msgid "Account" +msgstr "الحساب" + +#: actions/apioauthauthorize.php:323 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/apioauthauthorize.php:326 actions/login.php:233 +#: actions/register.php:429 lib/accountsettingsaction.php:116 +msgid "Password" +msgstr "كلمه السر" + +#: actions/apioauthauthorize.php:338 +msgid "Deny" +msgstr "ارÙض" + +#: actions/apioauthauthorize.php:344 +msgid "Allow" +msgstr "اسمح" + +#: actions/apioauthauthorize.php:361 +msgid "Allow or deny access to your account information." +msgstr "" + #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." msgstr "" @@ -417,11 +517,11 @@ msgstr "" msgid "No such notice." msgstr "لا إشعار كهذا." -#: actions/apistatusesretweet.php:83 lib/command.php:422 +#: actions/apistatusesretweet.php:83 msgid "Cannot repeat your own notice." msgstr "لا يمكنك تكرار ملحوظتك الخاصه." -#: actions/apistatusesretweet.php:91 lib/command.php:427 +#: actions/apistatusesretweet.php:91 msgid "Already repeated that notice." msgstr "كرر بالÙعل هذه الملاحظه." @@ -433,17 +533,17 @@ msgstr "Ø­ÙØ°ÙÙت الحاله." msgid "No status with that ID found." msgstr "" -#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:162 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" -#: actions/apistatusesupdate.php:198 +#: actions/apistatusesupdate.php:203 msgid "Not found" msgstr "لم يوجد" -#: actions/apistatusesupdate.php:221 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:226 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -527,8 +627,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 "لا اسم مستعار." @@ -551,8 +654,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 "" @@ -584,29 +687,6 @@ 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/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 -#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 -#: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 -#: actions/subscribe.php:46 actions/tagother.php:166 -#: 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 "" - -#: actions/avatarsettings.php:281 actions/designadminpanel.php:103 -#: actions/emailsettings.php:256 actions/grouplogo.php:319 -#: actions/imsettings.php:220 actions/recoverpassword.php:44 -#: actions/smssettings.php:248 lib/designsettings.php:304 -msgid "Unexpected form submission." -msgstr "" - #: actions/avatarsettings.php:328 msgid "Pick a square area of the image to be your avatar" msgstr "" @@ -665,19 +745,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:260 +msgid "No such group." +msgstr "لا مجموعه كهذه." #: actions/blockedfromgroup.php:90 #, php-format @@ -685,9 +761,9 @@ msgid "%s blocked profiles" msgstr "" #: actions/blockedfromgroup.php:93 -#, fuzzy, php-format +#, php-format msgid "%1$s blocked profiles, page %2$d" -msgstr "مشتركو %sØŒ الصÙحه %d" +msgstr "%1$s ملÙات ممنوعة, الصÙحه %2$d" #: actions/blockedfromgroup.php:108 msgid "A list of the users blocked from joining this group." @@ -744,8 +820,8 @@ msgid "Couldn't delete email confirmation." msgstr "تعذّر حذ٠تأكيد البريد الإلكترونى." #: actions/confirmaddress.php:144 -msgid "Confirm Address" -msgstr "عنوان التأكيد" +msgid "Confirm address" +msgstr "أكد العنوان" #: actions/confirmaddress.php:159 #, php-format @@ -797,10 +873,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 "لا يمكنك حذ٠المستخدمين." @@ -930,7 +1002,8 @@ msgstr "ارجع إلى المبدئي" #: actions/pathsadminpanel.php:324 actions/profilesettings.php:174 #: actions/siteadminpanel.php:388 actions/smssettings.php:181 #: actions/subscriptions.php:203 actions/tagother.php:154 -#: actions/useradminpanel.php:313 lib/designsettings.php:256 +#: actions/useradminpanel.php:313 lib/applicationeditform.php:335 +#: lib/applicationeditform.php:336 lib/designsettings.php:256 #: lib/groupeditform.php:202 msgid "Save" msgstr "أرسل" @@ -951,6 +1024,76 @@ msgstr "أض٠إلى المÙضلات" msgid "No such document." msgstr "لا مستند كهذا." +#: actions/editapplication.php:54 lib/applicationeditform.php:136 +msgid "Edit application" +msgstr "" + +#: actions/editapplication.php:66 +msgid "You must be logged in to edit an application." +msgstr "يجب أن تكون مسجل الدخول لتعدل تطبيقا." + +#: actions/editapplication.php:77 actions/showapplication.php:94 +msgid "You are not the owner of this application." +msgstr "أنت لست مالك هذا التطبيق." + +#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:163 +#: actions/showapplication.php:87 +msgid "No such application." +msgstr "لا تطبيق كهذا." + +#: actions/editapplication.php:127 actions/newapplication.php:110 +#: actions/showapplication.php:118 lib/action.php:1167 +msgid "There was a problem with your session token." +msgstr "" + +#: actions/editapplication.php:161 +msgid "Use this form to edit your application." +msgstr "استخدم النموذج ده علشان تعدل تطبيقك." + +#: actions/editapplication.php:177 actions/newapplication.php:159 +msgid "Name is required." +msgstr "الاسم مطلوب." + +#: actions/editapplication.php:180 actions/newapplication.php:162 +msgid "Name is too long (max 255 chars)." +msgstr "الاسم طويل جدا (الأقصى 255 حرÙا)." + +#: actions/editapplication.php:183 actions/newapplication.php:165 +msgid "Description is required." +msgstr "الوص٠مطلوب." + +#: actions/editapplication.php:191 +msgid "Source URL is too long." +msgstr "" + +#: actions/editapplication.php:197 actions/newapplication.php:182 +msgid "Source URL is not valid." +msgstr "مسار المصدر ليس صحيحا." + +#: actions/editapplication.php:200 actions/newapplication.php:185 +msgid "Organization is required." +msgstr "" + +#: actions/editapplication.php:203 actions/newapplication.php:188 +msgid "Organization is too long (max 255 chars)." +msgstr "المنظمه طويله جدا (الأقصى 255 حرÙا)." + +#: actions/editapplication.php:206 actions/newapplication.php:191 +msgid "Organization homepage is required." +msgstr "" + +#: actions/editapplication.php:215 actions/newapplication.php:203 +msgid "Callback is too long." +msgstr "" + +#: actions/editapplication.php:222 actions/newapplication.php:212 +msgid "Callback URL is not valid." +msgstr "" + +#: actions/editapplication.php:255 +msgid "Could not update application." +msgstr "لم يمكن تحديث التطبيق." + #: actions/editgroup.php:56 #, php-format msgid "Edit %s group" @@ -962,8 +1105,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." @@ -987,7 +1130,7 @@ msgid "Options saved." msgstr "Ø­ÙÙظت الخيارات." #: actions/emailsettings.php:60 -msgid "Email Settings" +msgid "Email settings" msgstr "إعدادات البريد الإلكتروني" #: actions/emailsettings.php:71 @@ -1017,12 +1160,13 @@ msgid "" msgstr "" #: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 +#: actions/smssettings.php:126 lib/applicationeditform.php:333 +#: lib/applicationeditform.php:334 msgid "Cancel" msgstr "ألغÙ" #: actions/emailsettings.php:121 -msgid "Email Address" +msgid "Email address" msgstr "عنوان البريد الإلكتروني" #: actions/emailsettings.php:123 @@ -1096,9 +1240,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." @@ -1272,13 +1417,6 @@ 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:79 msgid "No such file." msgstr "لا مل٠كهذا." @@ -1295,7 +1433,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 "لا مل٠شخصى بهذه الهويه." @@ -1340,9 +1478,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." @@ -1363,12 +1501,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 "" @@ -1383,6 +1515,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 "" @@ -1401,9 +1537,9 @@ msgid "%s group members" msgstr "أعضاء مجموعه %s" #: actions/groupmembers.php:96 -#, fuzzy, php-format +#, php-format msgid "%1$s group members, page %2$d" -msgstr "مجموعات %sØŒ صÙحه %d" +msgstr "%1$s أعضاء المجموعة, الصÙحه %2$d" #: actions/groupmembers.php:111 msgid "A list of the users in this group." @@ -1501,7 +1637,7 @@ msgid "Error removing the block." msgstr "خطأ أثناء منع الحجب." #: actions/imsettings.php:59 -msgid "IM Settings" +msgid "IM settings" msgstr "إعدادات المراسله الÙورية" #: actions/imsettings.php:70 @@ -1527,7 +1663,7 @@ msgid "" msgstr "" #: actions/imsettings.php:124 -msgid "IM Address" +msgid "IM address" msgstr "عنوان المراسله الÙورية" #: actions/imsettings.php:126 @@ -1619,7 +1755,7 @@ msgstr "دعوه مستخدمين جدد" msgid "You are already subscribed to these users:" msgstr "" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:315 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -1660,7 +1796,7 @@ msgstr "رساله شخصية" msgid "Optionally add a personal message to the invitation." msgstr "" -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236 msgid "Send" msgstr "أرسل" @@ -1704,92 +1840,64 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "" -#: actions/joingroup.php:90 -msgid "You are already a member of that group" -msgstr "" - -#: actions/joingroup.php:128 -#, fuzzy, php-format -msgid "Could not join user %1$s to group %2$s" -msgstr "تعذّر إنشاء المجموعه." - -#: actions/joingroup.php:135 lib/command.php:239 -#, fuzzy, php-format +#: actions/joingroup.php:131 +#, php-format msgid "%1$s joined group %2$s" -msgstr "%s انضم إلى مجموعه %s" +msgstr "%1$s انضم للمجموعه %2$s" #: actions/leavegroup.php:60 msgid "You must be logged in to leave a group." msgstr "" -#: actions/leavegroup.php:90 lib/command.php:268 +#: actions/leavegroup.php:90 lib/command.php:265 msgid "You are not a member of that group." msgstr "لست عضوا ÙÙ‰ تلك المجموعه." -#: actions/leavegroup.php:119 lib/command.php:278 -msgid "Could not find membership record." -msgstr "" - -#: actions/leavegroup.php:134 lib/command.php:289 -#, fuzzy, php-format +#: actions/leavegroup.php:127 +#, php-format msgid "%1$s left group %2$s" -msgstr "%s انضم إلى مجموعه %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:460 +#: 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 -#: lib/groupeditform.php:152 lib/userprofile.php:131 -msgid "Nickname" -msgstr "الاسم المستعار" - -#: actions/login.php:253 actions/register.php:428 -#: 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]" @@ -1807,18 +1915,38 @@ msgstr "" #: actions/makeadmin.php:132 #, php-format -msgid "Can't get membership record for %1$s in group %2$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 %1$s an admin for group %2$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 "لا حاله حالية" +#: actions/newapplication.php:52 +msgid "New application" +msgstr "" + +#: actions/newapplication.php:64 +msgid "You must be logged in to register an application." +msgstr "يجب أن تكون مسجل الدخول لتسجل تطبيقا." + +#: actions/newapplication.php:143 +msgid "Use this form to register a new application." +msgstr "استخدم هذا النموذج لتسجل تطبيقا جديدا." + +#: actions/newapplication.php:173 +msgid "Source URL is required." +msgstr "" + +#: actions/newapplication.php:255 actions/newapplication.php:264 +msgid "Could not create application." +msgstr "مش ممكن إنشاء التطبيق." + #: actions/newgroup.php:53 msgid "New group" msgstr "مجموعه جديدة" @@ -1831,12 +1959,12 @@ msgstr "استخدم هذا النموذج لإنشاء مجموعه جديده. msgid "New message" msgstr "رساله جديدة" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 msgid "You can't send a message to this user." msgstr "" -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:484 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 +#: lib/command.php:475 msgid "No content!" msgstr "لا محتوى!" @@ -1844,7 +1972,7 @@ msgstr "لا محتوى!" msgid "No recipient specified." msgstr "لا مستلم Ø­Ùدّد." -#: actions/newmessage.php:164 lib/command.php:370 +#: actions/newmessage.php:164 lib/command.php:361 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -1855,8 +1983,8 @@ msgstr "Ø£Ùرسلت الرسالة" #: 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" @@ -1882,9 +2010,9 @@ msgid "Text search" msgstr "بحث ÙÙ‰ النصوص" #: actions/noticesearch.php:91 -#, fuzzy, php-format +#, php-format msgid "Search results for \"%1$s\" on %2$s" -msgstr "نتائج البحث عن \"%s\" ÙÙ‰ %s" +msgstr "نتائج البحث Ù„\"%1$s\" على %2$s" #: actions/noticesearch.php:121 #, php-format @@ -1923,6 +2051,48 @@ msgstr "أرسل التنبيه" msgid "Nudge sent!" msgstr "Ø£Ùرسل التنبيه!" +#: actions/oauthappssettings.php:59 +msgid "You must be logged in to list your applications." +msgstr "يجب أن تكون مسجل الدخول لعرض تطبيقاتك." + +#: actions/oauthappssettings.php:74 +msgid "OAuth applications" +msgstr "تطبيقات OAuth" + +#: actions/oauthappssettings.php:85 +msgid "Applications you have registered" +msgstr "" + +#: actions/oauthappssettings.php:135 +#, php-format +msgid "You have not registered any applications yet." +msgstr "" + +#: actions/oauthconnectionssettings.php:71 +msgid "Connected applications" +msgstr "" + +#: actions/oauthconnectionssettings.php:87 +msgid "You have allowed the following applications to access you account." +msgstr "" + +#: actions/oauthconnectionssettings.php:170 +msgid "You are not a user of that application." +msgstr "أنت لست مستخدما لهذا التطبيق." + +#: actions/oauthconnectionssettings.php:180 +msgid "Unable to revoke access for app: " +msgstr "" + +#: actions/oauthconnectionssettings.php:192 +#, php-format +msgid "You have not authorized any applications to use your account." +msgstr "" + +#: actions/oauthconnectionssettings.php:205 +msgid "Developers can edit the registration settings for their applications " +msgstr "" + #: actions/oembed.php:79 actions/shownotice.php:100 msgid "Notice has no profile" msgstr "" @@ -1940,22 +2110,22 @@ 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:1038 +#: lib/api.php:1066 lib/api.php:1176 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 "بحث الإشعارات" #: actions/othersettings.php:60 -msgid "Other Settings" -msgstr "إعدادات أخرى" +msgid "Other settings" +msgstr "إعدادات تانيه" #: actions/othersettings.php:71 msgid "Manage various other options." @@ -1985,6 +2155,26 @@ msgstr "أظهر أو أخÙ٠تصاميم الملÙات الشخصيه." msgid "URL shortening service is too long (max 50 chars)." msgstr "" +#: 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 #, php-format msgid "Outbox for %s" @@ -2019,7 +2209,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 "أكّد" @@ -2181,8 +2371,8 @@ msgid "When to use SSL" msgstr "" #: actions/pathsadminpanel.php:308 -msgid "SSL Server" -msgstr "خادوم SSL" +msgid "SSL server" +msgstr "خادم SSL" #: actions/pathsadminpanel.php:309 msgid "Server to direct SSL requests to" @@ -2239,42 +2429,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 -#: lib/groupeditform.php:161 +#: actions/profilesettings.php:115 actions/register.php:453 +#: lib/applicationeditform.php:230 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 "" @@ -2571,7 +2761,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 "عذرًا، الأشخاص المدعوون وحدهم يستطيعون التسجيل." @@ -2583,7 +2773,7 @@ msgstr "عذرا، رمز دعوه غير صالح." msgid "Registration successful" msgstr "نجح التسجيل" -#: actions/register.php:114 actions/register.php:502 lib/action.php:457 +#: actions/register.php:114 actions/register.php:503 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "سجّل" @@ -2596,64 +2786,60 @@ 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, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -2672,7 +2858,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.)" @@ -2810,6 +2996,80 @@ msgstr "" msgid "User is already sandboxed." msgstr "" +#: actions/showapplication.php:82 +msgid "You must be logged in to view an application." +msgstr "يجب أن تكون مسجل الدخول لرؤيه تطبيق." + +#: actions/showapplication.php:158 +msgid "Application profile" +msgstr "" + +#: actions/showapplication.php:160 lib/applicationeditform.php:182 +msgid "Icon" +msgstr "" + +#: actions/showapplication.php:170 actions/version.php:195 +#: lib/applicationeditform.php:197 +msgid "Name" +msgstr "الاسم" + +#: actions/showapplication.php:179 lib/applicationeditform.php:224 +msgid "Organization" +msgstr "المنظمة" + +#: actions/showapplication.php:188 actions/version.php:198 +#: lib/applicationeditform.php:211 lib/groupeditform.php:172 +msgid "Description" +msgstr "الوصÙ" + +#: actions/showapplication.php:193 actions/showgroup.php:429 +#: lib/profileaction.php:174 +msgid "Statistics" +msgstr "إحصاءات" + +#: actions/showapplication.php:204 +#, php-format +msgid "created by %1$s - %2$s access by default - %3$d users" +msgstr "" + +#: actions/showapplication.php:214 +msgid "Application actions" +msgstr "" + +#: actions/showapplication.php:233 +msgid "Reset key & secret" +msgstr "" + +#: actions/showapplication.php:241 +msgid "Application info" +msgstr "" + +#: actions/showapplication.php:243 +msgid "Consumer key" +msgstr "" + +#: actions/showapplication.php:248 +msgid "Consumer secret" +msgstr "" + +#: actions/showapplication.php:253 +msgid "Request token URL" +msgstr "" + +#: actions/showapplication.php:258 +msgid "Access token URL" +msgstr "" + +#: actions/showapplication.php:263 +msgid "Authorize URL" +msgstr "اسمح بالمسار" + +#: actions/showapplication.php:268 +msgid "" +"Note: We support HMAC-SHA1 signatures. We do not support the plaintext " +"signature method." +msgstr "" + #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "" @@ -2911,7 +3171,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 "(لا شيء)" @@ -2919,10 +3179,6 @@ msgstr "(لا شيء)" msgid "All members" msgstr "جميع الأعضاء" -#: actions/showgroup.php:429 lib/profileaction.php:174 -msgid "Statistics" -msgstr "إحصاءات" - #: actions/showgroup.php:432 msgid "Created" msgstr "أنشئ" @@ -3059,13 +3315,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." @@ -3244,7 +3500,7 @@ msgid "Save site settings" msgstr "اذ٠إعدادت الموقع" #: actions/smssettings.php:58 -msgid "SMS Settings" +msgid "SMS settings" msgstr "إعدادات الرسائل القصيرة" #: actions/smssettings.php:69 @@ -3273,8 +3529,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" #: actions/smssettings.php:140 msgid "Phone number, no punctuation or spaces, with area code" @@ -3357,9 +3613,9 @@ msgid "%s subscribers" msgstr "مشتركو %s" #: actions/subscribers.php:52 -#, fuzzy, php-format +#, php-format msgid "%1$s subscribers, page %2$d" -msgstr "مشتركو %sØŒ الصÙحه %d" +msgstr "مشتركو %1$s, الصÙحه %2$d" #: actions/subscribers.php:63 msgid "These are the people who listen to your notices." @@ -3394,9 +3650,9 @@ msgid "%s subscriptions" msgstr "اشتراكات %s" #: actions/subscriptions.php:54 -#, fuzzy, php-format +#, php-format msgid "%1$s subscriptions, page %2$d" -msgstr "اشتراكات %sØŒ الصÙحه %d" +msgstr "اشتراكات%1$s, الصÙحه %2$d" #: actions/subscriptions.php:65 msgid "These are the people whose notices you listen to." @@ -3509,10 +3765,6 @@ 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 "" @@ -3703,10 +3955,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 "تصميم المل٠الشخصي" @@ -3736,9 +3984,9 @@ msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" #: actions/version.php:73 -#, fuzzy, php-format +#, php-format msgid "StatusNet %s" -msgstr "إحصاءات" +msgstr "ستاتس نت %s" #: actions/version.php:153 #, php-format @@ -3748,9 +3996,8 @@ msgid "" msgstr "" #: actions/version.php:157 -#, fuzzy msgid "StatusNet" -msgstr "Ø­ÙØ°ÙÙت الحاله." +msgstr "ستاتس نت" #: actions/version.php:161 msgid "Contributors" @@ -3783,42 +4030,48 @@ msgstr "" msgid "Plugins" msgstr "" -#: actions/version.php:195 -#, fuzzy -msgid "Name" -msgstr "الاسم المستعار" - #: actions/version.php:196 lib/action.php:741 -#, fuzzy msgid "Version" -msgstr "الجلسات" +msgstr "النسخة" #: actions/version.php:197 -#, fuzzy msgid "Author(s)" -msgstr "المؤلÙ" +msgstr "المؤلÙ(ون)" -#: actions/version.php:198 lib/groupeditform.php:172 -msgid "Description" -msgstr "الوصÙ" - -#: classes/File.php:137 +#: 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/Group_member.php:41 +msgid "Group join failed." +msgstr "الانضمام للمجموعه Ùشل." + +#: classes/Group_member.php:53 +msgid "Not part of group." +msgstr "ليس جزءا من المجموعه." + +#: classes/Group_member.php:60 +msgid "Group leave failed." +msgstr "ترك المجموعه Ùشل." + +#: classes/Login_token.php:76 +#, 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 "أنت ممنوع من إرسال رسائل مباشره." @@ -3831,49 +4084,49 @@ msgstr "تعذّر إدراج الرساله." msgid "Could not update message with new URI." msgstr "" -#: classes/Notice.php:172 +#: classes/Notice.php:171 #, php-format msgid "DB error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:226 +#: classes/Notice.php:225 msgid "Problem saving notice. Too long." msgstr "مشكله ÙÙ‰ Ø­Ùظ الإشعار. طويل جدًا." -#: classes/Notice.php:230 +#: classes/Notice.php:229 msgid "Problem saving notice. Unknown user." msgstr "مشكله ÙÙ‰ Ø­Ùظ الإشعار. مستخدم غير معروÙ." -#: classes/Notice.php:235 +#: classes/Notice.php:234 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:241 +#: classes/Notice.php:240 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:247 +#: classes/Notice.php:246 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:309 classes/Notice.php:334 +#: classes/Notice.php:305 classes/Notice.php:330 msgid "Problem saving notice." msgstr "مشكله أثناء Ø­Ùظ الإشعار." -#: classes/Notice.php:1034 +#: classes/Notice.php:1052 #, php-format msgid "DB error inserting reply: %s" msgstr "" -#: classes/Notice.php:1359 +#: classes/Notice.php:1423 #, php-format msgid "RT @%1$s %2$s" msgstr "آر تى @%1$s %2$s" -#: classes/User.php:368 +#: classes/User.php:382 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "أهلا بكم ÙÙ‰ %1$s يا @%2$s!" @@ -3914,6 +4167,11 @@ msgstr "أخرى" msgid "Other options" msgstr "خيارات أخرى" +#: lib/action.php:144 +#, php-format +msgid "%1$s - %2$s" +msgstr "%1$s - %2$s" + #: lib/action.php:159 msgid "Untitled page" msgstr "صÙحه غير Ù…Ùعنونة" @@ -3930,10 +4188,6 @@ msgstr "الرئيسية" msgid "Personal profile and friends timeline" msgstr "المل٠الشخصى ومسار الأصدقاء الزمني" -#: lib/action.php:435 -msgid "Account" -msgstr "الحساب" - #: lib/action.php:435 msgid "Change your email, avatar, password, profile" msgstr "" @@ -4088,18 +4342,13 @@ msgstr "بعد" msgid "Before" msgstr "قبل" -#: lib/action.php:1167 -msgid "There was a problem with your session token." -msgstr "" - #: lib/adminpanelaction.php:96 msgid "You cannot make changes to this site." msgstr "" #: lib/adminpanelaction.php:107 -#, fuzzy msgid "Changes to that panel are not allowed." -msgstr "لا ÙŠÙسمح بالتسجيل." +msgstr "التغييرات لهذه اللوحه غير مسموح بها." #: lib/adminpanelaction.php:206 msgid "showForm() not implemented." @@ -4125,6 +4374,68 @@ msgstr "ضبط التصميم" msgid "Paths configuration" msgstr "ضبط المسارات" +#: lib/applicationeditform.php:186 +msgid "Icon for this application" +msgstr "" + +#: lib/applicationeditform.php:206 +#, php-format +msgid "Describe your application in %d characters" +msgstr "" + +#: lib/applicationeditform.php:209 +#, fuzzy +msgid "Describe your application" +msgstr "ص٠تطبيقك" + +#: lib/applicationeditform.php:218 +msgid "Source URL" +msgstr "مسار المصدر" + +#: lib/applicationeditform.php:220 +msgid "URL of the homepage of this application" +msgstr "" + +#: lib/applicationeditform.php:226 +msgid "Organization responsible for this application" +msgstr "" + +#: lib/applicationeditform.php:232 +msgid "URL for the homepage of the organization" +msgstr "" + +#: lib/applicationeditform.php:238 +msgid "URL to redirect to after authentication" +msgstr "" + +#: lib/applicationeditform.php:260 +msgid "Browser" +msgstr "" + +#: lib/applicationeditform.php:276 +msgid "Desktop" +msgstr "" + +#: lib/applicationeditform.php:277 +msgid "Type of application, browser or desktop" +msgstr "" + +#: lib/applicationeditform.php:299 +msgid "Read-only" +msgstr "" + +#: lib/applicationeditform.php:317 +msgid "Read-write" +msgstr "" + +#: lib/applicationeditform.php:318 +msgid "Default access for this application: read-only, or read-write" +msgstr "" + +#: lib/applicationlist.php:154 +msgid "Revoke" +msgstr "اسحب" + #: lib/attachmentlist.php:87 msgid "Attachments" msgstr "مرÙقات" @@ -4145,15 +4456,13 @@ msgstr "" msgid "Tags for this attachment" msgstr "وسوم هذا المرÙÙ‚" -#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 -#, fuzzy +#: lib/authenticationplugin.php:214 lib/authenticationplugin.php:219 msgid "Password changing failed" -msgstr "تغيير كلمه السر" +msgstr "تغيير كلمه السر Ùشل" -#: lib/authenticationplugin.php:197 -#, fuzzy +#: lib/authenticationplugin.php:229 msgid "Password changing is not allowed" -msgstr "تغيير كلمه السر" +msgstr "تغيير كلمه السر غير مسموح به" #: lib/channel.php:138 lib/channel.php:158 msgid "Command results" @@ -4172,18 +4481,18 @@ msgid "Sorry, this command is not yet implemented." msgstr "" #: lib/command.php:88 -#, fuzzy, php-format -msgid "Could not find a user with nickname %s." -msgstr "تعذّر إيجاد المستخدم الهدÙ." +#, php-format +msgid "Could not find a user with nickname %s" +msgstr "لم يمكن إيجاد مستخدم بالاسم %s" #: lib/command.php:92 msgid "It does not make a lot of sense to nudge yourself!" msgstr "" #: lib/command.php:99 -#, fuzzy, php-format -msgid "Nudge sent to %s." -msgstr "أرسل التنبيه" +#, php-format +msgid "Nudge sent to %s" +msgstr "التنبيه تم إرساله إلى %s" #: lib/command.php:126 #, php-format @@ -4196,140 +4505,160 @@ msgstr "" "المشتركون: %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 "لا مل٠بهذه الهويه." +#: lib/command.php:152 lib/command.php:390 lib/command.php:451 +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." +#: lib/command.php:168 lib/command.php:406 lib/command.php:467 +#: lib/command.php:523 +msgid "User has no last notice" msgstr "ليس للمستخدم إشعار أخير" #: lib/command.php:190 msgid "Notice marked as fave." msgstr "" -#: lib/command.php:284 -#, fuzzy, php-format -msgid "Could not remove user %1$s to group %2$s." -msgstr "تعذّر إنشاء المجموعه." +#: lib/command.php:217 +msgid "You are already a member of that group" +msgstr "أنت بالÙعل عضو ÙÙ‰ هذه المجموعة" -#: lib/command.php:318 +#: lib/command.php:231 +#, php-format +msgid "Could not join user %s to group %s" +msgstr "لم يمكن ضم المستخدم %s إلى المجموعه %s" + +#: lib/command.php:236 +#, php-format +msgid "%s joined group %s" +msgstr "%s انضم إلى مجموعه %s" + +#: lib/command.php:275 +#, php-format +msgid "Could not remove user %s to group %s" +msgstr "لم يمكن إزاله المستخدم %s من المجموعه %s" + +#: lib/command.php:280 +#, php-format +msgid "%s left group %s" +msgstr "%s ترك المجموعه %s" + +#: lib/command.php:309 #, php-format msgid "Fullname: %s" msgstr "الاسم الكامل: %s" -#: lib/command.php:321 +#: lib/command.php:312 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "الموقع: %s" -#: lib/command.php:324 +#: lib/command.php:315 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "الصÙحه الرئيسية: %s" -#: lib/command.php:327 +#: lib/command.php:318 #, php-format msgid "About: %s" msgstr "عن: %s" -#: lib/command.php:358 +#: lib/command.php:349 #, php-format -msgid "Message too long - maximum is %1$d characters, you sent %2$d." +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:367 +#, php-format +msgid "Direct message to %s sent" +msgstr "رساله مباشره إلى %s تم إرسالها" -#: lib/command.php:378 +#: lib/command.php:369 msgid "Error sending direct message." msgstr "" -#: lib/command.php:435 -#, fuzzy, php-format -msgid "Notice from %s repeated." +#: lib/command.php:413 +msgid "Cannot repeat your own notice" +msgstr "لا يمكنك تكرار ملاحظتك الخاصة" + +#: lib/command.php:418 +msgid "Already repeated that notice" +msgstr "كرر بالÙعل هذا الإشعار" + +#: lib/command.php:426 +#, php-format +msgid "Notice from %s repeated" msgstr "الإشعار من %s مكرر" -#: lib/command.php:437 +#: lib/command.php:428 msgid "Error repeating notice." msgstr "خطأ تكرار الإشعار." -#: lib/command.php:491 +#: lib/command.php:482 #, php-format -msgid "Notice too long - maximum is %1$d characters, you sent %2$d." +msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:500 -#, fuzzy, php-format -msgid "Reply to %s sent." +#: lib/command.php:491 +#, php-format +msgid "Reply to %s sent" msgstr "رÙد على رساله %s" -#: lib/command.php:502 +#: lib/command.php:493 msgid "Error saving notice." msgstr "خطأ أثناء Ø­Ùظ الإشعار." -#: lib/command.php:556 -msgid "Specify the name of the user to subscribe to." +#: lib/command.php:547 +msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:563 +#: lib/command.php:554 #, php-format msgid "Subscribed to %s" msgstr "Ù…Ùشترك ب%s" -#: lib/command.php:584 -msgid "Specify the name of the user to unsubscribe from." +#: lib/command.php:575 +msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:591 +#: lib/command.php:582 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:609 lib/command.php:632 +#: lib/command.php:600 lib/command.php:623 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:612 +#: lib/command.php:603 msgid "Notification off." msgstr "" -#: lib/command.php:614 +#: lib/command.php:605 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:635 +#: lib/command.php:626 msgid "Notification on." msgstr "" -#: lib/command.php:637 +#: lib/command.php:628 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:650 -msgid "Login command is disabled." +#: lib/command.php:641 +msgid "Login command is disabled" msgstr "" -#: lib/command.php:664 -#, fuzzy, php-format -msgid "Could not create login token for %s." -msgstr "لم يمكن إنشاء توكن الولوج Ù„%s" - -#: lib/command.php:669 +#: lib/command.php:652 #, php-format -msgid "This link is useable only once, and is good for only 2 minutes: %s." +msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:685 +#: lib/command.php:668 msgid "You are not subscribed to anyone." msgstr "لست Ù…Ùشتركًا بأى أحد." -#: lib/command.php:687 +#: lib/command.php:670 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "لست مشتركًا بأحد." @@ -4339,11 +4668,11 @@ msgstr[3] "أنت مشترك بهؤلاء الأشخاص:" msgstr[4] "" msgstr[5] "" -#: lib/command.php:707 +#: lib/command.php:690 msgid "No one is subscribed to you." msgstr "لا أحد مشترك بك." -#: lib/command.php:709 +#: lib/command.php:692 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "لا أحد مشترك بك." @@ -4353,11 +4682,11 @@ msgstr[3] "هؤلاء الأشخاص مشتركون بك:" msgstr[4] "" msgstr[5] "" -#: lib/command.php:729 +#: lib/command.php:712 msgid "You are not a member of any groups." msgstr "لست عضوًا ÙÙ‰ أى مجموعه." -#: lib/command.php:731 +#: lib/command.php:714 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "لست عضوًا ÙÙ‰ أى مجموعه." @@ -4367,7 +4696,7 @@ msgstr[3] "أنت عضو ÙÙ‰ هذه المجموعات:" msgstr[4] "" msgstr[5] "" -#: lib/command.php:745 +#: lib/command.php:728 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4408,19 +4737,19 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:199 +#: lib/common.php:131 msgid "No configuration file found. " msgstr "" -#: lib/common.php:200 +#: lib/common.php:132 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:201 +#: lib/common.php:134 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:202 +#: lib/common.php:135 msgid "Go to the installer." msgstr "اذهب إلى المÙثبّت." @@ -4436,6 +4765,14 @@ msgstr "" msgid "Updates by SMS" msgstr "" +#: lib/connectsettingsaction.php:120 +msgid "Connections" +msgstr "اتصالات" + +#: lib/connectsettingsaction.php:121 +msgid "Authorized connected applications" +msgstr "" + #: lib/dberroraction.php:60 msgid "Database error" msgstr "خطأ قاعده بيانات" @@ -4618,11 +4955,16 @@ msgstr "ميجابايت" msgid "kB" msgstr "كيلوبايت" -#: lib/jabber.php:191 +#: lib/jabber.php:202 #, php-format msgid "[%s]" msgstr "[%s]" +#: lib/jabber.php:385 +#, php-format +msgid "Unknown inbox source %d." +msgstr "مصدر صندوق وارد غير معرو٠%d." + #: lib/joinform.php:114 msgid "Join" msgstr "انضم" @@ -4680,22 +5022,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 "السيرة: %s\n" +msgid "Bio: %s" +msgstr "السيرة: %s" #: lib/mail.php:286 #, php-format @@ -4846,9 +5176,9 @@ msgid "Sorry, no incoming email allowed." msgstr "" #: lib/mailhandler.php:228 -#, fuzzy, php-format +#, php-format msgid "Unsupported message type: %s" -msgstr "نسق غير مدعوم." +msgstr "نوع رساله غير مدعوم: %s" #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." @@ -4881,7 +5211,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 @@ -4889,8 +5219,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!" -msgstr "" +msgid "Could not determine file's MIME type." +msgstr "لم يمكن تحديد نوع MIME للملÙ." #: lib/mediafile.php:270 #, php-format @@ -4899,7 +5229,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 @@ -4932,17 +5262,17 @@ msgid "Attach a file" msgstr "أرÙÙ‚ ملÙًا" #: lib/noticeform.php:212 -#, fuzzy -msgid "Share my location." -msgstr "لم يمكن Ø­Ùظ تÙضيلات الموقع." - -#: lib/noticeform.php:214 -#, fuzzy -msgid "Do not share my location." -msgstr "لم يمكن Ø­Ùظ تÙضيلات الموقع." +msgid "Share my location" +msgstr "شارك موقعى" #: lib/noticeform.php:215 -msgid "Hide this info" +msgid "Do not share my location" +msgstr "لا تشارك موقعي" + +#: lib/noticeform.php:216 +msgid "" +"Sorry, retrieving your geo location is taking longer than expected, please " +"try again later" msgstr "" #: lib/noticelist.php:428 @@ -5060,9 +5390,8 @@ msgid "Tags in %s's notices" msgstr "" #: lib/plugin.php:114 -#, fuzzy msgid "Unknown" -msgstr "إجراء غير معروÙ" +msgstr "غير معروÙ" #: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82 msgid "Subscriptions" @@ -5203,23 +5532,23 @@ msgstr "Ù…Ùشترك أصلا!" msgid "User has blocked you." msgstr "لقد منعك المستخدم." -#: lib/subs.php:60 +#: lib/subs.php:63 msgid "Could not subscribe." msgstr "تعذّر الاشتراك." -#: lib/subs.php:79 +#: lib/subs.php:82 msgid "Could not subscribe other to you." msgstr "" -#: lib/subs.php:128 +#: lib/subs.php:137 msgid "Not subscribed!" msgstr "غير مشترك!" -#: lib/subs.php:133 +#: lib/subs.php:142 msgid "Couldn't delete self-subscription." msgstr "لم يمكن حذ٠اشتراك ذاتى." -#: lib/subs.php:146 +#: lib/subs.php:158 msgid "Couldn't delete subscription." msgstr "تعذّر حذ٠الاشتراك." @@ -5233,10 +5562,6 @@ msgstr "" msgid "People Tagcloud as tagged" msgstr "" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(لا شيء)" - #: lib/tagcloudsection.php:56 msgid "None" msgstr "لا شيء" @@ -5297,47 +5622,47 @@ msgstr "رسالة" msgid "Moderate" msgstr "" -#: lib/util.php:837 +#: lib/util.php:875 msgid "a few seconds ago" msgstr "قبل لحظات قليلة" -#: lib/util.php:839 +#: lib/util.php:877 msgid "about a minute ago" msgstr "قبل دقيقه تقريبًا" -#: lib/util.php:841 +#: lib/util.php:879 #, php-format msgid "about %d minutes ago" msgstr "" -#: lib/util.php:843 +#: lib/util.php:881 msgid "about an hour ago" msgstr "قبل ساعه تقريبًا" -#: lib/util.php:845 +#: lib/util.php:883 #, php-format msgid "about %d hours ago" msgstr "" -#: lib/util.php:847 +#: lib/util.php:885 msgid "about a day ago" msgstr "قبل يوم تقريبا" -#: lib/util.php:849 +#: lib/util.php:887 #, php-format msgid "about %d days ago" msgstr "" -#: lib/util.php:851 +#: lib/util.php:889 msgid "about a month ago" msgstr "قبل شهر تقريبًا" -#: lib/util.php:853 +#: lib/util.php:891 #, php-format msgid "about %d months ago" msgstr "" -#: lib/util.php:855 +#: lib/util.php:893 msgid "about a year ago" msgstr "قبل سنه تقريبًا" @@ -5353,5 +5678,5 @@ msgstr "" #: scripts/xmppdaemon.php:301 #, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po index bfe9155761..5bca81663a 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-10 00:46+0000\n" -"PO-Revision-Date: 2010-01-10 00:47:11+0000\n" +"POT-Creation-Date: 2010-01-15 19:15+0000\n" +"PO-Revision-Date: 2010-01-15 19:16:04+0000\n" "Language-Team: Bulgarian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60878); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r61101); 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" @@ -34,25 +34,30 @@ msgstr "ÐÑма такака Ñтраница." #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 +#: actions/apistatusesupdate.php:149 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 #: 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 #: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 -#: lib/command.php:163 lib/command.php:311 lib/command.php:364 -#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/command.php:163 lib/command.php:302 lib/command.php:355 +#: lib/command.php:401 lib/command.php:462 lib/command.php:518 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/subs.php:34 lib/subs.php:125 msgid "No such user." msgstr "ÐÑма такъв потребител" +#: actions/all.php:84 +#, fuzzy, php-format +msgid "%1$s and friends, page %2$d" +msgstr "Блокирани за %s, Ñтраница %d" + #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 +#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -104,7 +109,7 @@ msgstr "" msgid "You and friends" msgstr "Вие и приÑтелите" -#: actions/allrss.php:119 actions/apitimelinefriends.php:122 +#: actions/allrss.php:119 actions/apitimelinefriends.php:121 #: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" @@ -115,6 +120,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:155 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." @@ -128,7 +150,7 @@ msgstr "Ðе е открит методът в API." #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:114 +#: actions/apistatusesupdate.php:119 msgid "This method requires a POST." msgstr "Този метод изиÑква заÑвка POST." @@ -157,8 +179,9 @@ msgstr "Грешка при запазване на профила." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257 -#: actions/designadminpanel.php:122 actions/newnotice.php:94 +#: actions/apistatusesupdate.php:132 actions/avatarsettings.php:257 +#: actions/designadminpanel.php:122 actions/editapplication.php:118 +#: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format msgid "" @@ -170,6 +193,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" @@ -212,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 "ЛипÑва текÑÑ‚ на Ñъобщението" @@ -257,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 @@ -265,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 @@ -286,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 @@ -322,7 +331,8 @@ msgstr "Опитайте друг пÑевдоним, този вече е за msgid "Not a valid nickname." msgstr "Ðеправилен пÑевдоним." -#: actions/apigroupcreate.php:196 actions/editgroup.php:195 +#: actions/apigroupcreate.php:196 actions/editapplication.php:212 +#: actions/editgroup.php:195 actions/newapplication.php:200 #: actions/newgroup.php:139 actions/profilesettings.php:222 #: actions/register.php:217 msgid "Homepage is not a valid URL." @@ -334,7 +344,8 @@ msgstr "ÐдреÑÑŠÑ‚ на личната Ñтраница не е правил msgid "Full name is too long (max 255 chars)." msgstr "Пълното име е твърде дълго (макÑ. 255 знака)" -#: actions/apigroupcreate.php:213 +#: actions/apigroupcreate.php:213 actions/editapplication.php:187 +#: actions/newapplication.php:169 #, php-format msgid "Description is too long (max %d chars)." msgstr "ОпиÑанието е твърде дълго (до %d Ñимвола)." @@ -374,7 +385,7 @@ msgstr "" msgid "Group not found!" msgstr "Групата не е открита." -#: actions/apigroupjoin.php:110 lib/command.php:217 +#: actions/apigroupjoin.php:110 actions/joingroup.php:90 msgid "You are already a member of that group." msgstr "Вече членувате в тази група." @@ -382,7 +393,7 @@ msgstr "Вече членувате в тази група." msgid "You have been blocked from that group by the admin." msgstr "" -#: actions/apigroupjoin.php:138 lib/command.php:234 +#: actions/apigroupjoin.php:138 actions/joingroup.php:124 #, fuzzy, php-format msgid "Could not join user %1$s to group %2$s." msgstr "Грешка при проÑледÑване — потребителÑÑ‚ не е намерен." @@ -391,7 +402,7 @@ msgstr "Грешка при проÑледÑване — Ð¿Ð¾Ñ‚Ñ€ÐµÐ±Ð¸Ñ‚ÐµÐ»Ñ msgid "You are not a member of this group." msgstr "Ðе членувате в тази група." -#: actions/apigroupleave.php:124 actions/leavegroup.php:127 +#: actions/apigroupleave.php:124 actions/leavegroup.php:119 #, fuzzy, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "Грешка при проÑледÑване — потребителÑÑ‚ не е намерен." @@ -411,6 +422,101 @@ msgstr "Групи на %s" msgid "groups on %s" msgstr "групи в %s" +#: actions/apioauthauthorize.php:108 actions/apioauthauthorize.php:114 +msgid "Bad request." +msgstr "" + +#: actions/apioauthauthorize.php:134 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:115 actions/makeadmin.php:66 +#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 +#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:139 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 +#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/subscribe.php:46 actions/tagother.php:166 +#: 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 "Имаше проблем ÑÑŠÑ ÑеÑиÑта ви в Ñайта. МолÑ, опитайте отново!" + +#: actions/apioauthauthorize.php:146 +#, fuzzy +msgid "Invalid nickname / password!" +msgstr "Ðеправилно име или парола." + +#: actions/apioauthauthorize.php:170 +#, fuzzy +msgid "DB error deleting OAuth app user." +msgstr "Грешка в наÑтройките на потребителÑ." + +#: actions/apioauthauthorize.php:196 +#, fuzzy +msgid "DB error inserting OAuth app user." +msgstr "Грешка в базата от данни — отговор при вмъкването: %s" + +#: actions/apioauthauthorize.php:231 +#, php-format +msgid "" +"The request token %s has been authorized. Please exchange it for an access " +"token." +msgstr "" + +#: actions/apioauthauthorize.php:241 +#, php-format +msgid "The request token %s has been denied." +msgstr "" + +#: actions/apioauthauthorize.php:246 actions/avatarsettings.php:281 +#: actions/designadminpanel.php:103 actions/editapplication.php:139 +#: actions/emailsettings.php:256 actions/grouplogo.php:319 +#: actions/imsettings.php:220 actions/newapplication.php:121 +#: actions/oauthconnectionssettings.php:151 actions/recoverpassword.php:44 +#: actions/smssettings.php:248 lib/designsettings.php:304 +msgid "Unexpected form submission." +msgstr "Ðеочаквано изпращане на форма." + +#: actions/apioauthauthorize.php:273 +msgid "An application would like to connect to your account" +msgstr "" + +#: actions/apioauthauthorize.php:290 +msgid "Allow or deny access" +msgstr "" + +#: actions/apioauthauthorize.php:320 lib/action.php:435 +msgid "Account" +msgstr "Сметка" + +#: actions/apioauthauthorize.php:323 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/apioauthauthorize.php:326 actions/login.php:233 +#: actions/register.php:429 lib/accountsettingsaction.php:116 +msgid "Password" +msgstr "Парола" + +#: actions/apioauthauthorize.php:338 +msgid "Deny" +msgstr "" + +#: actions/apioauthauthorize.php:344 +#, fuzzy +msgid "Allow" +msgstr "Ð’Ñички" + +#: actions/apioauthauthorize.php:361 +msgid "Allow or deny access to your account information." +msgstr "" + #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." msgstr "Този метод изиÑква заÑвка POST или DELETE." @@ -424,11 +530,11 @@ msgstr "Ðе може да изтривате бележки на друг по msgid "No such notice." msgstr "ÐÑма такава бележка." -#: actions/apistatusesretweet.php:83 lib/command.php:422 +#: actions/apistatusesretweet.php:83 msgid "Cannot repeat your own notice." msgstr "Ðе можете да повтарÑте ÑобÑтвени бележки." -#: actions/apistatusesretweet.php:91 lib/command.php:427 +#: actions/apistatusesretweet.php:91 msgid "Already repeated that notice." msgstr "Вече Ñте повторили тази бележка." @@ -440,17 +546,17 @@ msgstr "Бележката е изтрита." msgid "No status with that ID found." msgstr "Ðе е открита бележка Ñ Ñ‚Ð°ÐºÑŠÐ² идентификатор." -#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:162 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Твърде дълга бележка. ТрÑбва да е най-много 140 знака." -#: actions/apistatusesupdate.php:198 +#: actions/apistatusesupdate.php:203 msgid "Not found" msgstr "Ðе е открито." -#: actions/apistatusesupdate.php:221 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:226 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -535,8 +641,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 "ÐÑма пÑевдоним." @@ -560,8 +669,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 "Потребител без ÑъответÑтващ профил" @@ -593,29 +702,6 @@ 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/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 -#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 -#: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 -#: actions/subscribe.php:46 actions/tagother.php:166 -#: 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 "Имаше проблем ÑÑŠÑ ÑеÑиÑта ви в Ñайта. МолÑ, опитайте отново!" - -#: actions/avatarsettings.php:281 actions/designadminpanel.php:103 -#: actions/emailsettings.php:256 actions/grouplogo.php:319 -#: actions/imsettings.php:220 actions/recoverpassword.php:44 -#: actions/smssettings.php:248 lib/designsettings.php:304 -msgid "Unexpected form submission." -msgstr "Ðеочаквано изпращане на форма." - #: actions/avatarsettings.php:328 msgid "Pick a square area of the image to be your avatar" msgstr "Изберете квадратна облаÑÑ‚ от изображението за аватар" @@ -674,19 +760,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:260 +msgid "No such group." +msgstr "ÐÑма такава група" #: actions/blockedfromgroup.php:90 #, php-format @@ -755,7 +837,8 @@ msgid "Couldn't delete email confirmation." msgstr "Грешка при изтриване потвърждението по е-поща." #: actions/confirmaddress.php:144 -msgid "Confirm Address" +#, fuzzy +msgid "Confirm address" msgstr "Потвърждаване на адреÑа" #: actions/confirmaddress.php:159 @@ -808,11 +891,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 "Ðе можете да изтривате потребители." @@ -947,7 +1025,8 @@ msgstr "" #: actions/pathsadminpanel.php:324 actions/profilesettings.php:174 #: actions/siteadminpanel.php:388 actions/smssettings.php:181 #: actions/subscriptions.php:203 actions/tagother.php:154 -#: actions/useradminpanel.php:313 lib/designsettings.php:256 +#: actions/useradminpanel.php:313 lib/applicationeditform.php:335 +#: lib/applicationeditform.php:336 lib/designsettings.php:256 #: lib/groupeditform.php:202 msgid "Save" msgstr "Запазване" @@ -968,6 +1047,86 @@ msgstr "ДобавÑне към любимите" msgid "No such document." msgstr "ÐÑма такъв документ." +#: actions/editapplication.php:54 lib/applicationeditform.php:136 +msgid "Edit application" +msgstr "" + +#: actions/editapplication.php:66 +#, fuzzy +msgid "You must be logged in to edit an application." +msgstr "За да редактирате група, Ñ‚Ñ€Ñбва да Ñте влезли." + +#: actions/editapplication.php:77 actions/showapplication.php:94 +#, fuzzy +msgid "You are not the owner of this application." +msgstr "Ðе членувате в тази група." + +#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:163 +#: actions/showapplication.php:87 +#, fuzzy +msgid "No such application." +msgstr "ÐÑма такава бележка." + +#: actions/editapplication.php:127 actions/newapplication.php:110 +#: actions/showapplication.php:118 lib/action.php:1167 +msgid "There was a problem with your session token." +msgstr "Имаше проблем ÑÑŠÑ ÑеÑиÑта ви в Ñайта." + +#: actions/editapplication.php:161 +#, fuzzy +msgid "Use this form to edit your application." +msgstr "Използвайте тази бланка за Ñъздаване на нова група." + +#: actions/editapplication.php:177 actions/newapplication.php:159 +#, fuzzy +msgid "Name is required." +msgstr "Същото като паролата по-горе. Задължително поле." + +#: actions/editapplication.php:180 actions/newapplication.php:162 +#, fuzzy +msgid "Name is too long (max 255 chars)." +msgstr "Пълното име е твърде дълго (макÑ. 255 знака)" + +#: actions/editapplication.php:183 actions/newapplication.php:165 +#, fuzzy +msgid "Description is required." +msgstr "ОпиÑание" + +#: actions/editapplication.php:191 +msgid "Source URL is too long." +msgstr "" + +#: actions/editapplication.php:197 actions/newapplication.php:182 +#, fuzzy +msgid "Source URL is not valid." +msgstr "ÐдреÑÑŠÑ‚ на личната Ñтраница не е правилен URL." + +#: actions/editapplication.php:200 actions/newapplication.php:185 +msgid "Organization is required." +msgstr "" + +#: actions/editapplication.php:203 actions/newapplication.php:188 +#, fuzzy +msgid "Organization is too long (max 255 chars)." +msgstr "Името на меÑтоположението е твърде дълго (макÑ. 255 знака)." + +#: actions/editapplication.php:206 actions/newapplication.php:191 +msgid "Organization homepage is required." +msgstr "" + +#: actions/editapplication.php:215 actions/newapplication.php:203 +msgid "Callback is too long." +msgstr "" + +#: actions/editapplication.php:222 actions/newapplication.php:212 +msgid "Callback URL is not valid." +msgstr "" + +#: actions/editapplication.php:255 +#, fuzzy +msgid "Could not update application." +msgstr "Грешка при обновÑване на групата." + #: actions/editgroup.php:56 #, php-format msgid "Edit %s group" @@ -979,7 +1138,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 @@ -1005,7 +1165,8 @@ msgid "Options saved." msgstr "ÐаÑтройките Ñа запазени." #: actions/emailsettings.php:60 -msgid "Email Settings" +#, fuzzy +msgid "Email settings" msgstr "ÐаÑтройки на е-поща" #: actions/emailsettings.php:71 @@ -1037,13 +1198,15 @@ msgstr "" "Ñпам) за Ñъобщение Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð¸Ñ." #: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 +#: actions/smssettings.php:126 lib/applicationeditform.php:333 +#: lib/applicationeditform.php:334 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\"" @@ -1117,9 +1280,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." @@ -1302,13 +1466,6 @@ 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:79 msgid "No such file." msgstr "ÐÑма такъв файл." @@ -1325,7 +1482,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 "Ðе е открит профил Ñ Ñ‚Ð°ÐºÑŠÐ² идентификатор." @@ -1373,9 +1530,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." @@ -1398,13 +1555,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." @@ -1420,6 +1570,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." @@ -1544,7 +1699,8 @@ msgid "Error removing the block." msgstr "Грешка при запазване на потребител." #: actions/imsettings.php:59 -msgid "IM Settings" +#, fuzzy +msgid "IM settings" msgstr "IM наÑтройки" #: actions/imsettings.php:70 @@ -1575,7 +1731,8 @@ msgstr "" "Ñъобщение Ñ Ð¸Ð½Ñтрукции. (Добавихте ли %s в ÑпиÑъка Ñи там?)" #: actions/imsettings.php:124 -msgid "IM Address" +#, fuzzy +msgid "IM address" msgstr "IM адреÑ" #: actions/imsettings.php:126 @@ -1671,7 +1828,7 @@ msgstr "Покани за нови потребители" msgid "You are already subscribed to these users:" msgstr "Вече Ñте абонирани за Ñледните потребители:" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:315 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -1716,7 +1873,7 @@ msgstr "Лично Ñъобщение" msgid "Optionally add a personal message to the invitation." msgstr "Може да добавите и лично Ñъобщение към поканата." -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236 msgid "Send" msgstr "Прати" @@ -1786,16 +1943,7 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "За да Ñе приÑъедините към група, Ñ‚Ñ€Ñбва да Ñте влезли." -#: actions/joingroup.php:90 -msgid "You are already a member of that group" -msgstr "Вече членувате в тази група." - -#: actions/joingroup.php:128 -#, fuzzy, php-format -msgid "Could not join user %1$s to group %2$s" -msgstr "Грешка при проÑледÑване — потребителÑÑ‚ не е намерен." - -#: actions/joingroup.php:135 lib/command.php:239 +#: actions/joingroup.php:131 #, fuzzy, php-format msgid "%1$s joined group %2$s" msgstr "%s Ñе приÑъедини към групата %s" @@ -1804,71 +1952,50 @@ msgstr "%s Ñе приÑъедини към групата %s" msgid "You must be logged in to leave a group." msgstr "За напуÑнете група, Ñ‚Ñ€Ñбва да Ñте влезли." -#: actions/leavegroup.php:90 lib/command.php:268 +#: actions/leavegroup.php:90 lib/command.php:265 msgid "You are not a member of that group." msgstr "Ðе членувате в тази група." -#: actions/leavegroup.php:119 lib/command.php:278 -#, fuzzy -msgid "Could not find membership record." -msgstr "Грешка при обновÑване запиÑа на потребител." - -#: actions/leavegroup.php:134 lib/command.php:289 +#: actions/leavegroup.php:127 #, 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:460 +#: 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 -#: lib/groupeditform.php:152 lib/userprofile.php:131 -msgid "Nickname" -msgstr "ПÑевдоним" - -#: actions/login.php:253 actions/register.php:428 -#: 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." @@ -1876,7 +2003,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]" @@ -1895,19 +2022,42 @@ 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 %1$s in group %2$s" -msgstr "" +#, fuzzy, php-format +msgid "Can't get membership record for %1$s in group %2$s." +msgstr "Грешка при проÑледÑване — потребителÑÑ‚ не е намерен." #: actions/makeadmin.php:145 #, fuzzy, php-format -msgid "Can't make %1$s an admin for group %2$s" +msgid "Can't make %1$s an admin for group %2$s." msgstr "За да редактирате групата, Ñ‚Ñ€Ñбва да Ñте й админиÑтратор." #: actions/microsummary.php:69 msgid "No current status" msgstr "" +#: actions/newapplication.php:52 +msgid "New application" +msgstr "" + +#: actions/newapplication.php:64 +#, fuzzy +msgid "You must be logged in to register an application." +msgstr "За да Ñъздавате група, Ñ‚Ñ€Ñбва да Ñте влезли." + +#: actions/newapplication.php:143 +#, fuzzy +msgid "Use this form to register a new application." +msgstr "Използвайте тази бланка за Ñъздаване на нова група." + +#: actions/newapplication.php:173 +msgid "Source URL is required." +msgstr "" + +#: actions/newapplication.php:255 actions/newapplication.php:264 +#, fuzzy +msgid "Could not create application." +msgstr "Грешка при отбелÑзване като любима." + #: actions/newgroup.php:53 msgid "New group" msgstr "Ðова група" @@ -1920,12 +2070,12 @@ msgstr "Използвайте тази бланка за Ñъздаване н msgid "New message" msgstr "Ðово Ñъобщение" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 msgid "You can't send a message to this user." msgstr "Ðе може да изпращате ÑÑŠÐ¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð´Ð¾ този потребител." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:484 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 +#: lib/command.php:475 msgid "No content!" msgstr "ÐÑма Ñъдържание!" @@ -1933,7 +2083,7 @@ msgstr "ÐÑма Ñъдържание!" msgid "No recipient specified." msgstr "Ðе е указан получател." -#: actions/newmessage.php:164 lib/command.php:370 +#: actions/newmessage.php:164 lib/command.php:361 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -1945,8 +2095,8 @@ msgid "Message sent" msgstr "Съобщението е изпратено" #: actions/newmessage.php:185 -#, php-format -msgid "Direct message to %s sent" +#, fuzzy, php-format +msgid "Direct message to %s sent." msgstr "ПрÑкото Ñъобщение до %s е изпратено." #: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 @@ -2016,6 +2166,51 @@ msgstr "Побутването е изпратено" msgid "Nudge sent!" msgstr "Побутването е изпратено!" +#: actions/oauthappssettings.php:59 +#, fuzzy +msgid "You must be logged in to list your applications." +msgstr "За да редактирате група, Ñ‚Ñ€Ñбва да Ñте влезли." + +#: actions/oauthappssettings.php:74 +#, fuzzy +msgid "OAuth applications" +msgstr "Други наÑтройки" + +#: actions/oauthappssettings.php:85 +msgid "Applications you have registered" +msgstr "" + +#: actions/oauthappssettings.php:135 +#, php-format +msgid "You have not registered any applications yet." +msgstr "" + +#: actions/oauthconnectionssettings.php:71 +msgid "Connected applications" +msgstr "" + +#: actions/oauthconnectionssettings.php:87 +msgid "You have allowed the following applications to access you account." +msgstr "" + +#: actions/oauthconnectionssettings.php:170 +#, fuzzy +msgid "You are not a user of that application." +msgstr "Ðе членувате в тази група." + +#: actions/oauthconnectionssettings.php:180 +msgid "Unable to revoke access for app: " +msgstr "" + +#: actions/oauthconnectionssettings.php:192 +#, php-format +msgid "You have not authorized any applications to use your account." +msgstr "" + +#: actions/oauthconnectionssettings.php:205 +msgid "Developers can edit the registration settings for their applications " +msgstr "" + #: actions/oembed.php:79 actions/shownotice.php:100 msgid "Notice has no profile" msgstr "Бележката нÑма профил" @@ -2033,8 +2228,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:1038 +#: lib/api.php:1066 lib/api.php:1176 msgid "Not a supported data format." msgstr "Ðеподдържан формат на данните" @@ -2047,7 +2242,8 @@ msgid "Notice Search" msgstr "ТърÑене на бележки" #: actions/othersettings.php:60 -msgid "Other Settings" +#, fuzzy +msgid "Other settings" msgstr "Други наÑтройки" #: actions/othersettings.php:71 @@ -2079,6 +2275,31 @@ msgstr "" msgid "URL shortening service is too long (max 50 chars)." msgstr "УÑлугата за Ñъкращаване е твърде дълга (може да е до 50 знака)." +#: 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 msgid "Outbox for %s" @@ -2114,7 +2335,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 "Потвърждаване" @@ -2276,7 +2497,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 @@ -2336,42 +2558,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 -#: lib/groupeditform.php:161 +#: actions/profilesettings.php:115 actions/register.php:453 +#: lib/applicationeditform.php:230 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 "Къде Ñе намирате (град, община, държава и Ñ‚.н.)" @@ -2668,7 +2890,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 "" @@ -2681,7 +2903,7 @@ msgstr "Грешка в кода за потвърждение." msgid "Registration successful" msgstr "ЗапиÑването е уÑпешно." -#: actions/register.php:114 actions/register.php:502 lib/action.php:457 +#: actions/register.php:114 actions/register.php:503 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "РегиÑтриране" @@ -2694,67 +2916,63 @@ 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 +#: actions/register.php:538 #, fuzzy, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -2787,7 +3005,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.)" @@ -2935,6 +3153,85 @@ msgstr "Ðе може да изпращате ÑÑŠÐ¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð´Ð¾ този msgid "User is already sandboxed." msgstr "ПотребителÑÑ‚ ви е блокирал." +#: actions/showapplication.php:82 +#, fuzzy +msgid "You must be logged in to view an application." +msgstr "За напуÑнете група, Ñ‚Ñ€Ñбва да Ñте влезли." + +#: actions/showapplication.php:158 +#, fuzzy +msgid "Application profile" +msgstr "Бележката нÑма профил" + +#: actions/showapplication.php:160 lib/applicationeditform.php:182 +msgid "Icon" +msgstr "" + +#: actions/showapplication.php:170 actions/version.php:195 +#: lib/applicationeditform.php:197 +#, fuzzy +msgid "Name" +msgstr "ПÑевдоним" + +#: actions/showapplication.php:179 lib/applicationeditform.php:224 +#, fuzzy +msgid "Organization" +msgstr "Страниране" + +#: actions/showapplication.php:188 actions/version.php:198 +#: lib/applicationeditform.php:211 lib/groupeditform.php:172 +msgid "Description" +msgstr "ОпиÑание" + +#: actions/showapplication.php:193 actions/showgroup.php:429 +#: lib/profileaction.php:174 +msgid "Statistics" +msgstr "СтатиÑтики" + +#: actions/showapplication.php:204 +#, php-format +msgid "created by %1$s - %2$s access by default - %3$d users" +msgstr "" + +#: actions/showapplication.php:214 +msgid "Application actions" +msgstr "" + +#: actions/showapplication.php:233 +msgid "Reset key & secret" +msgstr "" + +#: actions/showapplication.php:241 +msgid "Application info" +msgstr "" + +#: actions/showapplication.php:243 +msgid "Consumer key" +msgstr "" + +#: actions/showapplication.php:248 +msgid "Consumer secret" +msgstr "" + +#: actions/showapplication.php:253 +msgid "Request token URL" +msgstr "" + +#: actions/showapplication.php:258 +msgid "Access token URL" +msgstr "" + +#: actions/showapplication.php:263 +#, fuzzy +msgid "Authorize URL" +msgstr "Ðвтор" + +#: actions/showapplication.php:268 +msgid "" +"Note: We support HMAC-SHA1 signatures. We do not support the plaintext " +"signature method." +msgstr "" + #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "Грешка при изтеглÑне на любимите бележки" @@ -3032,7 +3329,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 "" @@ -3040,10 +3337,6 @@ msgstr "" msgid "All members" msgstr "Ð’Ñички членове" -#: actions/showgroup.php:429 lib/profileaction.php:174 -msgid "Statistics" -msgstr "СтатиÑтики" - #: actions/showgroup.php:432 msgid "Created" msgstr "Създадена на" @@ -3180,12 +3473,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 @@ -3366,7 +3660,8 @@ msgid "Save site settings" msgstr "Запазване наÑтройките на Ñайта" #: actions/smssettings.php:58 -msgid "SMS Settings" +#, fuzzy +msgid "SMS settings" msgstr "ÐаÑтройки за SMS" #: actions/smssettings.php:69 @@ -3396,7 +3691,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 @@ -3646,11 +3942,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" @@ -3856,10 +4147,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" @@ -3938,11 +4225,6 @@ msgstr "" msgid "Plugins" msgstr "" -#: actions/version.php:195 -#, fuzzy -msgid "Name" -msgstr "ПÑевдоним" - #: actions/version.php:196 lib/action.php:741 #, fuzzy msgid "Version" @@ -3953,27 +4235,43 @@ msgstr "СеÑии" msgid "Author(s)" msgstr "Ðвтор" -#: actions/version.php:198 lib/groupeditform.php:172 -msgid "Description" -msgstr "ОпиÑание" - -#: classes/File.php:137 +#: 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/Group_member.php:41 +#, fuzzy +msgid "Group join failed." +msgstr "Профил на групата" + +#: classes/Group_member.php:53 +#, fuzzy +msgid "Not part of group." +msgstr "Грешка при обновÑване на групата." + +#: classes/Group_member.php:60 +#, fuzzy +msgid "Group leave failed." +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." @@ -3987,28 +4285,28 @@ msgstr "Грешка при вмъкване на Ñъобщението." msgid "Could not update message with new URI." msgstr "Грешка при обновÑване на бележката Ñ Ð½Ð¾Ð² URL-адреÑ." -#: classes/Notice.php:172 +#: classes/Notice.php:171 #, php-format msgid "DB error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:226 +#: classes/Notice.php:225 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Проблем при запиÑване на бележката." -#: classes/Notice.php:230 +#: classes/Notice.php:229 msgid "Problem saving notice. Unknown user." msgstr "Грешка при запиÑване на бележката. Ðепознат потребител." -#: classes/Notice.php:235 +#: classes/Notice.php:234 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Твърде много бележки за кратко време. Спрете, поемете дъх и публикувайте " "отново Ñлед нÑколко минути." -#: classes/Notice.php:241 +#: classes/Notice.php:240 #, fuzzy msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " @@ -4017,25 +4315,25 @@ msgstr "" "Твърде много бележки за кратко време. Спрете, поемете дъх и публикувайте " "отново Ñлед нÑколко минути." -#: classes/Notice.php:247 +#: classes/Notice.php:246 msgid "You are banned from posting notices on this site." msgstr "Забранено ви е да публикувате бележки в този Ñайт." -#: classes/Notice.php:309 classes/Notice.php:334 +#: classes/Notice.php:305 classes/Notice.php:330 msgid "Problem saving notice." msgstr "Проблем при запиÑване на бележката." -#: classes/Notice.php:1034 +#: classes/Notice.php:1052 #, php-format msgid "DB error inserting reply: %s" msgstr "Грешка в базата от данни — отговор при вмъкването: %s" -#: classes/Notice.php:1359 +#: classes/Notice.php:1423 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" -#: classes/User.php:368 +#: classes/User.php:382 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Добре дошли в %1$s, @%2$s!" @@ -4078,6 +4376,11 @@ msgstr "Друго" msgid "Other options" msgstr "Други наÑтройки" +#: lib/action.php:144 +#, fuzzy, php-format +msgid "%1$s - %2$s" +msgstr "%1$s (%2$s)" + #: lib/action.php:159 msgid "Untitled page" msgstr "Ðеозаглавена Ñтраница" @@ -4094,10 +4397,6 @@ msgstr "Ðачало" msgid "Personal profile and friends timeline" msgstr "" -#: lib/action.php:435 -msgid "Account" -msgstr "Сметка" - #: lib/action.php:435 msgid "Change your email, avatar, password, profile" msgstr "ПромÑна на поща, аватар, парола, профил" @@ -4256,10 +4555,6 @@ msgstr "След" msgid "Before" msgstr "Преди" -#: lib/action.php:1167 -msgid "There was a problem with your session token." -msgstr "Имаше проблем ÑÑŠÑ ÑеÑиÑта ви в Ñайта." - #: lib/adminpanelaction.php:96 msgid "You cannot make changes to this site." msgstr "Ðе можете да променÑте този Ñайт." @@ -4296,6 +4591,72 @@ msgstr "ÐаÑтройка на оформлението" msgid "Paths configuration" msgstr "ÐаÑтройка на пътищата" +#: lib/applicationeditform.php:186 +msgid "Icon for this application" +msgstr "" + +#: lib/applicationeditform.php:206 +#, fuzzy, php-format +msgid "Describe your application in %d characters" +msgstr "Опишете групата или темата в до %d букви" + +#: lib/applicationeditform.php:209 +#, fuzzy +msgid "Describe your application" +msgstr "Опишете групата или темата" + +#: lib/applicationeditform.php:218 +#, fuzzy +msgid "Source URL" +msgstr "Изходен код" + +#: lib/applicationeditform.php:220 +#, fuzzy +msgid "URL of the homepage of this application" +msgstr "ÐÐ´Ñ€ÐµÑ Ð½Ð° Ñтраница, блог или профил в друг Ñайт на групата" + +#: lib/applicationeditform.php:226 +msgid "Organization responsible for this application" +msgstr "" + +#: lib/applicationeditform.php:232 +#, fuzzy +msgid "URL for the homepage of the organization" +msgstr "ÐÐ´Ñ€ÐµÑ Ð½Ð° Ñтраница, блог или профил в друг Ñайт на групата" + +#: lib/applicationeditform.php:238 +msgid "URL to redirect to after authentication" +msgstr "" + +#: lib/applicationeditform.php:260 +msgid "Browser" +msgstr "" + +#: lib/applicationeditform.php:276 +msgid "Desktop" +msgstr "" + +#: lib/applicationeditform.php:277 +msgid "Type of application, browser or desktop" +msgstr "" + +#: lib/applicationeditform.php:299 +msgid "Read-only" +msgstr "" + +#: lib/applicationeditform.php:317 +msgid "Read-write" +msgstr "" + +#: lib/applicationeditform.php:318 +msgid "Default access for this application: read-only, or read-write" +msgstr "" + +#: lib/applicationlist.php:154 +#, fuzzy +msgid "Revoke" +msgstr "Премахване" + #: lib/attachmentlist.php:87 msgid "Attachments" msgstr "" @@ -4316,12 +4677,12 @@ msgstr "" msgid "Tags for this attachment" msgstr "" -#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 +#: lib/authenticationplugin.php:214 lib/authenticationplugin.php:219 #, fuzzy msgid "Password changing failed" msgstr "Паролата е запиÑана." -#: lib/authenticationplugin.php:197 +#: lib/authenticationplugin.php:229 #, fuzzy msgid "Password changing is not allowed" msgstr "Паролата е запиÑана." @@ -4344,7 +4705,7 @@ msgstr "За Ñъжаление тази команда вÑе още не Ñе #: lib/command.php:88 #, fuzzy, php-format -msgid "Could not find a user with nickname %s." +msgid "Could not find a user with nickname %s" msgstr "Грешка при обновÑване на потребител Ñ Ð¿Ð¾Ñ‚Ð²ÑŠÑ€Ð´ÐµÐ½ email адреÑ." #: lib/command.php:92 @@ -4352,8 +4713,8 @@ msgid "It does not make a lot of sense to nudge yourself!" msgstr "" #: lib/command.php:99 -#, fuzzy, php-format -msgid "Nudge sent to %s." +#, php-format +msgid "Nudge sent to %s" msgstr "Изпратено е побутване на %s" #: lib/command.php:126 @@ -4367,170 +4728,189 @@ msgstr "" "Ðбонати: %2$s\n" "Бележки: %3$s" -#: lib/command.php:152 lib/command.php:399 lib/command.php:460 +#: lib/command.php:152 lib/command.php:390 lib/command.php:451 #, fuzzy -msgid "Notice with that id does not exist." +msgid "Notice with that id does not exist" msgstr "Ðе е открита бележка Ñ Ñ‚Ð°ÐºÑŠÐ² идентификатор." -#: lib/command.php:168 lib/command.php:415 lib/command.php:476 -#: lib/command.php:532 -#, fuzzy -msgid "User has no last notice." +#: lib/command.php:168 lib/command.php:406 lib/command.php:467 +#: lib/command.php:523 +msgid "User has no last notice" msgstr "ПотребителÑÑ‚ нÑма поÑледна бележка" #: lib/command.php:190 msgid "Notice marked as fave." msgstr "Бележката е отбелÑзана като любима." -#: lib/command.php:284 +#: lib/command.php:217 +msgid "You are already a member of that group" +msgstr "Вече членувате в тази група." + +#: lib/command.php:231 #, fuzzy, php-format -msgid "Could not remove user %1$s to group %2$s." +msgid "Could not join user %s to group %s" msgstr "Грешка при проÑледÑване — потребителÑÑ‚ не е намерен." -#: lib/command.php:318 +#: lib/command.php:236 +#, php-format +msgid "%s joined group %s" +msgstr "%s Ñе приÑъедини към групата %s" + +#: lib/command.php:275 +#, fuzzy, php-format +msgid "Could not remove user %s to group %s" +msgstr "Грешка при проÑледÑване — потребителÑÑ‚ не е намерен." + +#: lib/command.php:280 +#, php-format +msgid "%s left group %s" +msgstr "%s напуÑна групата %s" + +#: lib/command.php:309 #, php-format msgid "Fullname: %s" msgstr "Пълно име: %s" -#: lib/command.php:321 +#: lib/command.php:312 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "МеÑтоположение: %s" -#: lib/command.php:324 +#: lib/command.php:315 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "Домашна Ñтраница: %s" -#: lib/command.php:327 +#: lib/command.php:318 #, php-format msgid "About: %s" msgstr "ОтноÑно: %s" -#: lib/command.php:358 +#: lib/command.php:349 #, fuzzy, php-format -msgid "Message too long - maximum is %1$d characters, you sent %2$d." +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." +#: lib/command.php:367 +#, php-format +msgid "Direct message to %s sent" msgstr "ПрÑкото Ñъобщение до %s е изпратено." -#: lib/command.php:378 +#: lib/command.php:369 msgid "Error sending direct message." msgstr "Грешка при изпращане на прÑкото Ñъобщение" -#: lib/command.php:435 -#, fuzzy, php-format -msgid "Notice from %s repeated." +#: lib/command.php:413 +msgid "Cannot repeat your own notice" +msgstr "Ðе можете да повтарÑте ÑобÑтвена бележка" + +#: lib/command.php:418 +msgid "Already repeated that notice" +msgstr "Вече Ñте повторили тази бележка." + +#: lib/command.php:426 +#, php-format +msgid "Notice from %s repeated" msgstr "Бележката от %s е повторена" -#: lib/command.php:437 +#: lib/command.php:428 msgid "Error repeating notice." msgstr "Грешка при повтарÑне на бележката." -#: lib/command.php:491 +#: lib/command.php:482 #, fuzzy, php-format -msgid "Notice too long - maximum is %1$d characters, you sent %2$d." +msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" "Съобщението е твърде дълго. Ðай-много може да е 140 знака, а Ñте въвели %d." -#: lib/command.php:500 -#, fuzzy, php-format -msgid "Reply to %s sent." +#: lib/command.php:491 +#, php-format +msgid "Reply to %s sent" msgstr "Отговорът до %s е изпратен" -#: lib/command.php:502 +#: lib/command.php:493 msgid "Error saving notice." msgstr "Грешка при запиÑване на бележката." -#: lib/command.php:556 -#, fuzzy -msgid "Specify the name of the user to subscribe to." +#: lib/command.php:547 +msgid "Specify the name of the user to subscribe to" msgstr "Уточнете името на потребителÑ, за когото Ñе абонирате." -#: lib/command.php:563 +#: lib/command.php:554 #, php-format msgid "Subscribed to %s" msgstr "Ðбонирани Ñте за %s." -#: lib/command.php:584 -#, fuzzy -msgid "Specify the name of the user to unsubscribe from." +#: lib/command.php:575 +msgid "Specify the name of the user to unsubscribe from" msgstr "Уточнете името на потребителÑ, от когото Ñе отпиÑвате." -#: lib/command.php:591 +#: lib/command.php:582 #, php-format msgid "Unsubscribed from %s" msgstr "ОтпиÑани Ñте от %s." -#: lib/command.php:609 lib/command.php:632 +#: lib/command.php:600 lib/command.php:623 msgid "Command not yet implemented." msgstr "Командата вÑе още не Ñе поддържа." -#: lib/command.php:612 +#: lib/command.php:603 msgid "Notification off." msgstr "Уведомлението е изключено." -#: lib/command.php:614 +#: lib/command.php:605 msgid "Can't turn off notification." msgstr "Грешка при изключване на уведомлението." -#: lib/command.php:635 +#: lib/command.php:626 msgid "Notification on." msgstr "Уведомлението е включено." -#: lib/command.php:637 +#: lib/command.php:628 msgid "Can't turn on notification." msgstr "Грешка при включване на уведомлението." -#: lib/command.php:650 -msgid "Login command is disabled." +#: lib/command.php:641 +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:652 #, php-format -msgid "This link is useable only once, and is good for only 2 minutes: %s." +msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:685 +#: lib/command.php:668 msgid "You are not subscribed to anyone." msgstr "Ðе Ñте абонирани за никого." -#: lib/command.php:687 +#: lib/command.php:670 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:690 msgid "No one is subscribed to you." msgstr "Ðикой не е абониран за ваÑ." -#: lib/command.php:709 +#: lib/command.php:692 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:712 msgid "You are not a member of any groups." msgstr "Ðе членувате в нито една група." -#: lib/command.php:731 +#: lib/command.php:714 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:728 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4571,19 +4951,19 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:199 +#: lib/common.php:131 msgid "No configuration file found. " msgstr "Ðе е открит файл Ñ Ð½Ð°Ñтройки. " -#: lib/common.php:200 +#: lib/common.php:132 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:201 +#: lib/common.php:134 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:202 +#: lib/common.php:135 #, fuzzy msgid "Go to the installer." msgstr "Влизане в Ñайта" @@ -4600,6 +4980,15 @@ msgstr "Бележки през меÑинджър (IM)" msgid "Updates by SMS" msgstr "Бележки през SMS" +#: lib/connectsettingsaction.php:120 +#, fuzzy +msgid "Connections" +msgstr "Свързване" + +#: lib/connectsettingsaction.php:121 +msgid "Authorized connected applications" +msgstr "" + #: lib/dberroraction.php:60 msgid "Database error" msgstr "Грешка в базата от данни" @@ -4787,11 +5176,16 @@ msgstr "MB" msgid "kB" msgstr "kB" -#: lib/jabber.php:191 +#: lib/jabber.php:202 #, php-format msgid "[%s]" msgstr "" +#: lib/jabber.php:385 +#, fuzzy, php-format +msgid "Unknown inbox source %d." +msgstr "Ðепознат език \"%s\"" + #: lib/joinform.php:114 msgid "Join" msgstr "ПриÑъединÑване" @@ -4859,21 +5253,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" @@ -5062,7 +5444,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 @@ -5070,7 +5452,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 @@ -5080,7 +5463,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 @@ -5114,16 +5497,18 @@ msgstr "ПрикрепÑне на файл" #: lib/noticeform.php:212 #, fuzzy -msgid "Share my location." -msgstr "Грешка при запазване етикетите." - -#: lib/noticeform.php:214 -#, fuzzy -msgid "Do not share my location." +msgid "Share my location" msgstr "Грешка при запазване етикетите." #: lib/noticeform.php:215 -msgid "Hide this info" +#, fuzzy +msgid "Do not share my location" +msgstr "Грешка при запазване етикетите." + +#: lib/noticeform.php:216 +msgid "" +"Sorry, retrieving your geo location is taking longer than expected, please " +"try again later" msgstr "" #: lib/noticelist.php:428 @@ -5392,25 +5777,25 @@ msgstr "" msgid "User has blocked you." msgstr "ПотребителÑÑ‚ ви е блокирал." -#: lib/subs.php:60 +#: lib/subs.php:63 msgid "Could not subscribe." msgstr "Грешка при абониране." -#: lib/subs.php:79 +#: lib/subs.php:82 msgid "Could not subscribe other to you." msgstr "Грешка при абониране на друг потребител за ваÑ." -#: lib/subs.php:128 +#: lib/subs.php:137 #, fuzzy msgid "Not subscribed!" msgstr "Ðе Ñте абонирани!" -#: lib/subs.php:133 +#: lib/subs.php:142 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "Грешка при изтриване на абонамента." -#: lib/subs.php:146 +#: lib/subs.php:158 msgid "Couldn't delete subscription." msgstr "Грешка при изтриване на абонамента." @@ -5424,10 +5809,6 @@ msgstr "" msgid "People Tagcloud as tagged" msgstr "" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(нÑма)" - #: lib/tagcloudsection.php:56 msgid "None" msgstr "Без" @@ -5490,47 +5871,47 @@ msgstr "Съобщение" msgid "Moderate" msgstr "" -#: lib/util.php:837 +#: lib/util.php:875 msgid "a few seconds ago" msgstr "преди нÑколко Ñекунди" -#: lib/util.php:839 +#: lib/util.php:877 msgid "about a minute ago" msgstr "преди около минута" -#: lib/util.php:841 +#: lib/util.php:879 #, php-format msgid "about %d minutes ago" msgstr "преди около %d минути" -#: lib/util.php:843 +#: lib/util.php:881 msgid "about an hour ago" msgstr "преди около чаÑ" -#: lib/util.php:845 +#: lib/util.php:883 #, php-format msgid "about %d hours ago" msgstr "преди около %d чаÑа" -#: lib/util.php:847 +#: lib/util.php:885 msgid "about a day ago" msgstr "преди около ден" -#: lib/util.php:849 +#: lib/util.php:887 #, php-format msgid "about %d days ago" msgstr "преди около %d дни" -#: lib/util.php:851 +#: lib/util.php:889 msgid "about a month ago" msgstr "преди около меÑец" -#: lib/util.php:853 +#: lib/util.php:891 #, php-format msgid "about %d months ago" msgstr "преди около %d меÑеца" -#: lib/util.php:855 +#: lib/util.php:893 msgid "about a year ago" msgstr "преди около година" @@ -5546,6 +5927,6 @@ msgstr "%s не е допуÑтим цвÑÑ‚! Използвайте 3 или 6 #: scripts/xmppdaemon.php:301 #, fuzzy, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" "Съобщението е твърде дълго. Ðай-много може да е 140 знака, а Ñте въвели %d." diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po index 2970ba1093..ce09f82d37 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-10 00:46+0000\n" -"PO-Revision-Date: 2010-01-10 00:47:15+0000\n" +"POT-Creation-Date: 2010-01-15 19:15+0000\n" +"PO-Revision-Date: 2010-01-15 19:16:11+0000\n" "Language-Team: Catalan\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60878); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r61101); 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" @@ -34,25 +34,30 @@ msgstr "No existeix la pàgina." #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 +#: actions/apistatusesupdate.php:149 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 #: 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 #: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 -#: lib/command.php:163 lib/command.php:311 lib/command.php:364 -#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/command.php:163 lib/command.php:302 lib/command.php:355 +#: lib/command.php:401 lib/command.php:462 lib/command.php:518 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/subs.php:34 lib/subs.php:125 msgid "No such user." msgstr "No existeix aquest usuari." +#: actions/all.php:84 +#, fuzzy, php-format +msgid "%1$s and friends, page %2$d" +msgstr "%s perfils blocats, pàgina %d" + #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 +#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -106,7 +111,7 @@ msgstr "" msgid "You and friends" msgstr "Un mateix i amics" -#: actions/allrss.php:119 actions/apitimelinefriends.php:122 +#: actions/allrss.php:119 actions/apitimelinefriends.php:121 #: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" @@ -117,6 +122,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:155 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!" @@ -131,7 +153,7 @@ msgstr "No s'ha trobat el mètode API!" #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:114 +#: actions/apistatusesupdate.php:119 msgid "This method requires a POST." msgstr "Aquest mètode requereix POST." @@ -162,8 +184,9 @@ msgstr "No s'ha pogut guardar el perfil." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257 -#: actions/designadminpanel.php:122 actions/newnotice.php:94 +#: actions/apistatusesupdate.php:132 actions/avatarsettings.php:257 +#: actions/designadminpanel.php:122 actions/editapplication.php:118 +#: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format msgid "" @@ -175,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 #, fuzzy msgid "Unable to save your design settings." msgstr "No s'ha pogut guardar la teva configuració de Twitter!" @@ -218,26 +244,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!" @@ -263,7 +269,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 @@ -271,7 +278,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 @@ -294,8 +302,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." @@ -330,7 +339,8 @@ msgstr "Aquest sobrenom ja existeix. Prova un altre. " msgid "Not a valid nickname." msgstr "Sobrenom no vàlid." -#: actions/apigroupcreate.php:196 actions/editgroup.php:195 +#: actions/apigroupcreate.php:196 actions/editapplication.php:212 +#: actions/editgroup.php:195 actions/newapplication.php:200 #: actions/newgroup.php:139 actions/profilesettings.php:222 #: actions/register.php:217 msgid "Homepage is not a valid URL." @@ -342,7 +352,8 @@ msgstr "La pàgina personal no és un URL vàlid." msgid "Full name is too long (max 255 chars)." msgstr "El teu nom és massa llarg (màx. 255 caràcters)." -#: actions/apigroupcreate.php:213 +#: actions/apigroupcreate.php:213 actions/editapplication.php:187 +#: actions/newapplication.php:169 #, php-format msgid "Description is too long (max %d chars)." msgstr "La descripció és massa llarga (màx. %d caràcters)." @@ -382,15 +393,15 @@ msgstr "L'àlies no pot ser el mateix que el sobrenom." msgid "Group not found!" msgstr "No s'ha trobat el grup!" -#: actions/apigroupjoin.php:110 lib/command.php:217 +#: actions/apigroupjoin.php:110 actions/joingroup.php:90 msgid "You are already a member of that group." msgstr "Ja sou membre del grup." #: 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 "L'administrador us ha blocat del grup." -#: actions/apigroupjoin.php:138 lib/command.php:234 +#: actions/apigroupjoin.php:138 actions/joingroup.php:124 #, 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." @@ -399,7 +410,7 @@ msgstr "No s'ha pogut afegir l'usuari %s al grup %s." msgid "You are not a member of this group." msgstr "No sou un membre del grup." -#: actions/apigroupleave.php:124 actions/leavegroup.php:127 +#: actions/apigroupleave.php:124 actions/leavegroup.php:119 #, 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." @@ -419,6 +430,104 @@ msgstr "%s grups" msgid "groups on %s" msgstr "grups sobre %s" +#: actions/apioauthauthorize.php:108 actions/apioauthauthorize.php:114 +msgid "Bad request." +msgstr "" + +#: actions/apioauthauthorize.php:134 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:115 actions/makeadmin.php:66 +#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 +#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:139 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 +#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/subscribe.php:46 actions/tagother.php:166 +#: 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 "" +"Sembla que hi ha hagut un problema amb la teva sessió. Prova-ho de nou, si " +"us plau." + +#: actions/apioauthauthorize.php:146 +#, fuzzy +msgid "Invalid nickname / password!" +msgstr "Nom d'usuari o contrasenya invàlids." + +#: actions/apioauthauthorize.php:170 +#, fuzzy +msgid "DB error deleting OAuth app user." +msgstr "Error en configurar l'usuari." + +#: actions/apioauthauthorize.php:196 +#, fuzzy +msgid "DB error inserting OAuth app user." +msgstr "Hashtag de l'error de la base de dades:%s" + +#: actions/apioauthauthorize.php:231 +#, php-format +msgid "" +"The request token %s has been authorized. Please exchange it for an access " +"token." +msgstr "" + +#: actions/apioauthauthorize.php:241 +#, php-format +msgid "The request token %s has been denied." +msgstr "" + +#: actions/apioauthauthorize.php:246 actions/avatarsettings.php:281 +#: actions/designadminpanel.php:103 actions/editapplication.php:139 +#: actions/emailsettings.php:256 actions/grouplogo.php:319 +#: actions/imsettings.php:220 actions/newapplication.php:121 +#: actions/oauthconnectionssettings.php:151 actions/recoverpassword.php:44 +#: actions/smssettings.php:248 lib/designsettings.php:304 +msgid "Unexpected form submission." +msgstr "Enviament de formulari inesperat." + +#: actions/apioauthauthorize.php:273 +msgid "An application would like to connect to your account" +msgstr "" + +#: actions/apioauthauthorize.php:290 +msgid "Allow or deny access" +msgstr "" + +#: actions/apioauthauthorize.php:320 lib/action.php:435 +msgid "Account" +msgstr "Compte" + +#: actions/apioauthauthorize.php:323 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/apioauthauthorize.php:326 actions/login.php:233 +#: actions/register.php:429 lib/accountsettingsaction.php:116 +msgid "Password" +msgstr "Contrasenya" + +#: actions/apioauthauthorize.php:338 +#, fuzzy +msgid "Deny" +msgstr "Disseny" + +#: actions/apioauthauthorize.php:344 +#, fuzzy +msgid "Allow" +msgstr "Tot" + +#: actions/apioauthauthorize.php:361 +msgid "Allow or deny access to your account information." +msgstr "" + #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." msgstr "Aquest mètode requereix POST o DELETE." @@ -432,12 +541,12 @@ msgstr "No pots eliminar l'estatus d'un altre usuari." msgid "No such notice." msgstr "No existeix aquest avís." -#: actions/apistatusesretweet.php:83 lib/command.php:422 +#: actions/apistatusesretweet.php:83 #, fuzzy msgid "Cannot repeat your own notice." msgstr "No es poden posar en on les notificacions." -#: actions/apistatusesretweet.php:91 lib/command.php:427 +#: actions/apistatusesretweet.php:91 #, fuzzy msgid "Already repeated that notice." msgstr "Eliminar aquesta nota" @@ -450,17 +559,17 @@ msgstr "S'ha suprimit l'estat." msgid "No status with that ID found." msgstr "No s'ha trobat cap estatus amb la ID trobada." -#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:162 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Massa llarg. La longitud màxima és de %d caràcters." -#: actions/apistatusesupdate.php:198 +#: actions/apistatusesupdate.php:203 msgid "Not found" msgstr "No s'ha trobat" -#: actions/apistatusesupdate.php:221 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:226 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -522,9 +631,9 @@ msgid "Repeated to %s" msgstr "Respostes a %s" #: actions/apitimelineretweetsofme.php:112 -#, fuzzy, php-format +#, php-format msgid "Repeats of %s" -msgstr "Respostes a %s" +msgstr "Repeticions de %s" #: actions/apitimelinetag.php:102 actions/tag.php:66 #, php-format @@ -532,9 +641,9 @@ msgid "Notices tagged with %s" msgstr "Aviso etiquetats amb %s" #: actions/apitimelinetag.php:108 actions/tagrss.php:64 -#, fuzzy, php-format +#, php-format msgid "Updates tagged with %1$s on %2$s!" -msgstr "Actualitzacions de %1$s a %2$s!" +msgstr "Actualitzacions etiquetades amb %1$s el %2$s!" #: actions/apiusershow.php:96 msgid "Not found." @@ -544,8 +653,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." @@ -569,8 +681,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" @@ -602,31 +714,6 @@ 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/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 -#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 -#: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 -#: actions/subscribe.php:46 actions/tagother.php:166 -#: 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 "" -"Sembla que hi ha hagut un problema amb la teva sessió. Prova-ho de nou, si " -"us plau." - -#: actions/avatarsettings.php:281 actions/designadminpanel.php:103 -#: actions/emailsettings.php:256 actions/grouplogo.php:319 -#: actions/imsettings.php:220 actions/recoverpassword.php:44 -#: actions/smssettings.php:248 lib/designsettings.php:304 -msgid "Unexpected form submission." -msgstr "Enviament de formulari inesperat." - #: actions/avatarsettings.php:328 msgid "Pick a square area of the image to be your avatar" msgstr "" @@ -687,19 +774,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:260 +msgid "No such group." +msgstr "No s'ha trobat el grup." #: actions/blockedfromgroup.php:90 #, php-format @@ -717,9 +800,8 @@ msgid "A list of the users blocked from joining this group." msgstr "La llista dels usuaris d'aquest grup." #: actions/blockedfromgroup.php:281 -#, fuzzy msgid "Unblock user from group" -msgstr "Ha fallat el desbloqueig d'usuari." +msgstr "Desbloca l'usuari del grup" #: actions/blockedfromgroup.php:313 lib/unblockform.php:69 msgid "Unblock" @@ -768,7 +850,8 @@ msgid "Couldn't delete email confirmation." msgstr "No s'ha pogut eliminar la confirmació de correu electrònic." #: actions/confirmaddress.php:144 -msgid "Confirm Address" +#, fuzzy +msgid "Confirm address" msgstr "Confirmar adreça" #: actions/confirmaddress.php:159 @@ -825,13 +908,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." @@ -962,7 +1038,8 @@ msgstr "" #: actions/pathsadminpanel.php:324 actions/profilesettings.php:174 #: actions/siteadminpanel.php:388 actions/smssettings.php:181 #: actions/subscriptions.php:203 actions/tagother.php:154 -#: actions/useradminpanel.php:313 lib/designsettings.php:256 +#: actions/useradminpanel.php:313 lib/applicationeditform.php:335 +#: lib/applicationeditform.php:336 lib/designsettings.php:256 #: lib/groupeditform.php:202 msgid "Save" msgstr "Guardar" @@ -983,6 +1060,86 @@ msgstr "Afegeix als preferits" msgid "No such document." msgstr "No existeix aquest document." +#: actions/editapplication.php:54 lib/applicationeditform.php:136 +msgid "Edit application" +msgstr "" + +#: actions/editapplication.php:66 +#, fuzzy +msgid "You must be logged in to edit an application." +msgstr "Heu d'iniciar una sessió per editar un grup." + +#: actions/editapplication.php:77 actions/showapplication.php:94 +#, fuzzy +msgid "You are not the owner of this application." +msgstr "No sou un membre del grup." + +#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:163 +#: actions/showapplication.php:87 +#, fuzzy +msgid "No such application." +msgstr "No existeix aquest avís." + +#: actions/editapplication.php:127 actions/newapplication.php:110 +#: actions/showapplication.php:118 lib/action.php:1167 +msgid "There was a problem with your session token." +msgstr "Ha ocorregut algun problema amb la teva sessió." + +#: actions/editapplication.php:161 +#, fuzzy +msgid "Use this form to edit your application." +msgstr "Utilitza aquest formulari per editar el grup." + +#: actions/editapplication.php:177 actions/newapplication.php:159 +#, fuzzy +msgid "Name is required." +msgstr "Igual a la contrasenya de dalt. Requerit." + +#: actions/editapplication.php:180 actions/newapplication.php:162 +#, fuzzy +msgid "Name is too long (max 255 chars)." +msgstr "El teu nom és massa llarg (màx. 255 caràcters)." + +#: actions/editapplication.php:183 actions/newapplication.php:165 +#, fuzzy +msgid "Description is required." +msgstr "Descripció" + +#: actions/editapplication.php:191 +msgid "Source URL is too long." +msgstr "" + +#: actions/editapplication.php:197 actions/newapplication.php:182 +#, fuzzy +msgid "Source URL is not valid." +msgstr "La pàgina personal no és un URL vàlid." + +#: actions/editapplication.php:200 actions/newapplication.php:185 +msgid "Organization is required." +msgstr "" + +#: actions/editapplication.php:203 actions/newapplication.php:188 +#, fuzzy +msgid "Organization is too long (max 255 chars)." +msgstr "La ubicació és massa llarga (màx. 255 caràcters)." + +#: actions/editapplication.php:206 actions/newapplication.php:191 +msgid "Organization homepage is required." +msgstr "" + +#: actions/editapplication.php:215 actions/newapplication.php:203 +msgid "Callback is too long." +msgstr "" + +#: actions/editapplication.php:222 actions/newapplication.php:212 +msgid "Callback URL is not valid." +msgstr "" + +#: actions/editapplication.php:255 +#, fuzzy +msgid "Could not update application." +msgstr "No s'ha pogut actualitzar el grup." + #: actions/editgroup.php:56 #, php-format msgid "Edit %s group" @@ -994,7 +1151,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 @@ -1019,7 +1177,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 @@ -1051,13 +1210,15 @@ msgstr "" "carpeta de spam!) per al missatge amb les instruccions." #: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 +#: actions/smssettings.php:126 lib/applicationeditform.php:333 +#: lib/applicationeditform.php:334 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\"" @@ -1135,9 +1296,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." @@ -1316,13 +1478,6 @@ 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:79 msgid "No such file." msgstr "No existeix el fitxer." @@ -1339,7 +1494,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." @@ -1385,10 +1540,11 @@ msgstr "Bloca l'usuari del grup" #: actions/groupblock.php:196 msgid "Database error blocking user from group." -msgstr "" +msgstr "S'ha produït un error en la base de dades en blocar l'usuari del grup." -#: 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 @@ -1412,13 +1568,6 @@ msgstr "" 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 msgid "Design preferences saved." msgstr "S'han desat les preferències de disseny." @@ -1433,6 +1582,11 @@ 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: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 "Trieu una àrea quadrada de la imatge perquè en sigui el logotip." @@ -1553,8 +1707,8 @@ msgid "Error removing the block." msgstr "S'ha produït un error en suprimir el bloc." #: actions/imsettings.php:59 -msgid "IM Settings" -msgstr "Configuració de missatgeria instantània" +msgid "IM settings" +msgstr "Paràmetres de missatgeria instantània" #: actions/imsettings.php:70 #, php-format @@ -1584,7 +1738,7 @@ msgstr "" "llista d'amics?)" #: actions/imsettings.php:124 -msgid "IM Address" +msgid "IM address" msgstr "Adreça de missatgeria instantània" #: actions/imsettings.php:126 @@ -1687,7 +1841,7 @@ 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 lib/command.php:315 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -1733,7 +1887,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:234 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236 msgid "Send" msgstr "Envia" @@ -1803,90 +1957,61 @@ 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 -msgid "You are already a member of that group" -msgstr "Ja ets membre d'aquest grup" - -#: 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/joingroup.php:135 lib/command.php:239 -#, fuzzy, php-format +#: actions/joingroup.php:131 +#, php-format msgid "%1$s joined group %2$s" -msgstr "%s s'ha pogut afegir al grup %s" +msgstr "%1$s s'ha unit al grup %2$s" #: actions/leavegroup.php:60 msgid "You must be logged in to leave a group." msgstr "Has d'haver entrat per a poder marxar d'un grup." -#: actions/leavegroup.php:90 lib/command.php:268 +#: actions/leavegroup.php:90 lib/command.php:265 msgid "You are not a member of that group." msgstr "No ets membre d'aquest grup." -#: actions/leavegroup.php:119 lib/command.php:278 -msgid "Could not find membership record." -msgstr "No s'han trobat registres dels membres." - -#: actions/leavegroup.php:134 lib/command.php:289 +#: actions/leavegroup.php:127 #, 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:460 +#: 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 -#: lib/groupeditform.php:152 lib/userprofile.php:131 -msgid "Nickname" -msgstr "Sobrenom" - -#: actions/login.php:253 actions/register.php:428 -#: 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." @@ -1894,7 +2019,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]" @@ -1914,19 +2039,42 @@ 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 %1$s in group %2$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 #, fuzzy, php-format -msgid "Can't make %1$s an admin for group %2$s" +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 msgid "No current status" msgstr "No té cap estatus ara mateix" +#: actions/newapplication.php:52 +msgid "New application" +msgstr "" + +#: actions/newapplication.php:64 +#, fuzzy +msgid "You must be logged in to register an application." +msgstr "Has d'haver entrat per crear un grup." + +#: actions/newapplication.php:143 +#, fuzzy +msgid "Use this form to register a new application." +msgstr "Utilitza aquest formulari per crear un nou grup." + +#: actions/newapplication.php:173 +msgid "Source URL is required." +msgstr "" + +#: actions/newapplication.php:255 actions/newapplication.php:264 +#, fuzzy +msgid "Could not create application." +msgstr "No s'han pogut crear els àlies." + #: actions/newgroup.php:53 msgid "New group" msgstr "Nou grup" @@ -1939,12 +2087,12 @@ msgstr "Utilitza aquest formulari per crear un nou grup." msgid "New message" msgstr "Nou missatge" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 msgid "You can't send a message to this user." msgstr "No podeu enviar un misssatge a aquest usuari." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:484 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 +#: lib/command.php:475 msgid "No content!" msgstr "Cap contingut!" @@ -1952,7 +2100,7 @@ msgstr "Cap contingut!" msgid "No recipient specified." msgstr "No has especificat el destinatari." -#: actions/newmessage.php:164 lib/command.php:370 +#: actions/newmessage.php:164 lib/command.php:361 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "No t'enviïs missatges a tu mateix, simplement dir-te això." @@ -1962,8 +2110,8 @@ msgid "Message sent" msgstr "S'ha enviat el missatge" #: actions/newmessage.php:185 -#, php-format -msgid "Direct message to %s sent" +#, fuzzy, php-format +msgid "Direct message to %s sent." msgstr "Missatge directe per a %s enviat" #: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 @@ -1992,9 +2140,9 @@ msgid "Text search" msgstr "Cerca de text" #: actions/noticesearch.php:91 -#, fuzzy, php-format +#, php-format msgid "Search results for \"%1$s\" on %2$s" -msgstr "Cerca resultats de «%s» a %s" +msgstr "Cerca els resultats de «%s» a %s" #: actions/noticesearch.php:121 #, php-format @@ -2036,6 +2184,51 @@ msgstr "Reclamació enviada" msgid "Nudge sent!" msgstr "Reclamació enviada!" +#: actions/oauthappssettings.php:59 +#, fuzzy +msgid "You must be logged in to list your applications." +msgstr "Heu d'iniciar una sessió per editar un grup." + +#: actions/oauthappssettings.php:74 +#, fuzzy +msgid "OAuth applications" +msgstr "Altres opcions" + +#: actions/oauthappssettings.php:85 +msgid "Applications you have registered" +msgstr "" + +#: actions/oauthappssettings.php:135 +#, php-format +msgid "You have not registered any applications yet." +msgstr "" + +#: actions/oauthconnectionssettings.php:71 +msgid "Connected applications" +msgstr "" + +#: actions/oauthconnectionssettings.php:87 +msgid "You have allowed the following applications to access you account." +msgstr "" + +#: actions/oauthconnectionssettings.php:170 +#, fuzzy +msgid "You are not a user of that application." +msgstr "No ets membre d'aquest grup." + +#: actions/oauthconnectionssettings.php:180 +msgid "Unable to revoke access for app: " +msgstr "" + +#: actions/oauthconnectionssettings.php:192 +#, php-format +msgid "You have not authorized any applications to use your account." +msgstr "" + +#: actions/oauthconnectionssettings.php:205 +msgid "Developers can edit the registration settings for their applications " +msgstr "" + #: actions/oembed.php:79 actions/shownotice.php:100 msgid "Notice has no profile" msgstr "Avís sense perfil" @@ -2053,8 +2246,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:1038 +#: lib/api.php:1066 lib/api.php:1176 msgid "Not a supported data format." msgstr "Format de data no suportat." @@ -2067,7 +2260,8 @@ msgid "Notice Search" msgstr "Cerca de notificacions" #: actions/othersettings.php:60 -msgid "Other Settings" +#, fuzzy +msgid "Other settings" msgstr "Altres configuracions" #: actions/othersettings.php:71 @@ -2099,6 +2293,31 @@ 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/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 msgid "Outbox for %s" @@ -2135,7 +2354,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" @@ -2297,7 +2516,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 @@ -2361,43 +2581,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 -#: lib/groupeditform.php:161 +#: actions/profilesettings.php:115 actions/register.php:453 +#: lib/applicationeditform.php:230 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\"" @@ -2464,9 +2684,8 @@ msgid "Couldn't update user for autosubscribe." msgstr "No es pot actualitzar l'usuari per autosubscriure." #: actions/profilesettings.php:359 -#, fuzzy msgid "Couldn't save location prefs." -msgstr "No s'han pogut guardar les etiquetes." +msgstr "No s'han pogut desar les preferències d'ubicació." #: actions/profilesettings.php:371 msgid "Couldn't save profile." @@ -2483,7 +2702,7 @@ msgstr "Configuració guardada." #: actions/public.php:83 #, php-format msgid "Beyond the page limit (%s)" -msgstr "" +msgstr "Més enllà del límit de la pàgina (%s)" #: actions/public.php:92 msgid "Could not retrieve public stream." @@ -2516,6 +2735,8 @@ msgid "" "This is the public timeline for %%site.name%% but no one has posted anything " "yet." msgstr "" +"Aquesta és la línia temporal pública de %%site.name%%, però ningú no hi ha " +"enviat res encara." #: actions/public.php:182 msgid "Be the first to post!" @@ -2703,7 +2924,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." @@ -2715,7 +2936,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:457 +#: actions/register.php:114 actions/register.php:503 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Registre" @@ -2728,19 +2949,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. " @@ -2748,42 +2965,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 " @@ -2792,7 +3009,7 @@ 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 +#: actions/register.php:538 #, fuzzy, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -2823,7 +3040,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.)" @@ -2978,6 +3195,84 @@ msgstr "No pots enviar un missatge a aquest usuari." msgid "User is already sandboxed." msgstr "Un usuari t'ha bloquejat." +#: actions/showapplication.php:82 +#, fuzzy +msgid "You must be logged in to view an application." +msgstr "Has d'haver entrat per a poder marxar d'un grup." + +#: actions/showapplication.php:158 +#, fuzzy +msgid "Application profile" +msgstr "Avís sense perfil" + +#: actions/showapplication.php:160 lib/applicationeditform.php:182 +msgid "Icon" +msgstr "" + +#: actions/showapplication.php:170 actions/version.php:195 +#: lib/applicationeditform.php:197 +msgid "Name" +msgstr "Nom" + +#: actions/showapplication.php:179 lib/applicationeditform.php:224 +#, fuzzy +msgid "Organization" +msgstr "Paginació" + +#: actions/showapplication.php:188 actions/version.php:198 +#: lib/applicationeditform.php:211 lib/groupeditform.php:172 +msgid "Description" +msgstr "Descripció" + +#: actions/showapplication.php:193 actions/showgroup.php:429 +#: lib/profileaction.php:174 +msgid "Statistics" +msgstr "Estadístiques" + +#: actions/showapplication.php:204 +#, php-format +msgid "created by %1$s - %2$s access by default - %3$d users" +msgstr "" + +#: actions/showapplication.php:214 +msgid "Application actions" +msgstr "" + +#: actions/showapplication.php:233 +msgid "Reset key & secret" +msgstr "" + +#: actions/showapplication.php:241 +msgid "Application info" +msgstr "" + +#: actions/showapplication.php:243 +msgid "Consumer key" +msgstr "" + +#: actions/showapplication.php:248 +msgid "Consumer secret" +msgstr "" + +#: actions/showapplication.php:253 +msgid "Request token URL" +msgstr "" + +#: actions/showapplication.php:258 +msgid "Access token URL" +msgstr "" + +#: actions/showapplication.php:263 +#, fuzzy +msgid "Authorize URL" +msgstr "Autoria" + +#: actions/showapplication.php:268 +msgid "" +"Note: We support HMAC-SHA1 signatures. We do not support the plaintext " +"signature method." +msgstr "" + #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "No s'han pogut recuperar els avisos preferits." @@ -3075,7 +3370,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)" @@ -3083,10 +3378,6 @@ msgstr "(Cap)" msgid "All members" msgstr "Tots els membres" -#: actions/showgroup.php:429 lib/profileaction.php:174 -msgid "Statistics" -msgstr "Estadístiques" - #: actions/showgroup.php:432 msgid "Created" msgstr "S'ha creat" @@ -3230,12 +3521,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 @@ -3276,7 +3568,7 @@ msgstr "" #: actions/siteadminpanel.php:262 msgid "Text used for credits link in footer of each page" -msgstr "" +msgstr "El text que s'utilitza a l'enllaç dels crèdits al peu de cada pàgina" #: actions/siteadminpanel.php:266 msgid "Brought by URL" @@ -3316,7 +3608,7 @@ msgstr "Servidor" #: actions/siteadminpanel.php:306 msgid "Site's server hostname." -msgstr "" +msgstr "Servidor central del lloc." #: actions/siteadminpanel.php:310 msgid "Fancy URLs" @@ -3337,6 +3629,8 @@ msgstr "Privat" #: actions/siteadminpanel.php:323 msgid "Prohibit anonymous users (not logged in) from viewing site?" msgstr "" +"Voleu prohibir als usuaris anònims (que no han iniciat cap sessió) " +"visualitzar el lloc?" #: actions/siteadminpanel.php:327 msgid "Invite only" @@ -3356,7 +3650,7 @@ msgstr "Inhabilita els nous registres." #: actions/siteadminpanel.php:341 msgid "Snapshots" -msgstr "" +msgstr "Instantànies" #: actions/siteadminpanel.php:344 msgid "Randomly during Web hit" @@ -3364,11 +3658,11 @@ msgstr "" #: actions/siteadminpanel.php:345 msgid "In a scheduled job" -msgstr "" +msgstr "En una tasca planificada" #: actions/siteadminpanel.php:347 msgid "Data snapshots" -msgstr "" +msgstr "Instantànies de dades" #: actions/siteadminpanel.php:348 msgid "When to send statistical data to status.net servers" @@ -3388,7 +3682,7 @@ msgstr "" #: actions/siteadminpanel.php:360 msgid "Snapshots will be sent to this URL" -msgstr "" +msgstr "Les instantànies s'enviaran a aquest URL" #: actions/siteadminpanel.php:367 msgid "Limits" @@ -3413,12 +3707,12 @@ msgstr "" "de nou." #: actions/siteadminpanel.php:388 actions/useradminpanel.php:313 -#, fuzzy msgid "Save site settings" -msgstr "Configuració de l'avatar" +msgstr "Desa els paràmetres del lloc" #: actions/smssettings.php:58 -msgid "SMS Settings" +#, fuzzy +msgid "SMS settings" msgstr "Configuració SMS" #: actions/smssettings.php:69 @@ -3449,7 +3743,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 @@ -3566,7 +3861,7 @@ msgstr "" #: actions/subscribers.php:110 #, php-format msgid "%s has no subscribers. Want to be the first?" -msgstr "" +msgstr "%s no té subscriptors. Voleu ser-ne el primer?" #: actions/subscribers.php:114 #, php-format @@ -3574,6 +3869,8 @@ msgid "" "%s has no subscribers. Why not [register an account](%%%%action.register%%%" "%) and be the first?" msgstr "" +"%s no té subscriptors. Per què no us [registreu](%%%%action.register%%%%) i " +"en sou el primer?" #: actions/subscriptions.php:52 #, php-format @@ -3581,9 +3878,9 @@ msgid "%s subscriptions" msgstr "%s subscripcions" #: actions/subscriptions.php:54 -#, fuzzy, php-format +#, php-format msgid "%1$s subscriptions, page %2$d" -msgstr "%s subscripcions, pàgina %d" +msgstr "%1$s subscripcions, pàgina %2$d" #: actions/subscriptions.php:65 msgid "These are the people whose notices you listen to." @@ -3697,18 +3994,13 @@ msgid "User is not sandboxed." msgstr "Un usuari t'ha bloquejat." #: actions/unsilence.php:72 -#, fuzzy msgid "User is not silenced." -msgstr "L'usuari no té perfil." +msgstr "L'usuari no està silenciat." #: actions/unsubscribe.php:77 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" @@ -3748,11 +4040,11 @@ msgstr "Perfil" #: actions/useradminpanel.php:222 msgid "Bio Limit" -msgstr "" +msgstr "Límit de la biografia" #: actions/useradminpanel.php:223 msgid "Maximum length of a profile bio in characters." -msgstr "" +msgstr "Límit màxim de la biografia d'un perfil (en caràcters)." #: actions/useradminpanel.php:231 msgid "New users" @@ -3804,7 +4096,7 @@ msgstr "Depuració de la sessió" #: actions/useradminpanel.php:278 msgid "Turn on debugging output for sessions." -msgstr "" +msgstr "Activa la sortida de depuració per a les sessions." #: actions/userauthorization.php:105 msgid "Authorize subscription" @@ -3910,11 +4202,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" @@ -3964,7 +4251,7 @@ msgstr "S'ha suprimit l'estat." #: actions/version.php:161 msgid "Contributors" -msgstr "" +msgstr "Col·laboració" #: actions/version.php:168 msgid "" @@ -3991,12 +4278,7 @@ msgstr "" #: actions/version.php:189 msgid "Plugins" -msgstr "" - -#: actions/version.php:195 -#, fuzzy -msgid "Name" -msgstr "Sobrenom" +msgstr "Connectors" #: actions/version.php:196 lib/action.php:741 #, fuzzy @@ -4008,31 +4290,46 @@ msgstr "Sessions" msgid "Author(s)" msgstr "Autoria" -#: actions/version.php:198 lib/groupeditform.php:172 -msgid "Description" -msgstr "Descripció" - -#: classes/File.php:137 +#: 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/Message.php:45 +#: classes/Group_member.php:41 #, fuzzy +msgid "Group join failed." +msgstr "Perfil del grup" + +#: classes/Group_member.php:53 +#, fuzzy +msgid "Not part of group." +msgstr "No s'ha pogut actualitzar el grup." + +#: classes/Group_member.php:60 +#, fuzzy +msgid "Group leave failed." +msgstr "Perfil del grup" + +#: 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 msgid "You are banned from sending direct messages." -msgstr "Error al enviar el missatge directe." +msgstr "Se us ha bandejat enviar missatges directes." #: classes/Message.php:61 msgid "Could not insert message." @@ -4042,28 +4339,28 @@ msgstr "No s'ha pogut inserir el missatge." msgid "Could not update message with new URI." msgstr "No s'ha pogut inserir el missatge amb la nova URI." -#: classes/Notice.php:172 +#: classes/Notice.php:171 #, php-format msgid "DB error inserting hashtag: %s" msgstr "Hashtag de l'error de la base de dades:%s" -#: classes/Notice.php:226 +#: classes/Notice.php:225 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Problema en guardar l'avís." -#: classes/Notice.php:230 +#: classes/Notice.php:229 msgid "Problem saving notice. Unknown user." msgstr "Problema al guardar la notificació. Usuari desconegut." -#: classes/Notice.php:235 +#: classes/Notice.php:234 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Masses notificacions massa ràpid; pren un respir i publica de nou en uns " "minuts." -#: classes/Notice.php:241 +#: classes/Notice.php:240 #, fuzzy msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " @@ -4072,25 +4369,25 @@ msgstr "" "Masses notificacions massa ràpid; pren un respir i publica de nou en uns " "minuts." -#: classes/Notice.php:247 +#: classes/Notice.php:246 msgid "You are banned from posting notices on this site." msgstr "Ha estat bandejat de publicar notificacions en aquest lloc." -#: classes/Notice.php:309 classes/Notice.php:334 +#: classes/Notice.php:305 classes/Notice.php:330 msgid "Problem saving notice." msgstr "Problema en guardar l'avís." -#: classes/Notice.php:1034 +#: classes/Notice.php:1052 #, php-format msgid "DB error inserting reply: %s" msgstr "Error de BD en inserir resposta: %s" -#: classes/Notice.php:1359 +#: classes/Notice.php:1423 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" -#: classes/User.php:368 +#: classes/User.php:382 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Us donem la benvinguda a %1$s, @%2$s!" @@ -4132,6 +4429,11 @@ msgstr "Altres" msgid "Other options" msgstr "Altres opcions" +#: lib/action.php:144 +#, 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" @@ -4148,10 +4450,6 @@ msgstr "Inici" msgid "Personal profile and friends timeline" msgstr "Perfil personal i línia temporal dels amics" -#: lib/action.php:435 -msgid "Account" -msgstr "Compte" - #: lib/action.php:435 msgid "Change your email, avatar, password, profile" msgstr "Canviar correu electrònic, avatar, contrasenya, perfil" @@ -4307,10 +4605,6 @@ msgstr "Posteriors" msgid "Before" msgstr "Anteriors" -#: lib/action.php:1167 -msgid "There was a problem with your session token." -msgstr "Ha ocorregut algun problema amb la teva sessió." - #: lib/adminpanelaction.php:96 msgid "You cannot make changes to this site." msgstr "No podeu fer canvis al lloc." @@ -4347,6 +4641,72 @@ msgstr "Configuració del disseny" msgid "Paths configuration" msgstr "Configuració dels camins" +#: lib/applicationeditform.php:186 +msgid "Icon for this application" +msgstr "" + +#: lib/applicationeditform.php:206 +#, fuzzy, php-format +msgid "Describe your application in %d characters" +msgstr "Descriu el grup amb 140 caràcters" + +#: lib/applicationeditform.php:209 +#, fuzzy +msgid "Describe your application" +msgstr "Descriu el grup amb 140 caràcters" + +#: lib/applicationeditform.php:218 +#, fuzzy +msgid "Source URL" +msgstr "Font" + +#: lib/applicationeditform.php:220 +#, fuzzy +msgid "URL of the homepage of this application" +msgstr "URL del teu web, blog del grup u tema" + +#: lib/applicationeditform.php:226 +msgid "Organization responsible for this application" +msgstr "" + +#: lib/applicationeditform.php:232 +#, fuzzy +msgid "URL for the homepage of the organization" +msgstr "URL del teu web, blog del grup u tema" + +#: lib/applicationeditform.php:238 +msgid "URL to redirect to after authentication" +msgstr "" + +#: lib/applicationeditform.php:260 +msgid "Browser" +msgstr "" + +#: lib/applicationeditform.php:276 +msgid "Desktop" +msgstr "" + +#: lib/applicationeditform.php:277 +msgid "Type of application, browser or desktop" +msgstr "" + +#: lib/applicationeditform.php:299 +msgid "Read-only" +msgstr "" + +#: lib/applicationeditform.php:317 +msgid "Read-write" +msgstr "" + +#: lib/applicationeditform.php:318 +msgid "Default access for this application: read-only, or read-write" +msgstr "" + +#: lib/applicationlist.php:154 +#, fuzzy +msgid "Revoke" +msgstr "Suprimeix" + #: lib/attachmentlist.php:87 msgid "Attachments" msgstr "Adjuncions" @@ -4367,11 +4727,11 @@ msgstr "" msgid "Tags for this attachment" msgstr "Etiquetes de l'adjunció" -#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 +#: lib/authenticationplugin.php:214 lib/authenticationplugin.php:219 msgid "Password changing failed" msgstr "El canvi de contrasenya ha fallat" -#: lib/authenticationplugin.php:197 +#: lib/authenticationplugin.php:229 #, fuzzy msgid "Password changing is not allowed" msgstr "Contrasenya canviada." @@ -4394,7 +4754,7 @@ msgstr "Perdona, aquesta comanda no està implementada." #: lib/command.php:88 #, fuzzy, php-format -msgid "Could not find a user with nickname %s." +msgid "Could not find a user with nickname %s" msgstr "No es pot actualitzar l'usuari amb el correu electrònic confirmat" #: lib/command.php:92 @@ -4403,7 +4763,7 @@ msgstr "" #: lib/command.php:99 #, fuzzy, php-format -msgid "Nudge sent to %s." +msgid "Nudge sent to %s" msgstr "Reclamació enviada" #: lib/command.php:126 @@ -4414,172 +4774,193 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:399 lib/command.php:460 +#: lib/command.php:152 lib/command.php:390 lib/command.php:451 #, fuzzy -msgid "Notice with that id does not exist." +msgid "Notice with that id does not exist" msgstr "No hi ha cap perfil amb aquesta id." -#: lib/command.php:168 lib/command.php:415 lib/command.php:476 -#: lib/command.php:532 -#, fuzzy -msgid "User has no last notice." +#: lib/command.php:168 lib/command.php:406 lib/command.php:467 +#: lib/command.php:523 +msgid "User has no last notice" msgstr "L'usuari no té última nota" #: lib/command.php:190 msgid "Notice marked as fave." msgstr "Nota marcada com a favorita." -#: lib/command.php:284 -#, fuzzy, php-format -msgid "Could not remove user %1$s to group %2$s." +#: lib/command.php:217 +msgid "You are already a member of that group" +msgstr "Ja sou membre del grup." + +#: lib/command.php:231 +#, 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:236 +#, php-format +msgid "%s joined group %s" +msgstr "%s s'ha pogut afegir al grup %s" + +#: lib/command.php:275 +#, 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:318 +#: lib/command.php:280 +#, php-format +msgid "%s left group %s" +msgstr "%s ha abandonat el grup %s" + +#: lib/command.php:309 #, php-format msgid "Fullname: %s" msgstr "Nom complet: %s" -#: lib/command.php:321 +#: lib/command.php:312 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "Localització: %s" -#: lib/command.php:324 +#: lib/command.php:315 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "Pàgina web: %s" -#: lib/command.php:327 +#: lib/command.php:318 #, php-format msgid "About: %s" msgstr "Sobre tu: %s" -#: lib/command.php:358 +#: lib/command.php:349 #, fuzzy, php-format -msgid "Message too long - maximum is %1$d characters, you sent %2$d." +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." +#: lib/command.php:367 +#, php-format +msgid "Direct message to %s sent" msgstr "Missatge directe per a %s enviat" -#: lib/command.php:378 +#: lib/command.php:369 msgid "Error sending direct message." msgstr "Error al enviar el missatge directe." -#: lib/command.php:435 +#: lib/command.php:413 +#, fuzzy +msgid "Cannot repeat your own notice" +msgstr "No es poden posar en on les notificacions." + +#: lib/command.php:418 +#, fuzzy +msgid "Already repeated that notice" +msgstr "Eliminar aquesta nota" + +#: lib/command.php:426 #, fuzzy, php-format -msgid "Notice from %s repeated." +msgid "Notice from %s repeated" msgstr "Notificació publicada" -#: lib/command.php:437 +#: lib/command.php:428 #, fuzzy msgid "Error repeating notice." msgstr "Problema en guardar l'avís." -#: lib/command.php:491 +#: lib/command.php:482 #, fuzzy, php-format -msgid "Notice too long - maximum is %1$d characters, you sent %2$d." +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 -#, fuzzy, php-format -msgid "Reply to %s sent." +#: lib/command.php:491 +#, php-format +msgid "Reply to %s sent" msgstr "S'ha enviat la resposta a %s" -#: lib/command.php:502 +#: lib/command.php:493 #, fuzzy 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." +#: lib/command.php:547 +msgid "Specify the name of the user to subscribe to" msgstr "Especifica el nom de l'usuari a que vols subscriure't" -#: lib/command.php:563 +#: lib/command.php:554 #, php-format msgid "Subscribed to %s" msgstr "Subscrit a %s" -#: lib/command.php:584 -#, fuzzy -msgid "Specify the name of the user to unsubscribe from." +#: lib/command.php:575 +msgid "Specify the name of the user to unsubscribe from" msgstr "Especifica el nom de l'usuari del que vols deixar d'estar subscrit" -#: lib/command.php:591 +#: lib/command.php:582 #, php-format msgid "Unsubscribed from %s" msgstr "Has deixat d'estar subscrit a %s" -#: lib/command.php:609 lib/command.php:632 +#: lib/command.php:600 lib/command.php:623 msgid "Command not yet implemented." msgstr "Comanda encara no implementada." -#: lib/command.php:612 +#: lib/command.php:603 msgid "Notification off." msgstr "Notificacions off." -#: lib/command.php:614 +#: lib/command.php:605 msgid "Can't turn off notification." msgstr "No es poden posar en off les notificacions." -#: lib/command.php:635 +#: lib/command.php:626 msgid "Notification on." msgstr "Notificacions on." -#: lib/command.php:637 +#: lib/command.php:628 msgid "Can't turn on notification." msgstr "No es poden posar en on les notificacions." -#: lib/command.php:650 -msgid "Login command is disabled." +#: lib/command.php:641 +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:652 #, php-format -msgid "This link is useable only once, and is good for only 2 minutes: %s." +msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:685 +#: lib/command.php:668 #, fuzzy msgid "You are not subscribed to anyone." msgstr "No estàs subscrit a aquest perfil." -#: lib/command.php:687 +#: lib/command.php:670 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:690 #, 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:692 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:712 msgid "You are not a member of any groups." msgstr "No sou membre de cap grup." -#: lib/command.php:731 +#: lib/command.php:714 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:728 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4620,19 +5001,19 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:199 +#: lib/common.php:131 msgid "No configuration file found. " msgstr "No s'ha trobat cap fitxer de configuració. " -#: lib/common.php:200 +#: lib/common.php:132 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:201 +#: lib/common.php:134 msgid "You may wish to run the installer to fix this." msgstr "Podeu voler executar l'instal·lador per a corregir-ho." -#: lib/common.php:202 +#: lib/common.php:135 msgid "Go to the installer." msgstr "Vés a l'instal·lador." @@ -4648,6 +5029,15 @@ msgstr "Actualitzacions per Missatgeria Instantània" msgid "Updates by SMS" msgstr "Actualitzacions per SMS" +#: lib/connectsettingsaction.php:120 +#, fuzzy +msgid "Connections" +msgstr "Connexió" + +#: lib/connectsettingsaction.php:121 +msgid "Authorized connected applications" +msgstr "" + #: lib/dberroraction.php:60 msgid "Database error" msgstr "Error de la base de dades" @@ -4834,11 +5224,16 @@ msgstr "" msgid "kB" msgstr "" -#: lib/jabber.php:191 +#: lib/jabber.php:202 #, php-format msgid "[%s]" msgstr "" +#: lib/jabber.php:385 +#, fuzzy, php-format +msgid "Unknown inbox source %d." +msgstr "Llengua desconeguda «%s»" + #: lib/joinform.php:114 msgid "Join" msgstr "Inici de sessió" @@ -4902,21 +5297,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" @@ -5113,7 +5496,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 @@ -5121,7 +5504,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 @@ -5131,7 +5515,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 @@ -5165,16 +5549,18 @@ msgstr "Adjunta un fitxer" #: lib/noticeform.php:212 #, fuzzy -msgid "Share my location." -msgstr "Comparteix la vostra ubicació" - -#: lib/noticeform.php:214 -#, fuzzy -msgid "Do not share my location." +msgid "Share my location" msgstr "Comparteix la vostra ubicació" #: lib/noticeform.php:215 -msgid "Hide this info" +#, fuzzy +msgid "Do not share my location" +msgstr "Comparteix la vostra ubicació" + +#: lib/noticeform.php:216 +msgid "" +"Sorry, retrieving your geo location is taking longer than expected, please " +"try again later" msgstr "" #: lib/noticelist.php:428 @@ -5442,25 +5828,25 @@ msgstr "Ja hi esteu subscrit!" msgid "User has blocked you." msgstr "Un usuari t'ha bloquejat." -#: lib/subs.php:60 +#: lib/subs.php:63 msgid "Could not subscribe." msgstr "No pots subscriure." -#: lib/subs.php:79 +#: lib/subs.php:82 msgid "Could not subscribe other to you." msgstr "No pots subscriure a un altre a tu mateix." -#: lib/subs.php:128 +#: lib/subs.php:137 #, fuzzy msgid "Not subscribed!" msgstr "No estàs subscrit!" -#: lib/subs.php:133 +#: lib/subs.php:142 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "No s'ha pogut eliminar la subscripció." -#: lib/subs.php:146 +#: lib/subs.php:158 msgid "Couldn't delete subscription." msgstr "No s'ha pogut eliminar la subscripció." @@ -5474,10 +5860,6 @@ msgstr "" msgid "People Tagcloud as tagged" msgstr "" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(cap)" - #: lib/tagcloudsection.php:56 msgid "None" msgstr "Cap" @@ -5539,47 +5921,47 @@ msgstr "Missatge" msgid "Moderate" msgstr "Modera" -#: lib/util.php:837 +#: lib/util.php:875 msgid "a few seconds ago" msgstr "fa pocs segons" -#: lib/util.php:839 +#: lib/util.php:877 msgid "about a minute ago" msgstr "fa un minut" -#: lib/util.php:841 +#: lib/util.php:879 #, php-format msgid "about %d minutes ago" msgstr "fa %d minuts" -#: lib/util.php:843 +#: lib/util.php:881 msgid "about an hour ago" msgstr "fa una hora" -#: lib/util.php:845 +#: lib/util.php:883 #, php-format msgid "about %d hours ago" msgstr "fa %d hores" -#: lib/util.php:847 +#: lib/util.php:885 msgid "about a day ago" msgstr "fa un dia" -#: lib/util.php:849 +#: lib/util.php:887 #, php-format msgid "about %d days ago" msgstr "fa %d dies" -#: lib/util.php:851 +#: lib/util.php:889 msgid "about a month ago" msgstr "fa un mes" -#: lib/util.php:853 +#: lib/util.php:891 #, php-format msgid "about %d months ago" msgstr "fa %d mesos" -#: lib/util.php:855 +#: lib/util.php:893 msgid "about a year ago" msgstr "fa un any" @@ -5595,5 +5977,5 @@ msgstr "%s no és un color vàlid! Feu servir 3 o 6 caràcters hexadecimals." #: scripts/xmppdaemon.php:301 #, fuzzy, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "Missatge massa llarg - màxim és 140 caràcters, tu has enviat %d" diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po index 86cb4c9a6a..53fd42feb6 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-10 00:46+0000\n" -"PO-Revision-Date: 2010-01-10 00:47:19+0000\n" +"POT-Creation-Date: 2010-01-15 19:15+0000\n" +"PO-Revision-Date: 2010-01-15 19:16: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 (r60878); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r61101); 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" @@ -35,25 +35,30 @@ msgstr "Žádné takové oznámení." #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 +#: actions/apistatusesupdate.php:149 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 #: 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 #: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 -#: lib/command.php:163 lib/command.php:311 lib/command.php:364 -#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/command.php:163 lib/command.php:302 lib/command.php:355 +#: lib/command.php:401 lib/command.php:462 lib/command.php:518 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/subs.php:34 lib/subs.php:125 msgid "No such user." msgstr "Žádný takový uživatel." +#: actions/all.php:84 +#, fuzzy, php-format +msgid "%1$s and friends, page %2$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 +#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -106,7 +111,7 @@ msgstr "" msgid "You and friends" msgstr "%s a přátelé" -#: actions/allrss.php:119 actions/apitimelinefriends.php:122 +#: actions/allrss.php:119 actions/apitimelinefriends.php:121 #: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" @@ -117,6 +122,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:155 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" @@ -131,7 +153,7 @@ msgstr "Potvrzující kód nebyl nalezen" #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:114 +#: actions/apistatusesupdate.php:119 msgid "This method requires a POST." msgstr "" @@ -162,8 +184,9 @@ msgstr "Nelze uložit profil" #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257 -#: actions/designadminpanel.php:122 actions/newnotice.php:94 +#: actions/apistatusesupdate.php:132 actions/avatarsettings.php:257 +#: actions/designadminpanel.php:122 actions/editapplication.php:118 +#: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format msgid "" @@ -175,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 "" @@ -217,26 +243,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 "" @@ -260,15 +266,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 @@ -290,8 +297,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." @@ -325,7 +333,8 @@ msgstr "PÅ™ezdívku již nÄ›kdo používá. Zkuste jinou" msgid "Not a valid nickname." msgstr "Není platnou pÅ™ezdívkou." -#: actions/apigroupcreate.php:196 actions/editgroup.php:195 +#: actions/apigroupcreate.php:196 actions/editapplication.php:212 +#: actions/editgroup.php:195 actions/newapplication.php:200 #: actions/newgroup.php:139 actions/profilesettings.php:222 #: actions/register.php:217 msgid "Homepage is not a valid URL." @@ -337,7 +346,8 @@ msgstr "Stránka není platnou URL." msgid "Full name is too long (max 255 chars)." msgstr "Jméno je moc dlouhé (maximální délka je 255 znaků)" -#: actions/apigroupcreate.php:213 +#: actions/apigroupcreate.php:213 actions/editapplication.php:187 +#: actions/newapplication.php:169 #, fuzzy, php-format msgid "Description is too long (max %d chars)." msgstr "Text je příliÅ¡ dlouhý (maximální délka je 140 zanků)" @@ -378,7 +388,7 @@ msgstr "" msgid "Group not found!" msgstr "Žádný požadavek nebyl nalezen!" -#: actions/apigroupjoin.php:110 lib/command.php:217 +#: actions/apigroupjoin.php:110 actions/joingroup.php:90 #, fuzzy msgid "You are already a member of that group." msgstr "Již jste pÅ™ihlášen" @@ -387,7 +397,7 @@ msgstr "Již jste pÅ™ihlášen" msgid "You have been blocked from that group by the admin." msgstr "" -#: actions/apigroupjoin.php:138 lib/command.php:234 +#: actions/apigroupjoin.php:138 actions/joingroup.php:124 #, fuzzy, php-format msgid "Could not join user %1$s to group %2$s." msgstr "Nelze pÅ™esmÄ›rovat na server: %s" @@ -397,7 +407,7 @@ 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/leavegroup.php:127 +#: actions/apigroupleave.php:124 actions/leavegroup.php:119 #, fuzzy, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "Nelze vytvoÅ™it OpenID z: %s" @@ -417,6 +427,102 @@ msgstr "" msgid "groups on %s" msgstr "" +#: actions/apioauthauthorize.php:108 actions/apioauthauthorize.php:114 +msgid "Bad request." +msgstr "" + +#: actions/apioauthauthorize.php:134 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:115 actions/makeadmin.php:66 +#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 +#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:139 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 +#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/subscribe.php:46 actions/tagother.php:166 +#: 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 "" + +#: actions/apioauthauthorize.php:146 +#, fuzzy +msgid "Invalid nickname / password!" +msgstr "Neplatné jméno nebo heslo" + +#: actions/apioauthauthorize.php:170 +#, fuzzy +msgid "DB error deleting OAuth app user." +msgstr "Chyba nastavení uživatele" + +#: actions/apioauthauthorize.php:196 +#, fuzzy +msgid "DB error inserting OAuth app user." +msgstr "Chyba v DB pÅ™i vkládání odpovÄ›di: %s" + +#: actions/apioauthauthorize.php:231 +#, php-format +msgid "" +"The request token %s has been authorized. Please exchange it for an access " +"token." +msgstr "" + +#: actions/apioauthauthorize.php:241 +#, php-format +msgid "The request token %s has been denied." +msgstr "" + +#: actions/apioauthauthorize.php:246 actions/avatarsettings.php:281 +#: actions/designadminpanel.php:103 actions/editapplication.php:139 +#: actions/emailsettings.php:256 actions/grouplogo.php:319 +#: actions/imsettings.php:220 actions/newapplication.php:121 +#: actions/oauthconnectionssettings.php:151 actions/recoverpassword.php:44 +#: actions/smssettings.php:248 lib/designsettings.php:304 +msgid "Unexpected form submission." +msgstr "NeÄekaná forma submission." + +#: actions/apioauthauthorize.php:273 +msgid "An application would like to connect to your account" +msgstr "" + +#: actions/apioauthauthorize.php:290 +msgid "Allow or deny access" +msgstr "" + +#: actions/apioauthauthorize.php:320 lib/action.php:435 +#, fuzzy +msgid "Account" +msgstr "O nás" + +#: actions/apioauthauthorize.php:323 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/apioauthauthorize.php:326 actions/login.php:233 +#: actions/register.php:429 lib/accountsettingsaction.php:116 +msgid "Password" +msgstr "Heslo" + +#: actions/apioauthauthorize.php:338 +#, fuzzy +msgid "Deny" +msgstr "Vzhled" + +#: actions/apioauthauthorize.php:344 +msgid "Allow" +msgstr "" + +#: actions/apioauthauthorize.php:361 +msgid "Allow or deny access to your account information." +msgstr "" + #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." msgstr "" @@ -430,12 +536,12 @@ msgstr "" msgid "No such notice." msgstr "Žádné takové oznámení." -#: actions/apistatusesretweet.php:83 lib/command.php:422 +#: actions/apistatusesretweet.php:83 #, fuzzy msgid "Cannot repeat your own notice." msgstr "Nemůžete se registrovat, pokud nesouhlasíte s licencí." -#: actions/apistatusesretweet.php:91 lib/command.php:427 +#: actions/apistatusesretweet.php:91 #, fuzzy msgid "Already repeated that notice." msgstr "Odstranit toto oznámení" @@ -449,17 +555,17 @@ msgstr "Obrázek nahrán" msgid "No status with that ID found." msgstr "" -#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:162 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Je to příliÅ¡ dlouhé. Maximální sdÄ›lení délka je 140 znaků" -#: actions/apistatusesupdate.php:198 +#: actions/apistatusesupdate.php:203 msgid "Not found" msgstr "" -#: actions/apistatusesupdate.php:221 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:226 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -546,8 +652,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." @@ -570,8 +679,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,29 +713,6 @@ 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/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 -#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 -#: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 -#: actions/subscribe.php:46 actions/tagother.php:166 -#: 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 "" - -#: actions/avatarsettings.php:281 actions/designadminpanel.php:103 -#: actions/emailsettings.php:256 actions/grouplogo.php:319 -#: actions/imsettings.php:220 actions/recoverpassword.php:44 -#: actions/smssettings.php:248 lib/designsettings.php:304 -msgid "Unexpected form submission." -msgstr "NeÄekaná forma submission." - #: actions/avatarsettings.php:328 msgid "Pick a square area of the image to be your avatar" msgstr "" @@ -688,19 +774,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:260 +#, fuzzy +msgid "No such group." +msgstr "Žádné takové oznámení." #: actions/blockedfromgroup.php:90 #, fuzzy, php-format @@ -769,7 +852,8 @@ msgid "Couldn't delete email confirmation." msgstr "Nelze smazat potvrzení emailu" #: actions/confirmaddress.php:144 -msgid "Confirm Address" +#, fuzzy +msgid "Confirm address" msgstr "PotvrÄ adresu" #: actions/confirmaddress.php:159 @@ -824,10 +908,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." @@ -965,7 +1045,8 @@ msgstr "" #: actions/pathsadminpanel.php:324 actions/profilesettings.php:174 #: actions/siteadminpanel.php:388 actions/smssettings.php:181 #: actions/subscriptions.php:203 actions/tagother.php:154 -#: actions/useradminpanel.php:313 lib/designsettings.php:256 +#: actions/useradminpanel.php:313 lib/applicationeditform.php:335 +#: lib/applicationeditform.php:336 lib/designsettings.php:256 #: lib/groupeditform.php:202 msgid "Save" msgstr "Uložit" @@ -986,6 +1067,83 @@ msgstr "PÅ™idat do oblíbených" msgid "No such document." msgstr "Žádný takový dokument." +#: actions/editapplication.php:54 lib/applicationeditform.php:136 +msgid "Edit application" +msgstr "" + +#: actions/editapplication.php:66 +msgid "You must be logged in to edit an application." +msgstr "" + +#: actions/editapplication.php:77 actions/showapplication.php:94 +#, fuzzy +msgid "You are not the owner of this application." +msgstr "Neodeslal jste nám profil" + +#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:163 +#: actions/showapplication.php:87 +#, fuzzy +msgid "No such application." +msgstr "Žádné takové oznámení." + +#: actions/editapplication.php:127 actions/newapplication.php:110 +#: actions/showapplication.php:118 lib/action.php:1167 +msgid "There was a problem with your session token." +msgstr "" + +#: actions/editapplication.php:161 +msgid "Use this form to edit your application." +msgstr "" + +#: actions/editapplication.php:177 actions/newapplication.php:159 +msgid "Name is required." +msgstr "" + +#: actions/editapplication.php:180 actions/newapplication.php:162 +#, fuzzy +msgid "Name is too long (max 255 chars)." +msgstr "Jméno je moc dlouhé (maximální délka je 255 znaků)" + +#: actions/editapplication.php:183 actions/newapplication.php:165 +#, fuzzy +msgid "Description is required." +msgstr "OdbÄ›ry" + +#: actions/editapplication.php:191 +msgid "Source URL is too long." +msgstr "" + +#: actions/editapplication.php:197 actions/newapplication.php:182 +#, fuzzy +msgid "Source URL is not valid." +msgstr "Stránka není platnou URL." + +#: actions/editapplication.php:200 actions/newapplication.php:185 +msgid "Organization is required." +msgstr "" + +#: actions/editapplication.php:203 actions/newapplication.php:188 +#, fuzzy +msgid "Organization is too long (max 255 chars)." +msgstr "UmístÄ›ní příliÅ¡ dlouhé (maximálnÄ› 255 znaků)" + +#: actions/editapplication.php:206 actions/newapplication.php:191 +msgid "Organization homepage is required." +msgstr "" + +#: actions/editapplication.php:215 actions/newapplication.php:203 +msgid "Callback is too long." +msgstr "" + +#: actions/editapplication.php:222 actions/newapplication.php:212 +msgid "Callback URL is not valid." +msgstr "" + +#: actions/editapplication.php:255 +#, fuzzy +msgid "Could not update application." +msgstr "Nelze aktualizovat uživatele" + #: actions/editgroup.php:56 #, php-format msgid "Edit %s group" @@ -997,7 +1155,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 @@ -1024,7 +1182,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 @@ -1054,13 +1213,15 @@ msgid "" msgstr "" #: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 +#: actions/smssettings.php:126 lib/applicationeditform.php:333 +#: lib/applicationeditform.php:334 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\"" @@ -1133,9 +1294,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." @@ -1318,14 +1480,6 @@ 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:79 #, fuzzy msgid "No such file." @@ -1344,7 +1498,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 "" @@ -1394,9 +1548,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." @@ -1418,12 +1573,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." @@ -1439,6 +1588,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 "" @@ -1566,7 +1720,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 @@ -1597,7 +1752,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 @@ -1693,7 +1849,7 @@ msgstr "" msgid "You are already subscribed to these users:" msgstr "" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:315 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 #, php-format msgid "%1$s (%2$s)" msgstr "" @@ -1734,7 +1890,7 @@ msgstr "" msgid "Optionally add a personal message to the invitation." msgstr "" -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236 msgid "Send" msgstr "Odeslat" @@ -1778,17 +1934,7 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "" -#: actions/joingroup.php:90 -#, fuzzy -msgid "You are already a member of that group" -msgstr "Již jste pÅ™ihlášen" - -#: actions/joingroup.php:128 -#, fuzzy, php-format -msgid "Could not join user %1$s to group %2$s" -msgstr "Nelze pÅ™esmÄ›rovat na server: %s" - -#: actions/joingroup.php:135 lib/command.php:239 +#: actions/joingroup.php:131 #, php-format msgid "%1$s joined group %2$s" msgstr "" @@ -1797,77 +1943,57 @@ msgstr "" msgid "You must be logged in to leave a group." msgstr "" -#: actions/leavegroup.php:90 lib/command.php:268 +#: actions/leavegroup.php:90 lib/command.php:265 #, fuzzy msgid "You are not a member of that group." msgstr "Neodeslal jste nám profil" -#: actions/leavegroup.php:119 lib/command.php:278 -msgid "Could not find membership record." -msgstr "" - -#: actions/leavegroup.php:134 lib/command.php:289 +#: actions/leavegroup.php:127 #, fuzzy, php-format 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:460 +#: 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 -#: lib/groupeditform.php:152 lib/userprofile.php:131 -msgid "Nickname" -msgstr "PÅ™ezdívka" - -#: actions/login.php:253 actions/register.php:428 -#: 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]" @@ -1887,19 +2013,40 @@ 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 %1$s in group %2$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 %1$s an admin for group %2$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" msgstr "" +#: actions/newapplication.php:52 +msgid "New application" +msgstr "" + +#: actions/newapplication.php:64 +msgid "You must be logged in to register an application." +msgstr "" + +#: actions/newapplication.php:143 +msgid "Use this form to register a new application." +msgstr "" + +#: actions/newapplication.php:173 +msgid "Source URL is required." +msgstr "" + +#: actions/newapplication.php:255 actions/newapplication.php:264 +#, fuzzy +msgid "Could not create application." +msgstr "Nelze uložin informace o obrázku" + #: actions/newgroup.php:53 msgid "New group" msgstr "Nová skupina" @@ -1912,12 +2059,12 @@ msgstr "" msgid "New message" msgstr "" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 msgid "You can't send a message to this user." msgstr "" -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:484 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 +#: lib/command.php:475 msgid "No content!" msgstr "Žádný obsah!" @@ -1925,7 +2072,7 @@ msgstr "Žádný obsah!" msgid "No recipient specified." msgstr "" -#: actions/newmessage.php:164 lib/command.php:370 +#: actions/newmessage.php:164 lib/command.php:361 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -1936,7 +2083,7 @@ msgstr "" #: 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 @@ -2007,6 +2154,49 @@ msgstr "" msgid "Nudge sent!" msgstr "" +#: actions/oauthappssettings.php:59 +msgid "You must be logged in to list your applications." +msgstr "" + +#: actions/oauthappssettings.php:74 +msgid "OAuth applications" +msgstr "" + +#: actions/oauthappssettings.php:85 +msgid "Applications you have registered" +msgstr "" + +#: actions/oauthappssettings.php:135 +#, php-format +msgid "You have not registered any applications yet." +msgstr "" + +#: actions/oauthconnectionssettings.php:71 +msgid "Connected applications" +msgstr "" + +#: actions/oauthconnectionssettings.php:87 +msgid "You have allowed the following applications to access you account." +msgstr "" + +#: actions/oauthconnectionssettings.php:170 +#, fuzzy +msgid "You are not a user of that application." +msgstr "Neodeslal jste nám profil" + +#: actions/oauthconnectionssettings.php:180 +msgid "Unable to revoke access for app: " +msgstr "" + +#: actions/oauthconnectionssettings.php:192 +#, php-format +msgid "You have not authorized any applications to use your account." +msgstr "" + +#: actions/oauthconnectionssettings.php:205 +msgid "Developers can edit the registration settings for their applications " +msgstr "" + #: actions/oembed.php:79 actions/shownotice.php:100 msgid "Notice has no profile" msgstr "SdÄ›lení nemá profil" @@ -2025,8 +2215,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:1038 +#: lib/api.php:1066 lib/api.php:1176 msgid "Not a supported data format." msgstr "" @@ -2040,7 +2230,7 @@ msgstr "" #: actions/othersettings.php:60 #, fuzzy -msgid "Other Settings" +msgid "Other settings" msgstr "Nastavení" #: actions/othersettings.php:71 @@ -2073,6 +2263,30 @@ msgstr "" msgid "URL shortening service is too long (max 50 chars)." msgstr "UmístÄ›ní příliÅ¡ dlouhé (maximálnÄ› 255 znaků)" +#: 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 #, php-format msgid "Outbox for %s" @@ -2109,7 +2323,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" @@ -2278,8 +2492,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" @@ -2342,42 +2557,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 -#: lib/groupeditform.php:161 +#: actions/profilesettings.php:115 actions/register.php:453 +#: lib/applicationeditform.php:230 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." @@ -2676,7 +2891,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 "" @@ -2689,7 +2904,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:457 +#: actions/register.php:114 actions/register.php:503 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Registrovat" @@ -2702,58 +2917,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 " @@ -2762,7 +2973,7 @@ 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, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -2781,7 +2992,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.)" @@ -2932,6 +3143,84 @@ msgstr "Neodeslal jste nám profil" msgid "User is already sandboxed." msgstr "Uživatel nemá profil." +#: actions/showapplication.php:82 +msgid "You must be logged in to view an application." +msgstr "" + +#: actions/showapplication.php:158 +#, fuzzy +msgid "Application profile" +msgstr "SdÄ›lení nemá profil" + +#: actions/showapplication.php:160 lib/applicationeditform.php:182 +msgid "Icon" +msgstr "" + +#: actions/showapplication.php:170 actions/version.php:195 +#: lib/applicationeditform.php:197 +#, fuzzy +msgid "Name" +msgstr "PÅ™ezdívka" + +#: actions/showapplication.php:179 lib/applicationeditform.php:224 +#, fuzzy +msgid "Organization" +msgstr "UmístÄ›ní" + +#: actions/showapplication.php:188 actions/version.php:198 +#: lib/applicationeditform.php:211 lib/groupeditform.php:172 +#, fuzzy +msgid "Description" +msgstr "OdbÄ›ry" + +#: actions/showapplication.php:193 actions/showgroup.php:429 +#: lib/profileaction.php:174 +msgid "Statistics" +msgstr "Statistiky" + +#: actions/showapplication.php:204 +#, php-format +msgid "created by %1$s - %2$s access by default - %3$d users" +msgstr "" + +#: actions/showapplication.php:214 +msgid "Application actions" +msgstr "" + +#: actions/showapplication.php:233 +msgid "Reset key & secret" +msgstr "" + +#: actions/showapplication.php:241 +msgid "Application info" +msgstr "" + +#: actions/showapplication.php:243 +msgid "Consumer key" +msgstr "" + +#: actions/showapplication.php:248 +msgid "Consumer secret" +msgstr "" + +#: actions/showapplication.php:253 +msgid "Request token URL" +msgstr "" + +#: actions/showapplication.php:258 +msgid "Access token URL" +msgstr "" + +#: actions/showapplication.php:263 +msgid "Authorize URL" +msgstr "" + +#: actions/showapplication.php:268 +msgid "" +"Note: We support HMAC-SHA1 signatures. We do not support the plaintext " +"signature method." +msgstr "" + #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "" @@ -3031,7 +3320,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 "" @@ -3039,10 +3328,6 @@ msgstr "" msgid "All members" msgstr "" -#: actions/showgroup.php:429 lib/profileaction.php:174 -msgid "Statistics" -msgstr "Statistiky" - #: actions/showgroup.php:432 #, fuzzy msgid "Created" @@ -3183,12 +3468,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 @@ -3376,8 +3661,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 @@ -3406,8 +3692,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" @@ -3656,11 +3943,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" @@ -3868,11 +4150,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" @@ -3950,11 +4227,6 @@ msgstr "" 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" @@ -3964,28 +4236,43 @@ msgstr "Osobní" msgid "Author(s)" msgstr "" -#: actions/version.php:198 lib/groupeditform.php:172 -#, fuzzy -msgid "Description" -msgstr "OdbÄ›ry" - -#: classes/File.php:137 +#: 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/Group_member.php:41 +#, fuzzy +msgid "Group join failed." +msgstr "Žádné takové oznámení." + +#: classes/Group_member.php:53 +#, fuzzy +msgid "Not part of group." +msgstr "Nelze aktualizovat uživatele" + +#: classes/Group_member.php:60 +#, fuzzy +msgid "Group leave failed." +msgstr "Žádné takové oznámení." + +#: 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 "" @@ -3998,51 +4285,51 @@ msgstr "" msgid "Could not update message with new URI." msgstr "" -#: classes/Notice.php:172 +#: classes/Notice.php:171 #, php-format msgid "DB error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:226 +#: classes/Notice.php:225 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Problém pÅ™i ukládání sdÄ›lení" -#: classes/Notice.php:230 +#: classes/Notice.php:229 #, fuzzy msgid "Problem saving notice. Unknown user." msgstr "Problém pÅ™i ukládání sdÄ›lení" -#: classes/Notice.php:235 +#: classes/Notice.php:234 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:241 +#: classes/Notice.php:240 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:247 +#: classes/Notice.php:246 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:309 classes/Notice.php:334 +#: classes/Notice.php:305 classes/Notice.php:330 msgid "Problem saving notice." msgstr "Problém pÅ™i ukládání sdÄ›lení" -#: classes/Notice.php:1034 +#: classes/Notice.php:1052 #, php-format msgid "DB error inserting reply: %s" msgstr "Chyba v DB pÅ™i vkládání odpovÄ›di: %s" -#: classes/Notice.php:1359 +#: classes/Notice.php:1423 #, php-format msgid "RT @%1$s %2$s" msgstr "" -#: classes/User.php:368 +#: classes/User.php:382 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" @@ -4087,6 +4374,11 @@ msgstr "" msgid "Other options" msgstr "" +#: lib/action.php:144 +#, fuzzy, php-format +msgid "%1$s - %2$s" +msgstr "%1 statusů na %2" + #: lib/action.php:159 msgid "Untitled page" msgstr "" @@ -4103,11 +4395,6 @@ msgstr "Domů" msgid "Personal profile and friends timeline" msgstr "" -#: lib/action.php:435 -#, fuzzy -msgid "Account" -msgstr "O nás" - #: lib/action.php:435 msgid "Change your email, avatar, password, profile" msgstr "" @@ -4271,10 +4558,6 @@ msgstr "« NovÄ›jší" msgid "Before" msgstr "Starší »" -#: lib/action.php:1167 -msgid "There was a problem with your session token." -msgstr "" - #: lib/adminpanelaction.php:96 msgid "You cannot make changes to this site." msgstr "" @@ -4310,6 +4593,72 @@ msgstr "Potvrzení emailové adresy" msgid "Paths configuration" msgstr "Potvrzení emailové adresy" +#: lib/applicationeditform.php:186 +msgid "Icon for this application" +msgstr "" + +#: lib/applicationeditform.php:206 +#, fuzzy, php-format +msgid "Describe your application in %d characters" +msgstr "PopiÅ¡ sebe a své zájmy ve 140 znacích" + +#: lib/applicationeditform.php:209 +#, fuzzy +msgid "Describe your application" +msgstr "PopiÅ¡ sebe a své zájmy ve 140 znacích" + +#: lib/applicationeditform.php:218 +#, fuzzy +msgid "Source URL" +msgstr "Zdroj" + +#: lib/applicationeditform.php:220 +#, fuzzy +msgid "URL of the homepage of this application" +msgstr "Adresa vaÅ¡ich stránek, blogu nebo profilu na jiných stránkách." + +#: lib/applicationeditform.php:226 +msgid "Organization responsible for this application" +msgstr "" + +#: lib/applicationeditform.php:232 +#, fuzzy +msgid "URL for the homepage of the organization" +msgstr "Adresa vaÅ¡ich stránek, blogu nebo profilu na jiných stránkách." + +#: lib/applicationeditform.php:238 +msgid "URL to redirect to after authentication" +msgstr "" + +#: lib/applicationeditform.php:260 +msgid "Browser" +msgstr "" + +#: lib/applicationeditform.php:276 +msgid "Desktop" +msgstr "" + +#: lib/applicationeditform.php:277 +msgid "Type of application, browser or desktop" +msgstr "" + +#: lib/applicationeditform.php:299 +msgid "Read-only" +msgstr "" + +#: lib/applicationeditform.php:317 +msgid "Read-write" +msgstr "" + +#: lib/applicationeditform.php:318 +msgid "Default access for this application: read-only, or read-write" +msgstr "" + +#: lib/applicationlist.php:154 +#, fuzzy +msgid "Revoke" +msgstr "Odstranit" + #: lib/attachmentlist.php:87 msgid "Attachments" msgstr "" @@ -4330,12 +4679,12 @@ msgstr "" msgid "Tags for this attachment" msgstr "" -#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 +#: lib/authenticationplugin.php:214 lib/authenticationplugin.php:219 #, fuzzy msgid "Password changing failed" msgstr "Heslo uloženo" -#: lib/authenticationplugin.php:197 +#: lib/authenticationplugin.php:229 #, fuzzy msgid "Password changing is not allowed" msgstr "Heslo uloženo" @@ -4357,8 +4706,8 @@ msgid "Sorry, this command is not yet implemented." msgstr "" #: lib/command.php:88 -#, fuzzy, php-format -msgid "Could not find a user with nickname %s." +#, php-format +msgid "Could not find a user with nickname %s" msgstr "Nelze aktualizovat uživatele" #: lib/command.php:92 @@ -4366,9 +4715,9 @@ msgid "It does not make a lot of sense to nudge yourself!" msgstr "" #: lib/command.php:99 -#, php-format -msgid "Nudge sent to %s." -msgstr "" +#, fuzzy, php-format +msgid "Nudge sent to %s" +msgstr "OdpovÄ›di na %s" #: lib/command.php:126 #, php-format @@ -4378,174 +4727,199 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:399 lib/command.php:460 +#: lib/command.php:152 lib/command.php:390 lib/command.php:451 #, fuzzy -msgid "Notice with that id does not exist." +msgid "Notice with that id does not exist" msgstr "Vzdálený profil s nesouhlasícím profilem" -#: lib/command.php:168 lib/command.php:415 lib/command.php:476 -#: lib/command.php:532 +#: lib/command.php:168 lib/command.php:406 lib/command.php:467 +#: lib/command.php:523 #, fuzzy -msgid "User has no last notice." +msgid "User has no last notice" msgstr "Uživatel nemá profil." #: lib/command.php:190 msgid "Notice marked as fave." msgstr "" -#: lib/command.php:284 +#: lib/command.php:217 +#, fuzzy +msgid "You are already a member of that group" +msgstr "Již jste pÅ™ihlášen" + +#: lib/command.php:231 #, fuzzy, php-format -msgid "Could not remove user %1$s to group %2$s." +msgid "Could not join user %s to group %s" +msgstr "Nelze pÅ™esmÄ›rovat na server: %s" + +#: lib/command.php:236 +#, fuzzy, php-format +msgid "%s joined group %s" +msgstr "%1 statusů na %2" + +#: lib/command.php:275 +#, fuzzy, php-format +msgid "Could not remove user %s to group %s" msgstr "Nelze vytvoÅ™it OpenID z: %s" -#: lib/command.php:318 -#, php-format -msgid "Fullname: %s" -msgstr "" +#: lib/command.php:280 +#, fuzzy, php-format +msgid "%s left group %s" +msgstr "%1 statusů na %2" -#: lib/command.php:321 +#: lib/command.php:309 +#, fuzzy, php-format +msgid "Fullname: %s" +msgstr "Celé jméno" + +#: lib/command.php:312 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "" -#: lib/command.php:324 +#: lib/command.php:315 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "" -#: lib/command.php:327 +#: lib/command.php:318 #, php-format msgid "About: %s" msgstr "" -#: lib/command.php:358 +#: lib/command.php:349 #, php-format -msgid "Message too long - maximum is %1$d characters, you sent %2$d." +msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:376 +#: lib/command.php:367 #, php-format -msgid "Direct message to %s sent." +msgid "Direct message to %s sent" msgstr "" -#: lib/command.php:378 +#: lib/command.php:369 msgid "Error sending direct message." msgstr "" -#: lib/command.php:435 +#: lib/command.php:413 +#, fuzzy +msgid "Cannot repeat your own notice" +msgstr "Nemůžete se registrovat, pokud nesouhlasíte s licencí." + +#: lib/command.php:418 +#, fuzzy +msgid "Already repeated that notice" +msgstr "Odstranit toto oznámení" + +#: lib/command.php:426 #, fuzzy, php-format -msgid "Notice from %s repeated." +msgid "Notice from %s repeated" msgstr "SdÄ›lení" -#: lib/command.php:437 +#: lib/command.php:428 #, fuzzy msgid "Error repeating notice." msgstr "Problém pÅ™i ukládání sdÄ›lení" -#: lib/command.php:491 +#: lib/command.php:482 #, php-format -msgid "Notice too long - maximum is %1$d characters, you sent %2$d." +msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:500 +#: lib/command.php:491 #, fuzzy, php-format -msgid "Reply to %s sent." +msgid "Reply to %s sent" msgstr "OdpovÄ›di na %s" -#: lib/command.php:502 +#: lib/command.php:493 #, fuzzy msgid "Error saving notice." msgstr "Problém pÅ™i ukládání sdÄ›lení" -#: lib/command.php:556 -msgid "Specify the name of the user to subscribe to." +#: lib/command.php:547 +msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:563 +#: lib/command.php:554 #, php-format msgid "Subscribed to %s" msgstr "" -#: lib/command.php:584 -msgid "Specify the name of the user to unsubscribe from." +#: lib/command.php:575 +msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:591 +#: lib/command.php:582 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:609 lib/command.php:632 +#: lib/command.php:600 lib/command.php:623 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:612 +#: lib/command.php:603 msgid "Notification off." msgstr "" -#: lib/command.php:614 +#: lib/command.php:605 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:635 +#: lib/command.php:626 msgid "Notification on." msgstr "" -#: lib/command.php:637 +#: lib/command.php:628 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:650 -msgid "Login command is disabled." +#: lib/command.php:641 +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:652 #, php-format -msgid "This link is useable only once, and is good for only 2 minutes: %s." +msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:685 +#: lib/command.php:668 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Neodeslal jste nám profil" -#: lib/command.php:687 +#: lib/command.php:670 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:690 #, fuzzy msgid "No one is subscribed to you." msgstr "Vzdálený odbÄ›r" -#: lib/command.php:709 +#: lib/command.php:692 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:712 #, fuzzy msgid "You are not a member of any groups." msgstr "Neodeslal jste nám profil" -#: lib/command.php:731 +#: lib/command.php:714 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:728 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4586,20 +4960,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:199 +#: lib/common.php:131 #, fuzzy msgid "No configuration file found. " msgstr "Žádný potvrzující kód." -#: lib/common.php:200 +#: lib/common.php:132 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:201 +#: lib/common.php:134 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:202 +#: lib/common.php:135 msgid "Go to the installer." msgstr "" @@ -4615,6 +4989,15 @@ msgstr "" msgid "Updates by SMS" msgstr "" +#: lib/connectsettingsaction.php:120 +#, fuzzy +msgid "Connections" +msgstr "PÅ™ipojit" + +#: lib/connectsettingsaction.php:121 +msgid "Authorized connected applications" +msgstr "" + #: lib/dberroraction.php:60 msgid "Database error" msgstr "" @@ -4805,11 +5188,16 @@ msgstr "" msgid "kB" msgstr "" -#: lib/jabber.php:191 +#: lib/jabber.php:202 #, php-format msgid "[%s]" msgstr "" +#: lib/jabber.php:385 +#, php-format +msgid "Unknown inbox source %d." +msgstr "" + #: lib/joinform.php:114 msgid "Join" msgstr "PÅ™idat se" @@ -4876,22 +5264,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 @@ -5078,7 +5454,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 @@ -5087,7 +5463,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 @@ -5097,7 +5473,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 @@ -5133,16 +5509,18 @@ msgstr "" #: lib/noticeform.php:212 #, fuzzy -msgid "Share my location." -msgstr "Nelze uložit profil" - -#: lib/noticeform.php:214 -#, fuzzy -msgid "Do not share my location." +msgid "Share my location" msgstr "Nelze uložit profil" #: lib/noticeform.php:215 -msgid "Hide this info" +#, fuzzy +msgid "Do not share my location" +msgstr "Nelze uložit profil" + +#: lib/noticeform.php:216 +msgid "" +"Sorry, retrieving your geo location is taking longer than expected, please " +"try again later" msgstr "" #: lib/noticelist.php:428 @@ -5417,25 +5795,25 @@ msgstr "" msgid "User has blocked you." msgstr "Uživatel nemá profil." -#: lib/subs.php:60 +#: lib/subs.php:63 msgid "Could not subscribe." msgstr "" -#: lib/subs.php:79 +#: lib/subs.php:82 msgid "Could not subscribe other to you." msgstr "" -#: lib/subs.php:128 +#: lib/subs.php:137 #, fuzzy msgid "Not subscribed!" msgstr "NepÅ™ihlášen!" -#: lib/subs.php:133 +#: lib/subs.php:142 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "Nelze smazat odebírání" -#: lib/subs.php:146 +#: lib/subs.php:158 msgid "Couldn't delete subscription." msgstr "Nelze smazat odebírání" @@ -5449,10 +5827,6 @@ msgstr "" msgid "People Tagcloud as tagged" msgstr "" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "" - #: lib/tagcloudsection.php:56 msgid "None" msgstr "" @@ -5516,47 +5890,47 @@ msgstr "Zpráva" msgid "Moderate" msgstr "" -#: lib/util.php:837 +#: lib/util.php:875 msgid "a few seconds ago" msgstr "pÅ™ed pár sekundami" -#: lib/util.php:839 +#: lib/util.php:877 msgid "about a minute ago" msgstr "asi pÅ™ed minutou" -#: lib/util.php:841 +#: lib/util.php:879 #, php-format msgid "about %d minutes ago" msgstr "asi pÅ™ed %d minutami" -#: lib/util.php:843 +#: lib/util.php:881 msgid "about an hour ago" msgstr "asi pÅ™ed hodinou" -#: lib/util.php:845 +#: lib/util.php:883 #, php-format msgid "about %d hours ago" msgstr "asi pÅ™ed %d hodinami" -#: lib/util.php:847 +#: lib/util.php:885 msgid "about a day ago" msgstr "asi pÅ™ede dnem" -#: lib/util.php:849 +#: lib/util.php:887 #, php-format msgid "about %d days ago" msgstr "pÅ™ed %d dny" -#: lib/util.php:851 +#: lib/util.php:889 msgid "about a month ago" msgstr "asi pÅ™ed mÄ›sícem" -#: lib/util.php:853 +#: lib/util.php:891 #, php-format msgid "about %d months ago" msgstr "asi pÅ™ed %d mesíci" -#: lib/util.php:855 +#: lib/util.php:893 msgid "about a year ago" msgstr "asi pÅ™ed rokem" @@ -5572,5 +5946,5 @@ msgstr "" #: scripts/xmppdaemon.php:301 #, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po index 2f3c3955ab..3a06b9870f 100644 --- a/locale/de/LC_MESSAGES/statusnet.po +++ b/locale/de/LC_MESSAGES/statusnet.po @@ -12,12 +12,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-10 00:46+0000\n" -"PO-Revision-Date: 2010-01-10 00:47:22+0000\n" +"POT-Creation-Date: 2010-01-15 19:15+0000\n" +"PO-Revision-Date: 2010-01-15 19:16:32+0000\n" "Language-Team: German\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60878); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r61101); 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" @@ -37,25 +37,30 @@ msgstr "Seite nicht vorhanden" #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 +#: actions/apistatusesupdate.php:149 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 #: 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 #: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 -#: lib/command.php:163 lib/command.php:311 lib/command.php:364 -#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/command.php:163 lib/command.php:302 lib/command.php:355 +#: lib/command.php:401 lib/command.php:462 lib/command.php:518 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/subs.php:34 lib/subs.php:125 msgid "No such user." msgstr "Unbekannter Benutzer." +#: actions/all.php:84 +#, fuzzy, php-format +msgid "%1$s and friends, page %2$d" +msgstr "%s blockierte Benutzerprofile, Seite %d" + #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 +#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -117,7 +122,7 @@ msgstr "" msgid "You and friends" msgstr "Du und Freunde" -#: actions/allrss.php:119 actions/apitimelinefriends.php:122 +#: actions/allrss.php:119 actions/apitimelinefriends.php:121 #: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" @@ -128,6 +133,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:155 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." @@ -141,7 +163,7 @@ msgstr "API-Methode nicht gefunden." #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:114 +#: actions/apistatusesupdate.php:119 msgid "This method requires a POST." msgstr "Diese Methode benötigt ein POST." @@ -170,8 +192,9 @@ msgstr "Konnte Profil nicht speichern." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257 -#: actions/designadminpanel.php:122 actions/newnotice.php:94 +#: actions/apistatusesupdate.php:132 actions/avatarsettings.php:257 +#: actions/designadminpanel.php:122 actions/editapplication.php:118 +#: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format msgid "" @@ -183,6 +206,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." @@ -223,26 +249,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!" @@ -269,7 +275,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 @@ -277,7 +283,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 @@ -298,7 +304,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 @@ -333,7 +339,8 @@ msgstr "Nutzername wird bereits verwendet. Suche dir einen anderen aus." msgid "Not a valid nickname." msgstr "Ungültiger Nutzername." -#: actions/apigroupcreate.php:196 actions/editgroup.php:195 +#: actions/apigroupcreate.php:196 actions/editapplication.php:212 +#: actions/editgroup.php:195 actions/newapplication.php:200 #: actions/newgroup.php:139 actions/profilesettings.php:222 #: actions/register.php:217 msgid "Homepage is not a valid URL." @@ -346,7 +353,8 @@ msgstr "" msgid "Full name is too long (max 255 chars)." msgstr "Der vollständige Name ist zu lang (maximal 255 Zeichen)." -#: actions/apigroupcreate.php:213 +#: actions/apigroupcreate.php:213 actions/editapplication.php:187 +#: actions/newapplication.php:169 #, php-format msgid "Description is too long (max %d chars)." msgstr "Die Beschreibung ist zu lang (max. %d Zeichen)." @@ -386,7 +394,7 @@ msgstr "Alias kann nicht das gleiche wie der Spitznamen sein." msgid "Group not found!" msgstr "Gruppe nicht gefunden!" -#: actions/apigroupjoin.php:110 lib/command.php:217 +#: actions/apigroupjoin.php:110 actions/joingroup.php:90 msgid "You are already a member of that group." msgstr "Du bist bereits Mitglied dieser Gruppe" @@ -394,8 +402,8 @@ 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 lib/command.php:234 -#, fuzzy, php-format +#: actions/apigroupjoin.php:138 actions/joingroup.php:124 +#, php-format msgid "Could not join user %1$s to group %2$s." msgstr "Konnte Benutzer %s nicht der Gruppe %s hinzufügen." @@ -403,7 +411,7 @@ msgstr "Konnte Benutzer %s nicht der Gruppe %s hinzufügen." msgid "You are not a member of this group." msgstr "Du bist kein Mitglied dieser Gruppe." -#: actions/apigroupleave.php:124 actions/leavegroup.php:127 +#: actions/apigroupleave.php:124 actions/leavegroup.php:119 #, fuzzy, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "Konnte Benutzer %s nicht aus der Gruppe %s entfernen." @@ -423,6 +431,101 @@ msgstr "%s Gruppen" msgid "groups on %s" msgstr "Gruppen von %s" +#: actions/apioauthauthorize.php:108 actions/apioauthauthorize.php:114 +msgid "Bad request." +msgstr "" + +#: actions/apioauthauthorize.php:134 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:115 actions/makeadmin.php:66 +#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 +#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:139 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 +#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/subscribe.php:46 actions/tagother.php:166 +#: 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 "Es gab ein Problem mit deinem Sitzungstoken. Bitte versuche es erneut." + +#: actions/apioauthauthorize.php:146 +#, fuzzy +msgid "Invalid nickname / password!" +msgstr "Benutzername oder Passwort falsch." + +#: actions/apioauthauthorize.php:170 +#, fuzzy +msgid "DB error deleting OAuth app user." +msgstr "Fehler bei den Nutzereinstellungen." + +#: actions/apioauthauthorize.php:196 +#, fuzzy +msgid "DB error inserting OAuth app user." +msgstr "Datenbankfehler beim Einfügen des Hashtags: %s" + +#: actions/apioauthauthorize.php:231 +#, php-format +msgid "" +"The request token %s has been authorized. Please exchange it for an access " +"token." +msgstr "" + +#: actions/apioauthauthorize.php:241 +#, php-format +msgid "The request token %s has been denied." +msgstr "" + +#: actions/apioauthauthorize.php:246 actions/avatarsettings.php:281 +#: actions/designadminpanel.php:103 actions/editapplication.php:139 +#: actions/emailsettings.php:256 actions/grouplogo.php:319 +#: actions/imsettings.php:220 actions/newapplication.php:121 +#: actions/oauthconnectionssettings.php:151 actions/recoverpassword.php:44 +#: actions/smssettings.php:248 lib/designsettings.php:304 +msgid "Unexpected form submission." +msgstr "Unerwartete Formulareingabe." + +#: actions/apioauthauthorize.php:273 +msgid "An application would like to connect to your account" +msgstr "" + +#: actions/apioauthauthorize.php:290 +msgid "Allow or deny access" +msgstr "" + +#: actions/apioauthauthorize.php:320 lib/action.php:435 +msgid "Account" +msgstr "Konto" + +#: actions/apioauthauthorize.php:323 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/apioauthauthorize.php:326 actions/login.php:233 +#: actions/register.php:429 lib/accountsettingsaction.php:116 +msgid "Password" +msgstr "Passwort" + +#: actions/apioauthauthorize.php:338 +msgid "Deny" +msgstr "" + +#: actions/apioauthauthorize.php:344 +#, fuzzy +msgid "Allow" +msgstr "Alle" + +#: actions/apioauthauthorize.php:361 +msgid "Allow or deny access to your account information." +msgstr "" + #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." msgstr "Diese Methode benötigt ein POST oder DELETE." @@ -436,11 +539,11 @@ msgstr "Du kannst den Status eines anderen Benutzers nicht löschen." msgid "No such notice." msgstr "Unbekannte Nachricht." -#: actions/apistatusesretweet.php:83 lib/command.php:422 +#: actions/apistatusesretweet.php:83 msgid "Cannot repeat your own notice." msgstr "Du kannst deine eigenen Nachrichten nicht wiederholen." -#: actions/apistatusesretweet.php:91 lib/command.php:427 +#: actions/apistatusesretweet.php:91 msgid "Already repeated that notice." msgstr "Nachricht bereits wiederholt" @@ -452,18 +555,18 @@ msgstr "Status gelöscht." msgid "No status with that ID found." msgstr "Keine Nachricht mit dieser ID gefunden." -#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:162 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" "Das war zu lang. Die Länge einer Nachricht ist auf %d Zeichen beschränkt." -#: actions/apistatusesupdate.php:198 +#: actions/apistatusesupdate.php:203 msgid "Not found" msgstr "Nicht gefunden" -#: actions/apistatusesupdate.php:221 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:226 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -549,8 +652,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." @@ -574,8 +680,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" @@ -607,29 +713,6 @@ 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/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 -#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 -#: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 -#: actions/subscribe.php:46 actions/tagother.php:166 -#: 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 "Es gab ein Problem mit deinem Sitzungstoken. Bitte versuche es erneut." - -#: actions/avatarsettings.php:281 actions/designadminpanel.php:103 -#: actions/emailsettings.php:256 actions/grouplogo.php:319 -#: actions/imsettings.php:220 actions/recoverpassword.php:44 -#: actions/smssettings.php:248 lib/designsettings.php:304 -msgid "Unexpected form submission." -msgstr "Unerwartete Formulareingabe." - #: actions/avatarsettings.php:328 msgid "Pick a square area of the image to be your avatar" msgstr "" @@ -689,19 +772,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:260 +msgid "No such group." +msgstr "Keine derartige Gruppe." #: actions/blockedfromgroup.php:90 #, php-format @@ -768,7 +847,8 @@ msgid "Couldn't delete email confirmation." msgstr "Konnte E-Mail-Bestätigung nicht löschen." #: actions/confirmaddress.php:144 -msgid "Confirm Address" +#, fuzzy +msgid "Confirm address" msgstr "Adresse bestätigen" #: actions/confirmaddress.php:159 @@ -823,10 +903,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." @@ -958,7 +1034,8 @@ msgstr "Standard wiederherstellen" #: actions/pathsadminpanel.php:324 actions/profilesettings.php:174 #: actions/siteadminpanel.php:388 actions/smssettings.php:181 #: actions/subscriptions.php:203 actions/tagother.php:154 -#: actions/useradminpanel.php:313 lib/designsettings.php:256 +#: actions/useradminpanel.php:313 lib/applicationeditform.php:335 +#: lib/applicationeditform.php:336 lib/designsettings.php:256 #: lib/groupeditform.php:202 msgid "Save" msgstr "Speichern" @@ -979,6 +1056,87 @@ msgstr "Zu Favoriten hinzufügen" msgid "No such document." msgstr "Unbekanntes Dokument." +#: actions/editapplication.php:54 lib/applicationeditform.php:136 +msgid "Edit application" +msgstr "" + +#: actions/editapplication.php:66 +#, fuzzy +msgid "You must be logged in to edit an application." +msgstr "Du musst angemeldet sein, um eine Gruppe zu bearbeiten." + +#: actions/editapplication.php:77 actions/showapplication.php:94 +#, fuzzy +msgid "You are not the owner of this application." +msgstr "Du bist kein Mitglied dieser Gruppe." + +#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:163 +#: actions/showapplication.php:87 +#, fuzzy +msgid "No such application." +msgstr "Unbekannte Nachricht." + +#: actions/editapplication.php:127 actions/newapplication.php:110 +#: actions/showapplication.php:118 lib/action.php:1167 +msgid "There was a problem with your session token." +msgstr "Es gab ein Problem mit deinem Sessiontoken." + +#: actions/editapplication.php:161 +#, fuzzy +msgid "Use this form to edit your application." +msgstr "Benutze dieses Formular, um die Gruppe zu bearbeiten." + +#: actions/editapplication.php:177 actions/newapplication.php:159 +#, fuzzy +msgid "Name is required." +msgstr "Gleiches Passwort wie zuvor. Pflichteingabe." + +#: actions/editapplication.php:180 actions/newapplication.php:162 +#, fuzzy +msgid "Name is too long (max 255 chars)." +msgstr "Der vollständige Name ist zu lang (maximal 255 Zeichen)." + +#: actions/editapplication.php:183 actions/newapplication.php:165 +#, fuzzy +msgid "Description is required." +msgstr "Beschreibung" + +#: actions/editapplication.php:191 +msgid "Source URL is too long." +msgstr "" + +#: actions/editapplication.php:197 actions/newapplication.php:182 +#, fuzzy +msgid "Source URL is not valid." +msgstr "" +"Homepage ist keine gültige URL. URL’s müssen ein Präfix wie http enthalten." + +#: actions/editapplication.php:200 actions/newapplication.php:185 +msgid "Organization is required." +msgstr "" + +#: actions/editapplication.php:203 actions/newapplication.php:188 +#, fuzzy +msgid "Organization is too long (max 255 chars)." +msgstr "Der eingegebene Aufenthaltsort ist zu lang (maximal 255 Zeichen)." + +#: actions/editapplication.php:206 actions/newapplication.php:191 +msgid "Organization homepage is required." +msgstr "" + +#: actions/editapplication.php:215 actions/newapplication.php:203 +msgid "Callback is too long." +msgstr "" + +#: actions/editapplication.php:222 actions/newapplication.php:212 +msgid "Callback URL is not valid." +msgstr "" + +#: actions/editapplication.php:255 +#, fuzzy +msgid "Could not update application." +msgstr "Konnte Gruppe nicht aktualisieren." + #: actions/editgroup.php:56 #, php-format msgid "Edit %s group" @@ -990,7 +1148,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 @@ -1015,7 +1174,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 @@ -1047,13 +1207,15 @@ msgstr "" "(auch den Spam-Ordner) auf eine Nachricht mit weiteren Instruktionen." #: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 +#: actions/smssettings.php:126 lib/applicationeditform.php:333 +#: lib/applicationeditform.php:334 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\"" @@ -1130,9 +1292,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." @@ -1309,13 +1472,6 @@ 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:79 msgid "No such file." msgstr "Datei nicht gefunden." @@ -1332,7 +1488,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." @@ -1377,8 +1533,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 @@ -1400,12 +1557,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." @@ -1422,6 +1573,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." @@ -1547,7 +1703,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 @@ -1578,7 +1735,8 @@ msgstr "" "Freundesliste hinzugefügt?)" #: actions/imsettings.php:124 -msgid "IM Address" +#, fuzzy +msgid "IM address" msgstr "IM-Adresse" #: actions/imsettings.php:126 @@ -1679,7 +1837,7 @@ 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 lib/command.php:315 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -1729,7 +1887,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:234 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236 msgid "Send" msgstr "Senden" @@ -1798,16 +1956,7 @@ 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 -msgid "You are already a member of that group" -msgstr "Du bist bereits Mitglied dieser Gruppe" - -#: actions/joingroup.php:128 -#, fuzzy, php-format -msgid "Could not join user %1$s to group %2$s" -msgstr "Konnte Benutzer %s nicht der Gruppe %s hinzufügen" - -#: actions/joingroup.php:135 lib/command.php:239 +#: actions/joingroup.php:131 #, fuzzy, php-format msgid "%1$s joined group %2$s" msgstr "%s ist der Gruppe %s beigetreten" @@ -1816,69 +1965,50 @@ msgstr "%s ist der Gruppe %s beigetreten" msgid "You must be logged in to leave a group." msgstr "Du musst angemeldet sein, um aus einer Gruppe auszutreten." -#: actions/leavegroup.php:90 lib/command.php:268 +#: actions/leavegroup.php:90 lib/command.php:265 msgid "You are not a member of that group." msgstr "Du bist kein Mitglied dieser Gruppe." -#: actions/leavegroup.php:119 lib/command.php:278 -msgid "Could not find membership record." -msgstr "Konnte Mitgliedseintrag nicht finden." - -#: actions/leavegroup.php:134 lib/command.php:289 +#: actions/leavegroup.php:127 #, 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:460 +#: 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 -#: lib/groupeditform.php:152 lib/userprofile.php:131 -msgid "Nickname" -msgstr "Nutzername" - -#: actions/login.php:253 actions/register.php:428 -#: 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." @@ -1886,7 +2016,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]" @@ -1905,19 +2035,42 @@ 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 %1$s in group %2$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 #, fuzzy, php-format -msgid "Can't make %1$s an admin for group %2$s" +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 msgid "No current status" msgstr "Kein aktueller Status" +#: actions/newapplication.php:52 +msgid "New application" +msgstr "" + +#: actions/newapplication.php:64 +#, fuzzy +msgid "You must be logged in to register an application." +msgstr "Du musst angemeldet sein, um eine Gruppe zu erstellen." + +#: actions/newapplication.php:143 +#, fuzzy +msgid "Use this form to register a new application." +msgstr "Benutzer dieses Formular, um eine neue Gruppe zu erstellen." + +#: actions/newapplication.php:173 +msgid "Source URL is required." +msgstr "" + +#: actions/newapplication.php:255 actions/newapplication.php:264 +#, fuzzy +msgid "Could not create application." +msgstr "Konnte keinen Favoriten erstellen." + #: actions/newgroup.php:53 msgid "New group" msgstr "Neue Gruppe" @@ -1930,12 +2083,12 @@ msgstr "Benutzer dieses Formular, um eine neue Gruppe zu erstellen." msgid "New message" msgstr "Neue Nachricht" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 msgid "You can't send a message to this user." msgstr "Du kannst diesem Benutzer keine Nachricht schicken." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:484 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 +#: lib/command.php:475 msgid "No content!" msgstr "Kein Inhalt!" @@ -1943,7 +2096,7 @@ msgstr "Kein Inhalt!" msgid "No recipient specified." msgstr "Kein Empfänger angegeben." -#: actions/newmessage.php:164 lib/command.php:370 +#: actions/newmessage.php:164 lib/command.php:361 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -1954,8 +2107,8 @@ msgid "Message sent" msgstr "Nachricht gesendet" #: actions/newmessage.php:185 -#, php-format -msgid "Direct message to %s sent" +#, fuzzy, php-format +msgid "Direct message to %s sent." msgstr "Direkte Nachricht an %s abgeschickt" #: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 @@ -2028,6 +2181,51 @@ msgstr "Stups abgeschickt" msgid "Nudge sent!" msgstr "Stups gesendet!" +#: actions/oauthappssettings.php:59 +#, fuzzy +msgid "You must be logged in to list your applications." +msgstr "Du musst angemeldet sein, um eine Gruppe zu bearbeiten." + +#: actions/oauthappssettings.php:74 +#, fuzzy +msgid "OAuth applications" +msgstr "Sonstige Optionen" + +#: actions/oauthappssettings.php:85 +msgid "Applications you have registered" +msgstr "" + +#: actions/oauthappssettings.php:135 +#, php-format +msgid "You have not registered any applications yet." +msgstr "" + +#: actions/oauthconnectionssettings.php:71 +msgid "Connected applications" +msgstr "" + +#: actions/oauthconnectionssettings.php:87 +msgid "You have allowed the following applications to access you account." +msgstr "" + +#: actions/oauthconnectionssettings.php:170 +#, fuzzy +msgid "You are not a user of that application." +msgstr "Du bist kein Mitglied dieser Gruppe." + +#: actions/oauthconnectionssettings.php:180 +msgid "Unable to revoke access for app: " +msgstr "" + +#: actions/oauthconnectionssettings.php:192 +#, php-format +msgid "You have not authorized any applications to use your account." +msgstr "" + +#: actions/oauthconnectionssettings.php:205 +msgid "Developers can edit the registration settings for their applications " +msgstr "" + #: actions/oembed.php:79 actions/shownotice.php:100 msgid "Notice has no profile" msgstr "Nachricht hat kein Profil" @@ -2045,8 +2243,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:1038 +#: lib/api.php:1066 lib/api.php:1176 msgid "Not a supported data format." msgstr "Kein unterstütztes Datenformat." @@ -2059,7 +2257,8 @@ msgid "Notice Search" msgstr "Nachrichtensuche" #: actions/othersettings.php:60 -msgid "Other Settings" +#, fuzzy +msgid "Other settings" msgstr "Andere Einstellungen" #: actions/othersettings.php:71 @@ -2090,6 +2289,31 @@ msgstr "" msgid "URL shortening service is too long (max 50 chars)." msgstr "URL-Auto-Kürzungs-Dienst ist zu lang (max. 50 Zeichen)." +#: 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 msgid "Outbox for %s" @@ -2125,7 +2349,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" @@ -2288,7 +2512,8 @@ msgid "When to use SSL" msgstr "Wann soll SSL verwendet werden" #: actions/pathsadminpanel.php:308 -msgid "SSL Server" +#, fuzzy +msgid "SSL server" msgstr "SSL-Server" #: actions/pathsadminpanel.php:309 @@ -2353,43 +2578,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 -#: lib/groupeditform.php:161 +#: actions/profilesettings.php:115 actions/register.php:453 +#: lib/applicationeditform.php:230 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“" @@ -2690,7 +2915,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." @@ -2702,7 +2927,7 @@ msgstr "Entschuldigung, ungültiger Bestätigungscode." msgid "Registration successful" msgstr "Registrierung erfolgreich" -#: actions/register.php:114 actions/register.php:502 lib/action.php:457 +#: actions/register.php:114 actions/register.php:503 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Registrieren" @@ -2716,62 +2941,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." @@ -2779,7 +3000,7 @@ msgstr "" "außer folgende private Daten: Passwort, E-Mail-Adresse, IM-Adresse und " "Telefonnummer." -#: actions/register.php:537 +#: actions/register.php:538 #, fuzzy, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -2812,7 +3033,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.)" @@ -2972,6 +3193,85 @@ msgstr "Du kannst diesem Benutzer keine Nachricht schicken." msgid "User is already sandboxed." msgstr "Dieser Benutzer hat dich blockiert." +#: actions/showapplication.php:82 +#, fuzzy +msgid "You must be logged in to view an application." +msgstr "Du musst angemeldet sein, um aus einer Gruppe auszutreten." + +#: actions/showapplication.php:158 +#, fuzzy +msgid "Application profile" +msgstr "Nachricht hat kein Profil" + +#: actions/showapplication.php:160 lib/applicationeditform.php:182 +msgid "Icon" +msgstr "" + +#: actions/showapplication.php:170 actions/version.php:195 +#: lib/applicationeditform.php:197 +#, fuzzy +msgid "Name" +msgstr "Nutzername" + +#: actions/showapplication.php:179 lib/applicationeditform.php:224 +#, fuzzy +msgid "Organization" +msgstr "Seitenerstellung" + +#: actions/showapplication.php:188 actions/version.php:198 +#: lib/applicationeditform.php:211 lib/groupeditform.php:172 +msgid "Description" +msgstr "Beschreibung" + +#: actions/showapplication.php:193 actions/showgroup.php:429 +#: lib/profileaction.php:174 +msgid "Statistics" +msgstr "Statistiken" + +#: actions/showapplication.php:204 +#, php-format +msgid "created by %1$s - %2$s access by default - %3$d users" +msgstr "" + +#: actions/showapplication.php:214 +msgid "Application actions" +msgstr "" + +#: actions/showapplication.php:233 +msgid "Reset key & secret" +msgstr "" + +#: actions/showapplication.php:241 +msgid "Application info" +msgstr "" + +#: actions/showapplication.php:243 +msgid "Consumer key" +msgstr "" + +#: actions/showapplication.php:248 +msgid "Consumer secret" +msgstr "" + +#: actions/showapplication.php:253 +msgid "Request token URL" +msgstr "" + +#: actions/showapplication.php:258 +msgid "Access token URL" +msgstr "" + +#: actions/showapplication.php:263 +#, fuzzy +msgid "Authorize URL" +msgstr "Autor" + +#: actions/showapplication.php:268 +msgid "" +"Note: We support HMAC-SHA1 signatures. We do not support the plaintext " +"signature method." +msgstr "" + #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "Konnte Favoriten nicht abrufen." @@ -3069,7 +3369,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)" @@ -3077,10 +3377,6 @@ msgstr "(Kein)" msgid "All members" msgstr "Alle Mitglieder" -#: actions/showgroup.php:429 lib/profileaction.php:174 -msgid "Statistics" -msgstr "Statistiken" - #: actions/showgroup.php:432 msgid "Created" msgstr "Erstellt" @@ -3231,12 +3527,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 @@ -3425,7 +3722,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 @@ -3454,7 +3752,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 @@ -3712,10 +4011,6 @@ 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" @@ -3927,11 +4222,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" @@ -4008,11 +4298,6 @@ msgstr "" msgid "Plugins" msgstr "" -#: actions/version.php:195 -#, fuzzy -msgid "Name" -msgstr "Nutzername" - #: actions/version.php:196 lib/action.php:741 #, fuzzy msgid "Version" @@ -4023,27 +4308,43 @@ msgstr "Eigene" msgid "Author(s)" msgstr "Autor" -#: actions/version.php:198 lib/groupeditform.php:172 -msgid "Description" -msgstr "Beschreibung" - -#: classes/File.php:137 +#: 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/Group_member.php:41 +#, fuzzy +msgid "Group join failed." +msgstr "Gruppenprofil" + +#: classes/Group_member.php:53 +#, fuzzy +msgid "Not part of group." +msgstr "Konnte Gruppe nicht aktualisieren." + +#: classes/Group_member.php:60 +#, fuzzy +msgid "Group leave failed." +msgstr "Gruppenprofil" + +#: 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." @@ -4057,27 +4358,27 @@ msgstr "Konnte Nachricht nicht einfügen." msgid "Could not update message with new URI." msgstr "Konnte Nachricht nicht mit neuer URI versehen." -#: classes/Notice.php:172 +#: classes/Notice.php:171 #, php-format msgid "DB error inserting hashtag: %s" msgstr "Datenbankfehler beim Einfügen des Hashtags: %s" -#: classes/Notice.php:226 +#: classes/Notice.php:225 msgid "Problem saving notice. Too long." msgstr "Problem bei Speichern der Nachricht. Sie ist zu lang." -#: classes/Notice.php:230 +#: classes/Notice.php:229 msgid "Problem saving notice. Unknown user." msgstr "Problem bei Speichern der Nachricht. Unbekannter Benutzer." -#: classes/Notice.php:235 +#: classes/Notice.php:234 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Zu schnell zu viele Nachrichten; atme kurz durch und schicke sie erneut in " "ein paar Minuten ab." -#: classes/Notice.php:241 +#: classes/Notice.php:240 #, fuzzy msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " @@ -4086,26 +4387,26 @@ msgstr "" "Zu schnell zu viele Nachrichten; atme kurz durch und schicke sie erneut in " "ein paar Minuten ab." -#: classes/Notice.php:247 +#: classes/Notice.php:246 msgid "You are banned from posting notices on this site." msgstr "" "Du wurdest für das Schreiben von Nachrichten auf dieser Seite gesperrt." -#: classes/Notice.php:309 classes/Notice.php:334 +#: classes/Notice.php:305 classes/Notice.php:330 msgid "Problem saving notice." msgstr "Problem bei Speichern der Nachricht." -#: classes/Notice.php:1034 +#: classes/Notice.php:1052 #, php-format msgid "DB error inserting reply: %s" msgstr "Datenbankfehler beim Einfügen der Antwort: %s" -#: classes/Notice.php:1359 +#: classes/Notice.php:1423 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" -#: classes/User.php:368 +#: classes/User.php:382 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Herzlich willkommen bei %1$s, @%2$s!" @@ -4147,6 +4448,11 @@ msgstr "Sonstige" msgid "Other options" msgstr "Sonstige Optionen" +#: lib/action.php:144 +#, fuzzy, php-format +msgid "%1$s - %2$s" +msgstr "%1$s (%2$s)" + #: lib/action.php:159 msgid "Untitled page" msgstr "Seite ohne Titel" @@ -4163,10 +4469,6 @@ msgstr "Startseite" msgid "Personal profile and friends timeline" msgstr "Persönliches Profil und Freundes-Zeitleiste" -#: lib/action.php:435 -msgid "Account" -msgstr "Konto" - #: lib/action.php:435 msgid "Change your email, avatar, password, profile" msgstr "Ändere deine E-Mail, dein Avatar, Passwort, Profil" @@ -4325,10 +4627,6 @@ msgstr "Später" msgid "Before" msgstr "Vorher" -#: lib/action.php:1167 -msgid "There was a problem with your session token." -msgstr "Es gab ein Problem mit deinem Sessiontoken." - #: lib/adminpanelaction.php:96 #, fuzzy msgid "You cannot make changes to this site." @@ -4366,6 +4664,72 @@ msgstr "SMS-Konfiguration" msgid "Paths configuration" msgstr "SMS-Konfiguration" +#: lib/applicationeditform.php:186 +msgid "Icon for this application" +msgstr "" + +#: lib/applicationeditform.php:206 +#, fuzzy, php-format +msgid "Describe your application in %d characters" +msgstr "Beschreibe die Gruppe oder das Thema in 140 Zeichen" + +#: lib/applicationeditform.php:209 +#, fuzzy +msgid "Describe your application" +msgstr "Beschreibe die Gruppe oder das Thema in 140 Zeichen" + +#: lib/applicationeditform.php:218 +#, fuzzy +msgid "Source URL" +msgstr "Quellcode" + +#: lib/applicationeditform.php:220 +#, fuzzy +msgid "URL of the homepage of this application" +msgstr "URL der Homepage oder Blogs der Gruppe oder des Themas" + +#: lib/applicationeditform.php:226 +msgid "Organization responsible for this application" +msgstr "" + +#: lib/applicationeditform.php:232 +#, fuzzy +msgid "URL for the homepage of the organization" +msgstr "URL der Homepage oder Blogs der Gruppe oder des Themas" + +#: lib/applicationeditform.php:238 +msgid "URL to redirect to after authentication" +msgstr "" + +#: lib/applicationeditform.php:260 +msgid "Browser" +msgstr "" + +#: lib/applicationeditform.php:276 +msgid "Desktop" +msgstr "" + +#: lib/applicationeditform.php:277 +msgid "Type of application, browser or desktop" +msgstr "" + +#: lib/applicationeditform.php:299 +msgid "Read-only" +msgstr "" + +#: lib/applicationeditform.php:317 +msgid "Read-write" +msgstr "" + +#: lib/applicationeditform.php:318 +msgid "Default access for this application: read-only, or read-write" +msgstr "" + +#: lib/applicationlist.php:154 +#, fuzzy +msgid "Revoke" +msgstr "Entfernen" + #: lib/attachmentlist.php:87 msgid "Attachments" msgstr "Anhänge" @@ -4386,12 +4750,12 @@ msgstr "Nachrichten in denen dieser Anhang erscheint" msgid "Tags for this attachment" msgstr "Tags für diesen Anhang" -#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 +#: lib/authenticationplugin.php:214 lib/authenticationplugin.php:219 #, fuzzy msgid "Password changing failed" msgstr "Passwort geändert" -#: lib/authenticationplugin.php:197 +#: lib/authenticationplugin.php:229 #, fuzzy msgid "Password changing is not allowed" msgstr "Passwort geändert" @@ -4413,8 +4777,8 @@ msgid "Sorry, this command is not yet implemented." msgstr "Leider ist dieser Befehl noch nicht implementiert." #: lib/command.php:88 -#, fuzzy, php-format -msgid "Could not find a user with nickname %s." +#, php-format +msgid "Could not find a user with nickname %s" msgstr "Die bestätigte E-Mail-Adresse konnte nicht gespeichert werden." #: lib/command.php:92 @@ -4423,7 +4787,7 @@ msgstr "" #: lib/command.php:99 #, fuzzy, php-format -msgid "Nudge sent to %s." +msgid "Nudge sent to %s" msgstr "Stups abgeschickt" #: lib/command.php:126 @@ -4434,170 +4798,188 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:399 lib/command.php:460 -#, fuzzy -msgid "Notice with that id does not exist." +#: lib/command.php:152 lib/command.php:390 lib/command.php:451 +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." +#: lib/command.php:168 lib/command.php:406 lib/command.php:467 +#: lib/command.php:523 +msgid "User has no last notice" msgstr "Benutzer hat keine letzte Nachricht" #: lib/command.php:190 msgid "Notice marked as fave." msgstr "Nachricht als Favorit markiert." -#: lib/command.php:284 -#, fuzzy, php-format -msgid "Could not remove user %1$s to group %2$s." +#: lib/command.php:217 +msgid "You are already a member of that group" +msgstr "Du bist bereits Mitglied dieser Gruppe" + +#: lib/command.php:231 +#, php-format +msgid "Could not join user %s to group %s" +msgstr "Konnte Benutzer %s nicht der Gruppe %s hinzufügen" + +#: lib/command.php:236 +#, php-format +msgid "%s joined group %s" +msgstr "%s ist der Gruppe %s beigetreten" + +#: lib/command.php:275 +#, php-format +msgid "Could not remove user %s to group %s" msgstr "Konnte Benutzer %s aus der Gruppe %s nicht entfernen" -#: lib/command.php:318 +#: lib/command.php:280 +#, php-format +msgid "%s left group %s" +msgstr "%s hat die Gruppe %s verlassen" + +#: lib/command.php:309 #, php-format msgid "Fullname: %s" msgstr "Vollständiger Name: %s" -#: lib/command.php:321 +#: lib/command.php:312 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "Standort: %s" -#: lib/command.php:324 +#: lib/command.php:315 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "Homepage: %s" -#: lib/command.php:327 +#: lib/command.php:318 #, php-format msgid "About: %s" msgstr "Ãœber: %s" -#: lib/command.php:358 -#, fuzzy, php-format -msgid "Message too long - maximum is %1$d characters, you sent %2$d." +#: lib/command.php:349 +#, 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." +#: lib/command.php:367 +#, php-format +msgid "Direct message to %s sent" msgstr "Direkte Nachricht an %s abgeschickt" -#: lib/command.php:378 +#: lib/command.php:369 msgid "Error sending direct message." msgstr "Fehler beim Senden der Nachricht" -#: lib/command.php:435 +#: lib/command.php:413 +msgid "Cannot repeat your own notice" +msgstr "Du kannst deine eigenen Nachrichten nicht wiederholen." + +#: lib/command.php:418 +msgid "Already repeated that notice" +msgstr "Nachricht bereits wiederholt" + +#: lib/command.php:426 #, fuzzy, php-format -msgid "Notice from %s repeated." +msgid "Notice from %s repeated" msgstr "Nachricht hinzugefügt" -#: lib/command.php:437 +#: lib/command.php:428 #, fuzzy msgid "Error repeating notice." msgstr "Problem beim Speichern der Nachricht." -#: lib/command.php:491 +#: lib/command.php:482 #, fuzzy, php-format -msgid "Notice too long - maximum is %1$d characters, you sent %2$d." +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 -#, fuzzy, php-format -msgid "Reply to %s sent." +#: lib/command.php:491 +#, php-format +msgid "Reply to %s sent" msgstr "Antwort an %s gesendet" -#: lib/command.php:502 +#: lib/command.php:493 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." +#: lib/command.php:547 +msgid "Specify the name of the user to subscribe to" msgstr "Gib den Namen des Benutzers an, den du abonnieren möchtest" -#: lib/command.php:563 +#: lib/command.php:554 #, php-format msgid "Subscribed to %s" msgstr "%s abonniert" -#: lib/command.php:584 -#, fuzzy -msgid "Specify the name of the user to unsubscribe from." +#: lib/command.php:575 +msgid "Specify the name of the user to unsubscribe from" msgstr "Gib den Namen des Benutzers ein, den du nicht mehr abonnieren möchtest" -#: lib/command.php:591 +#: lib/command.php:582 #, php-format msgid "Unsubscribed from %s" msgstr "%s nicht mehr abonniert" -#: lib/command.php:609 lib/command.php:632 +#: lib/command.php:600 lib/command.php:623 msgid "Command not yet implemented." msgstr "Befehl noch nicht implementiert." -#: lib/command.php:612 +#: lib/command.php:603 msgid "Notification off." msgstr "Benachrichtigung deaktiviert." -#: lib/command.php:614 +#: lib/command.php:605 msgid "Can't turn off notification." msgstr "Konnte Benachrichtigung nicht deaktivieren." -#: lib/command.php:635 +#: lib/command.php:626 msgid "Notification on." msgstr "Benachrichtigung aktiviert." -#: lib/command.php:637 +#: lib/command.php:628 msgid "Can't turn on notification." msgstr "Konnte Benachrichtigung nicht aktivieren." -#: lib/command.php:650 -msgid "Login command is disabled." +#: lib/command.php:641 +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:652 #, php-format -msgid "This link is useable only once, and is good for only 2 minutes: %s." +msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:685 +#: lib/command.php:668 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Du hast dieses Profil nicht abonniert." -#: lib/command.php:687 +#: lib/command.php:670 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:690 msgid "No one is subscribed to you." msgstr "Niemand hat Dich abonniert." -#: lib/command.php:709 +#: lib/command.php:692 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:712 msgid "You are not a member of any groups." msgstr "Du bist in keiner Gruppe Mitglied." -#: lib/command.php:731 +#: lib/command.php:714 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:728 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4638,19 +5020,19 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:199 +#: lib/common.php:131 msgid "No configuration file found. " msgstr "Keine Konfigurationsdatei gefunden." -#: lib/common.php:200 +#: lib/common.php:132 msgid "I looked for configuration files in the following places: " msgstr "Ich habe an folgenden Stellen nach Konfigurationsdateien gesucht: " -#: lib/common.php:201 +#: lib/common.php:134 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:202 +#: lib/common.php:135 #, fuzzy msgid "Go to the installer." msgstr "Auf der Seite anmelden" @@ -4667,6 +5049,15 @@ msgstr "Aktualisierungen via Instant Messenger (IM)" msgid "Updates by SMS" msgstr "Aktualisierungen via SMS" +#: lib/connectsettingsaction.php:120 +#, fuzzy +msgid "Connections" +msgstr "Verbinden" + +#: lib/connectsettingsaction.php:121 +msgid "Authorized connected applications" +msgstr "" + #: lib/dberroraction.php:60 msgid "Database error" msgstr "Datenbankfehler." @@ -4858,11 +5249,16 @@ msgstr "" msgid "kB" msgstr "" -#: lib/jabber.php:191 +#: lib/jabber.php:202 #, php-format msgid "[%s]" msgstr "" +#: lib/jabber.php:385 +#, fuzzy, php-format +msgid "Unknown inbox source %d." +msgstr "Unbekannte Sprache „%s“" + #: lib/joinform.php:114 msgid "Join" msgstr "Beitreten" @@ -4946,21 +5342,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" @@ -5186,7 +5570,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 @@ -5194,7 +5578,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 @@ -5204,7 +5589,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 @@ -5241,16 +5626,18 @@ msgstr "" #: lib/noticeform.php:212 #, fuzzy -msgid "Share my location." -msgstr "Konnte Tags nicht speichern." - -#: lib/noticeform.php:214 -#, fuzzy -msgid "Do not share my location." +msgid "Share my location" msgstr "Konnte Tags nicht speichern." #: lib/noticeform.php:215 -msgid "Hide this info" +#, fuzzy +msgid "Do not share my location" +msgstr "Konnte Tags nicht speichern." + +#: lib/noticeform.php:216 +msgid "" +"Sorry, retrieving your geo location is taking longer than expected, please " +"try again later" msgstr "" #: lib/noticelist.php:428 @@ -5524,25 +5911,25 @@ msgstr "Bereits abonniert!" msgid "User has blocked you." msgstr "Dieser Benutzer hat dich blockiert." -#: lib/subs.php:60 +#: lib/subs.php:63 msgid "Could not subscribe." msgstr "Konnte nicht abbonieren." -#: lib/subs.php:79 +#: lib/subs.php:82 msgid "Could not subscribe other to you." msgstr "Die Gegenseite konnte Dich nicht abonnieren." -#: lib/subs.php:128 +#: lib/subs.php:137 #, fuzzy msgid "Not subscribed!" msgstr "Nicht abonniert!" -#: lib/subs.php:133 +#: lib/subs.php:142 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "Konnte Abonnement nicht löschen." -#: lib/subs.php:146 +#: lib/subs.php:158 msgid "Couldn't delete subscription." msgstr "Konnte Abonnement nicht löschen." @@ -5556,11 +5943,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" @@ -5623,47 +6005,47 @@ msgstr "Nachricht" msgid "Moderate" msgstr "" -#: lib/util.php:837 +#: lib/util.php:875 msgid "a few seconds ago" msgstr "vor wenigen Sekunden" -#: lib/util.php:839 +#: lib/util.php:877 msgid "about a minute ago" msgstr "vor einer Minute" -#: lib/util.php:841 +#: lib/util.php:879 #, php-format msgid "about %d minutes ago" msgstr "vor %d Minuten" -#: lib/util.php:843 +#: lib/util.php:881 msgid "about an hour ago" msgstr "vor einer Stunde" -#: lib/util.php:845 +#: lib/util.php:883 #, php-format msgid "about %d hours ago" msgstr "vor %d Stunden" -#: lib/util.php:847 +#: lib/util.php:885 msgid "about a day ago" msgstr "vor einem Tag" -#: lib/util.php:849 +#: lib/util.php:887 #, php-format msgid "about %d days ago" msgstr "vor %d Tagen" -#: lib/util.php:851 +#: lib/util.php:889 msgid "about a month ago" msgstr "vor einem Monat" -#: lib/util.php:853 +#: lib/util.php:891 #, php-format msgid "about %d months ago" msgstr "vor %d Monaten" -#: lib/util.php:855 +#: lib/util.php:893 msgid "about a year ago" msgstr "vor einem Jahr" @@ -5678,6 +6060,6 @@ 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/xmppdaemon.php:301 -#, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +#, fuzzy, php-format +msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "Nachricht zu lang - maximal %d Zeichen erlaubt, du hast %d gesendet" diff --git a/locale/el/LC_MESSAGES/statusnet.po b/locale/el/LC_MESSAGES/statusnet.po index 0b3ebf3471..6d333e39aa 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-10 00:46+0000\n" -"PO-Revision-Date: 2010-01-10 00:47:26+0000\n" +"POT-Creation-Date: 2010-01-15 19:15+0000\n" +"PO-Revision-Date: 2010-01-15 19:16:35+0000\n" "Language-Team: Greek\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60878); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r61101); 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" @@ -34,25 +34,30 @@ msgstr "Δεν υπάÏχει τέτοιο σελίδα." #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 +#: actions/apistatusesupdate.php:149 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 #: 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 #: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 -#: lib/command.php:163 lib/command.php:311 lib/command.php:364 -#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/command.php:163 lib/command.php:302 lib/command.php:355 +#: lib/command.php:401 lib/command.php:462 lib/command.php:518 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/subs.php:34 lib/subs.php:125 msgid "No such user." msgstr "Κανένας τέτοιος χÏήστης." +#: actions/all.php:84 +#, fuzzy, php-format +msgid "%1$s and friends, page %2$d" +msgstr "%s και οι φίλοι του/της" + #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 +#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -104,7 +109,7 @@ msgstr "" msgid "You and friends" msgstr "Εσείς και οι φίλοι σας" -#: actions/allrss.php:119 actions/apitimelinefriends.php:122 +#: actions/allrss.php:119 actions/apitimelinefriends.php:121 #: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" @@ -115,6 +120,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:155 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 "Η μέθοδος του ΑΡΙ δε βÏέθηκε!" @@ -129,7 +151,7 @@ msgstr "Η μέθοδος του ΑΡΙ δε βÏέθηκε!" #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:114 +#: actions/apistatusesupdate.php:119 msgid "This method requires a POST." msgstr "" @@ -160,8 +182,9 @@ msgstr "Απέτυχε η αποθήκευση του Ï€Ïοφίλ." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257 -#: actions/designadminpanel.php:122 actions/newnotice.php:94 +#: actions/apistatusesupdate.php:132 actions/avatarsettings.php:257 +#: actions/designadminpanel.php:122 actions/editapplication.php:118 +#: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format msgid "" @@ -173,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 "" @@ -214,26 +240,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 "" @@ -257,7 +263,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 @@ -265,7 +271,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 @@ -288,8 +294,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." @@ -323,7 +330,8 @@ msgstr "Το ψευδώνυμο είναι ήδη σε χÏήση. Δοκιμά msgid "Not a valid nickname." msgstr "" -#: actions/apigroupcreate.php:196 actions/editgroup.php:195 +#: actions/apigroupcreate.php:196 actions/editapplication.php:212 +#: actions/editgroup.php:195 actions/newapplication.php:200 #: actions/newgroup.php:139 actions/profilesettings.php:222 #: actions/register.php:217 msgid "Homepage is not a valid URL." @@ -335,7 +343,8 @@ msgstr "Η αÏχική σελίδα δεν είναι έγκυÏο URL." msgid "Full name is too long (max 255 chars)." msgstr "Το ονοματεπώνυμο είναι Ï€Î¿Î»Ï Î¼ÎµÎ³Î¬Î»Î¿ (μέγιστο 255 χαÏακτ.)." -#: actions/apigroupcreate.php:213 +#: actions/apigroupcreate.php:213 actions/editapplication.php:187 +#: actions/newapplication.php:169 #, php-format msgid "Description is too long (max %d chars)." msgstr "Η πεÏιγÏαφή είναι Ï€Î¿Î»Ï Î¼ÎµÎ³Î¬Î»Î· (μέγιστο %d χαÏακτ.)." @@ -375,7 +384,7 @@ msgstr "" msgid "Group not found!" msgstr "Ομάδα δεν βÏέθηκε!" -#: actions/apigroupjoin.php:110 lib/command.php:217 +#: actions/apigroupjoin.php:110 actions/joingroup.php:90 msgid "You are already a member of that group." msgstr "" @@ -383,7 +392,7 @@ msgstr "" msgid "You have been blocked from that group by the admin." msgstr "" -#: actions/apigroupjoin.php:138 lib/command.php:234 +#: actions/apigroupjoin.php:138 actions/joingroup.php:124 #, fuzzy, php-format msgid "Could not join user %1$s to group %2$s." msgstr "ΑδÏνατη η αποθήκευση των νέων πληÏοφοÏιών του Ï€Ïοφίλ" @@ -392,7 +401,7 @@ msgstr "ΑδÏνατη η αποθήκευση των νέων πληÏÎ¿Ï†Î¿Ï msgid "You are not a member of this group." msgstr "" -#: actions/apigroupleave.php:124 actions/leavegroup.php:127 +#: actions/apigroupleave.php:124 actions/leavegroup.php:119 #, fuzzy, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "ΑδÏνατη η αποθήκευση του Ï€Ïοφίλ." @@ -412,6 +421,99 @@ msgstr "" msgid "groups on %s" msgstr "ομάδες του χÏήστη %s" +#: actions/apioauthauthorize.php:108 actions/apioauthauthorize.php:114 +msgid "Bad request." +msgstr "" + +#: actions/apioauthauthorize.php:134 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:115 actions/makeadmin.php:66 +#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 +#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:139 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 +#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/subscribe.php:46 actions/tagother.php:166 +#: 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 "" + +#: actions/apioauthauthorize.php:146 +msgid "Invalid nickname / password!" +msgstr "" + +#: actions/apioauthauthorize.php:170 +#, fuzzy +msgid "DB error deleting OAuth app user." +msgstr "Σφάλμα στη βάση δεδομένων κατά την εισαγωγή hashtag: %s" + +#: actions/apioauthauthorize.php:196 +#, fuzzy +msgid "DB error inserting OAuth app user." +msgstr "Σφάλμα στη βάση δεδομένων κατά την εισαγωγή hashtag: %s" + +#: actions/apioauthauthorize.php:231 +#, php-format +msgid "" +"The request token %s has been authorized. Please exchange it for an access " +"token." +msgstr "" + +#: actions/apioauthauthorize.php:241 +#, php-format +msgid "The request token %s has been denied." +msgstr "" + +#: actions/apioauthauthorize.php:246 actions/avatarsettings.php:281 +#: actions/designadminpanel.php:103 actions/editapplication.php:139 +#: actions/emailsettings.php:256 actions/grouplogo.php:319 +#: actions/imsettings.php:220 actions/newapplication.php:121 +#: actions/oauthconnectionssettings.php:151 actions/recoverpassword.php:44 +#: actions/smssettings.php:248 lib/designsettings.php:304 +msgid "Unexpected form submission." +msgstr "" + +#: actions/apioauthauthorize.php:273 +msgid "An application would like to connect to your account" +msgstr "" + +#: actions/apioauthauthorize.php:290 +msgid "Allow or deny access" +msgstr "" + +#: actions/apioauthauthorize.php:320 lib/action.php:435 +msgid "Account" +msgstr "ΛογαÏιασμός" + +#: actions/apioauthauthorize.php:323 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/apioauthauthorize.php:326 actions/login.php:233 +#: actions/register.php:429 lib/accountsettingsaction.php:116 +msgid "Password" +msgstr "Κωδικός" + +#: actions/apioauthauthorize.php:338 +msgid "Deny" +msgstr "" + +#: actions/apioauthauthorize.php:344 +msgid "Allow" +msgstr "" + +#: actions/apioauthauthorize.php:361 +msgid "Allow or deny access to your account information." +msgstr "" + #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." msgstr "" @@ -425,12 +527,12 @@ msgstr "" msgid "No such notice." msgstr "" -#: actions/apistatusesretweet.php:83 lib/command.php:422 +#: actions/apistatusesretweet.php:83 #, fuzzy msgid "Cannot repeat your own notice." msgstr "Αδυναμία διαγÏαφής Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… μηνÏματος." -#: actions/apistatusesretweet.php:91 lib/command.php:427 +#: actions/apistatusesretweet.php:91 #, fuzzy msgid "Already repeated that notice." msgstr "Αδυναμία διαγÏαφής Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… μηνÏματος." @@ -443,17 +545,17 @@ msgstr "Η κατάσταση διαγÏάφεται." msgid "No status with that ID found." msgstr "" -#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:162 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" -#: actions/apistatusesupdate.php:198 +#: actions/apistatusesupdate.php:203 msgid "Not found" msgstr "" -#: actions/apistatusesupdate.php:221 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:226 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -537,8 +639,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 +666,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,29 +699,6 @@ 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/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 -#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 -#: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 -#: actions/subscribe.php:46 actions/tagother.php:166 -#: 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 "" - -#: actions/avatarsettings.php:281 actions/designadminpanel.php:103 -#: actions/emailsettings.php:256 actions/grouplogo.php:319 -#: actions/imsettings.php:220 actions/recoverpassword.php:44 -#: actions/smssettings.php:248 lib/designsettings.php:304 -msgid "Unexpected form submission." -msgstr "" - #: actions/avatarsettings.php:328 msgid "Pick a square area of the image to be your avatar" msgstr "" @@ -678,19 +760,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:260 +#, fuzzy +msgid "No such group." +msgstr "ΑδÏνατη η αποθήκευση του Ï€Ïοφίλ." #: actions/blockedfromgroup.php:90 #, fuzzy, php-format @@ -757,7 +836,8 @@ msgid "Couldn't delete email confirmation." msgstr "Απέτυχε η διαγÏαφή email επιβεβαίωσης." #: actions/confirmaddress.php:144 -msgid "Confirm Address" +#, fuzzy +msgid "Confirm address" msgstr "Επιβεβαίωση διεÏθυνσης" #: actions/confirmaddress.php:159 @@ -812,10 +892,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." @@ -949,7 +1025,8 @@ msgstr "" #: actions/pathsadminpanel.php:324 actions/profilesettings.php:174 #: actions/siteadminpanel.php:388 actions/smssettings.php:181 #: actions/subscriptions.php:203 actions/tagother.php:154 -#: actions/useradminpanel.php:313 lib/designsettings.php:256 +#: actions/useradminpanel.php:313 lib/applicationeditform.php:335 +#: lib/applicationeditform.php:336 lib/designsettings.php:256 #: lib/groupeditform.php:202 msgid "Save" msgstr "" @@ -970,6 +1047,83 @@ msgstr "" msgid "No such document." msgstr "" +#: actions/editapplication.php:54 lib/applicationeditform.php:136 +msgid "Edit application" +msgstr "" + +#: actions/editapplication.php:66 +msgid "You must be logged in to edit an application." +msgstr "" + +#: actions/editapplication.php:77 actions/showapplication.php:94 +#, fuzzy +msgid "You are not the owner of this application." +msgstr "Ομάδες με τα πεÏισσότεÏα μέλη" + +#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:163 +#: actions/showapplication.php:87 +#, fuzzy +msgid "No such application." +msgstr "Δεν υπάÏχει τέτοιο σελίδα." + +#: actions/editapplication.php:127 actions/newapplication.php:110 +#: actions/showapplication.php:118 lib/action.php:1167 +msgid "There was a problem with your session token." +msgstr "" + +#: actions/editapplication.php:161 +msgid "Use this form to edit your application." +msgstr "" + +#: actions/editapplication.php:177 actions/newapplication.php:159 +msgid "Name is required." +msgstr "" + +#: actions/editapplication.php:180 actions/newapplication.php:162 +#, fuzzy +msgid "Name is too long (max 255 chars)." +msgstr "Το ονοματεπώνυμο είναι Ï€Î¿Î»Ï Î¼ÎµÎ³Î¬Î»Î¿ (μέγιστο 255 χαÏακτ.)." + +#: actions/editapplication.php:183 actions/newapplication.php:165 +#, fuzzy +msgid "Description is required." +msgstr "ΠεÏιγÏαφή" + +#: actions/editapplication.php:191 +msgid "Source URL is too long." +msgstr "" + +#: actions/editapplication.php:197 actions/newapplication.php:182 +#, fuzzy +msgid "Source URL is not valid." +msgstr "Η αÏχική σελίδα δεν είναι έγκυÏο URL." + +#: actions/editapplication.php:200 actions/newapplication.php:185 +msgid "Organization is required." +msgstr "" + +#: actions/editapplication.php:203 actions/newapplication.php:188 +#, fuzzy +msgid "Organization is too long (max 255 chars)." +msgstr "Η τοποθεσία είναι Ï€Î¿Î»Ï Î¼ÎµÎ³Î¬Î»Î· (μέγιστο 255 χαÏακτ.)." + +#: actions/editapplication.php:206 actions/newapplication.php:191 +msgid "Organization homepage is required." +msgstr "" + +#: actions/editapplication.php:215 actions/newapplication.php:203 +msgid "Callback is too long." +msgstr "" + +#: actions/editapplication.php:222 actions/newapplication.php:212 +msgid "Callback URL is not valid." +msgstr "" + +#: actions/editapplication.php:255 +#, fuzzy +msgid "Could not update application." +msgstr "ΑδÏνατη η αποθήκευση του Ï€Ïοφίλ." + #: actions/editgroup.php:56 #, php-format msgid "Edit %s group" @@ -981,7 +1135,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 @@ -1008,7 +1162,8 @@ msgid "Options saved." msgstr "" #: actions/emailsettings.php:60 -msgid "Email Settings" +#, fuzzy +msgid "Email settings" msgstr "Ρυθμίσεις Email" #: actions/emailsettings.php:71 @@ -1041,13 +1196,15 @@ msgstr "" "φάκελο spam!) για μήνυμα με πεÏαιτέÏω οδηγίες. " #: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 +#: actions/smssettings.php:126 lib/applicationeditform.php:333 +#: lib/applicationeditform.php:334 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\"" @@ -1120,8 +1277,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 @@ -1302,14 +1460,6 @@ 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:79 #, fuzzy msgid "No such file." @@ -1328,7 +1478,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 "" @@ -1373,8 +1523,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 @@ -1397,12 +1547,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." @@ -1418,6 +1562,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 "" @@ -1539,7 +1687,8 @@ msgid "Error removing the block." msgstr "" #: actions/imsettings.php:59 -msgid "IM Settings" +#, fuzzy +msgid "IM settings" msgstr "Ρυθμίσεις ΙΜ" #: actions/imsettings.php:70 @@ -1569,7 +1718,8 @@ msgstr "" "λίστα φίλων?)" #: actions/imsettings.php:124 -msgid "IM Address" +#, fuzzy +msgid "IM address" msgstr "ΔιεÏθυνση ΙΜ" #: actions/imsettings.php:126 @@ -1663,7 +1813,7 @@ msgstr "" msgid "You are already subscribed to these users:" msgstr "" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:315 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 #, php-format msgid "%1$s (%2$s)" msgstr "" @@ -1704,7 +1854,7 @@ msgstr "" msgid "Optionally add a personal message to the invitation." msgstr "" -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236 msgid "Send" msgstr "" @@ -1748,16 +1898,7 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "" -#: actions/joingroup.php:90 -msgid "You are already a member of that group" -msgstr "" - -#: actions/joingroup.php:128 -#, fuzzy, php-format -msgid "Could not join user %1$s to group %2$s" -msgstr "ΑδÏνατη η αποθήκευση των νέων πληÏοφοÏιών του Ï€Ïοφίλ" - -#: actions/joingroup.php:135 lib/command.php:239 +#: actions/joingroup.php:131 #, php-format msgid "%1$s joined group %2$s" msgstr "" @@ -1766,68 +1907,49 @@ msgstr "" msgid "You must be logged in to leave a group." msgstr "" -#: actions/leavegroup.php:90 lib/command.php:268 +#: actions/leavegroup.php:90 lib/command.php:265 msgid "You are not a member of that group." msgstr "" -#: actions/leavegroup.php:119 lib/command.php:278 -msgid "Could not find membership record." -msgstr "" - -#: actions/leavegroup.php:134 lib/command.php:289 +#: actions/leavegroup.php:127 #, php-format 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:460 +#: 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 -#: lib/groupeditform.php:152 lib/userprofile.php:131 -msgid "Nickname" -msgstr "Ψευδώνυμο" - -#: actions/login.php:253 actions/register.php:428 -#: 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." @@ -1835,7 +1957,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]" @@ -1855,19 +1977,40 @@ 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 %1$s in group %2$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 %1$s an admin for group %2$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" msgstr "" +#: actions/newapplication.php:52 +msgid "New application" +msgstr "" + +#: actions/newapplication.php:64 +msgid "You must be logged in to register an application." +msgstr "" + +#: actions/newapplication.php:143 +msgid "Use this form to register a new application." +msgstr "" + +#: actions/newapplication.php:173 +msgid "Source URL is required." +msgstr "" + +#: actions/newapplication.php:255 actions/newapplication.php:264 +#, fuzzy +msgid "Could not create application." +msgstr "ΑδÏνατη η αποθήκευση του Ï€Ïοφίλ." + #: actions/newgroup.php:53 msgid "New group" msgstr "" @@ -1880,12 +2023,12 @@ msgstr "" msgid "New message" msgstr "" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 msgid "You can't send a message to this user." msgstr "" -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:484 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 +#: lib/command.php:475 msgid "No content!" msgstr "" @@ -1893,7 +2036,7 @@ msgstr "" msgid "No recipient specified." msgstr "" -#: actions/newmessage.php:164 lib/command.php:370 +#: actions/newmessage.php:164 lib/command.php:361 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -1904,7 +2047,7 @@ msgstr "" #: 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 @@ -1972,6 +2115,49 @@ msgstr "" msgid "Nudge sent!" msgstr "" +#: actions/oauthappssettings.php:59 +msgid "You must be logged in to list your applications." +msgstr "" + +#: actions/oauthappssettings.php:74 +msgid "OAuth applications" +msgstr "" + +#: actions/oauthappssettings.php:85 +msgid "Applications you have registered" +msgstr "" + +#: actions/oauthappssettings.php:135 +#, php-format +msgid "You have not registered any applications yet." +msgstr "" + +#: actions/oauthconnectionssettings.php:71 +msgid "Connected applications" +msgstr "" + +#: actions/oauthconnectionssettings.php:87 +msgid "You have allowed the following applications to access you account." +msgstr "" + +#: actions/oauthconnectionssettings.php:170 +#, fuzzy +msgid "You are not a user of that application." +msgstr "Δεν είστε μέλος καμίας ομάδας." + +#: actions/oauthconnectionssettings.php:180 +msgid "Unable to revoke access for app: " +msgstr "" + +#: actions/oauthconnectionssettings.php:192 +#, php-format +msgid "You have not authorized any applications to use your account." +msgstr "" + +#: actions/oauthconnectionssettings.php:205 +msgid "Developers can edit the registration settings for their applications " +msgstr "" + #: actions/oembed.php:79 actions/shownotice.php:100 msgid "Notice has no profile" msgstr "" @@ -1990,8 +2176,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:1038 +#: lib/api.php:1066 lib/api.php:1176 msgid "Not a supported data format." msgstr "" @@ -2005,7 +2191,7 @@ msgstr "" #: actions/othersettings.php:60 #, fuzzy -msgid "Other Settings" +msgid "Other settings" msgstr "Ρυθμίσεις OpenID" #: actions/othersettings.php:71 @@ -2037,6 +2223,29 @@ msgstr "" msgid "URL shortening service is too long (max 50 chars)." msgstr "Η τοποθεσία είναι Ï€Î¿Î»Ï Î¼ÎµÎ³Î¬Î»Î· (μέγιστο 255 χαÏακτ.)." +#: 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 #, php-format msgid "Outbox for %s" @@ -2073,7 +2282,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 "Επιβεβαίωση" @@ -2240,8 +2449,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" @@ -2298,43 +2508,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 -#: lib/groupeditform.php:161 +#: actions/profilesettings.php:115 actions/register.php:453 +#: lib/applicationeditform.php:230 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 "" @@ -2633,7 +2843,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 +2855,7 @@ msgstr "" msgid "Registration successful" msgstr "" -#: actions/register.php:114 actions/register.php:502 lib/action.php:457 +#: actions/register.php:114 actions/register.php:503 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "" @@ -2658,58 +2868,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 " @@ -2718,7 +2924,7 @@ msgstr "" "εκτός από τα εξής Ï€Ïοσωπικά δεδομένα: κωδικός Ï€Ïόσβασης, διεÏθυνση email, " "διεÏθυνση IM, τηλεφωνικό νοÏμεÏο." -#: actions/register.php:537 +#: actions/register.php:538 #, fuzzy, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -2752,7 +2958,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.)" @@ -2898,6 +3104,82 @@ msgstr "" msgid "User is already sandboxed." msgstr "" +#: actions/showapplication.php:82 +msgid "You must be logged in to view an application." +msgstr "" + +#: actions/showapplication.php:158 +msgid "Application profile" +msgstr "" + +#: actions/showapplication.php:160 lib/applicationeditform.php:182 +msgid "Icon" +msgstr "" + +#: actions/showapplication.php:170 actions/version.php:195 +#: lib/applicationeditform.php:197 +#, fuzzy +msgid "Name" +msgstr "Ψευδώνυμο" + +#: actions/showapplication.php:179 lib/applicationeditform.php:224 +#, fuzzy +msgid "Organization" +msgstr "ΠÏοσκλήσεις" + +#: actions/showapplication.php:188 actions/version.php:198 +#: lib/applicationeditform.php:211 lib/groupeditform.php:172 +msgid "Description" +msgstr "ΠεÏιγÏαφή" + +#: actions/showapplication.php:193 actions/showgroup.php:429 +#: lib/profileaction.php:174 +msgid "Statistics" +msgstr "" + +#: actions/showapplication.php:204 +#, php-format +msgid "created by %1$s - %2$s access by default - %3$d users" +msgstr "" + +#: actions/showapplication.php:214 +msgid "Application actions" +msgstr "" + +#: actions/showapplication.php:233 +msgid "Reset key & secret" +msgstr "" + +#: actions/showapplication.php:241 +msgid "Application info" +msgstr "" + +#: actions/showapplication.php:243 +msgid "Consumer key" +msgstr "" + +#: actions/showapplication.php:248 +msgid "Consumer secret" +msgstr "" + +#: actions/showapplication.php:253 +msgid "Request token URL" +msgstr "" + +#: actions/showapplication.php:258 +msgid "Access token URL" +msgstr "" + +#: actions/showapplication.php:263 +msgid "Authorize URL" +msgstr "" + +#: actions/showapplication.php:268 +msgid "" +"Note: We support HMAC-SHA1 signatures. We do not support the plaintext " +"signature method." +msgstr "" + #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "" @@ -2996,7 +3278,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,10 +3286,6 @@ msgstr "" msgid "All members" msgstr "" -#: actions/showgroup.php:429 lib/profileaction.php:174 -msgid "Statistics" -msgstr "" - #: actions/showgroup.php:432 msgid "Created" msgstr "ΔημιουÏγημένος" @@ -3146,12 +3424,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 @@ -3334,8 +3612,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 @@ -3364,7 +3643,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 @@ -3607,10 +3886,6 @@ 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 "" @@ -3806,10 +4081,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 "" @@ -3886,11 +4157,6 @@ msgstr "" msgid "Plugins" msgstr "" -#: actions/version.php:195 -#, fuzzy -msgid "Name" -msgstr "Ψευδώνυμο" - #: actions/version.php:196 lib/action.php:741 #, fuzzy msgid "Version" @@ -3900,27 +4166,43 @@ msgstr "ΠÏοσωπικά" msgid "Author(s)" msgstr "" -#: actions/version.php:198 lib/groupeditform.php:172 -msgid "Description" -msgstr "ΠεÏιγÏαφή" - -#: classes/File.php:137 +#: 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/Group_member.php:41 +#, fuzzy +msgid "Group join failed." +msgstr "ΑδÏνατη η αποθήκευση του Ï€Ïοφίλ." + +#: classes/Group_member.php:53 +#, fuzzy +msgid "Not part of group." +msgstr "ΑδÏνατη η αποθήκευση του Ï€Ïοφίλ." + +#: classes/Group_member.php:60 +#, fuzzy +msgid "Group leave failed." +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 "" @@ -3933,49 +4215,49 @@ msgstr "" msgid "Could not update message with new URI." msgstr "" -#: classes/Notice.php:172 +#: classes/Notice.php:171 #, php-format msgid "DB error inserting hashtag: %s" msgstr "Σφάλμα στη βάση δεδομένων κατά την εισαγωγή hashtag: %s" -#: classes/Notice.php:226 +#: classes/Notice.php:225 msgid "Problem saving notice. Too long." msgstr "" -#: classes/Notice.php:230 +#: classes/Notice.php:229 msgid "Problem saving notice. Unknown user." msgstr "" -#: classes/Notice.php:235 +#: classes/Notice.php:234 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:241 +#: classes/Notice.php:240 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:247 +#: classes/Notice.php:246 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:309 classes/Notice.php:334 +#: classes/Notice.php:305 classes/Notice.php:330 msgid "Problem saving notice." msgstr "" -#: classes/Notice.php:1034 +#: classes/Notice.php:1052 #, php-format msgid "DB error inserting reply: %s" msgstr "Σφάλμα βάσης δεδομένων κατά την εισαγωγή απάντησης: %s" -#: classes/Notice.php:1359 +#: classes/Notice.php:1423 #, php-format msgid "RT @%1$s %2$s" msgstr "" -#: classes/User.php:368 +#: classes/User.php:382 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" @@ -4017,6 +4299,11 @@ msgstr "" msgid "Other options" msgstr "" +#: lib/action.php:144 +#, php-format +msgid "%1$s - %2$s" +msgstr "" + #: lib/action.php:159 msgid "Untitled page" msgstr "" @@ -4033,10 +4320,6 @@ msgstr "ΑÏχή" msgid "Personal profile and friends timeline" msgstr "" -#: lib/action.php:435 -msgid "Account" -msgstr "ΛογαÏιασμός" - #: lib/action.php:435 msgid "Change your email, avatar, password, profile" msgstr "" @@ -4190,10 +4473,6 @@ msgstr "" msgid "Before" msgstr "" -#: lib/action.php:1167 -msgid "There was a problem with your session token." -msgstr "" - #: lib/adminpanelaction.php:96 msgid "You cannot make changes to this site." msgstr "" @@ -4229,6 +4508,68 @@ msgstr "Επιβεβαίωση διεÏθυνσης email" msgid "Paths configuration" msgstr "Επιβεβαίωση διεÏθυνσης email" +#: lib/applicationeditform.php:186 +msgid "Icon for this application" +msgstr "" + +#: lib/applicationeditform.php:206 +#, fuzzy, php-format +msgid "Describe your application in %d characters" +msgstr "ΠεÏιγÏάψτε την ομάδα ή το θέμα μέχÏι %d χαÏακτήÏες" + +#: lib/applicationeditform.php:209 +#, fuzzy +msgid "Describe your application" +msgstr "ΠεÏιγÏάψτε την ομάδα ή το θέμα" + +#: lib/applicationeditform.php:218 +msgid "Source URL" +msgstr "" + +#: lib/applicationeditform.php:220 +msgid "URL of the homepage of this application" +msgstr "" + +#: lib/applicationeditform.php:226 +msgid "Organization responsible for this application" +msgstr "" + +#: lib/applicationeditform.php:232 +msgid "URL for the homepage of the organization" +msgstr "" + +#: lib/applicationeditform.php:238 +msgid "URL to redirect to after authentication" +msgstr "" + +#: lib/applicationeditform.php:260 +msgid "Browser" +msgstr "" + +#: lib/applicationeditform.php:276 +msgid "Desktop" +msgstr "" + +#: lib/applicationeditform.php:277 +msgid "Type of application, browser or desktop" +msgstr "" + +#: lib/applicationeditform.php:299 +msgid "Read-only" +msgstr "" + +#: lib/applicationeditform.php:317 +msgid "Read-write" +msgstr "" + +#: lib/applicationeditform.php:318 +msgid "Default access for this application: read-only, or read-write" +msgstr "" + +#: lib/applicationlist.php:154 +msgid "Revoke" +msgstr "" + #: lib/attachmentlist.php:87 msgid "Attachments" msgstr "" @@ -4249,12 +4590,12 @@ msgstr "" msgid "Tags for this attachment" msgstr "" -#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 +#: lib/authenticationplugin.php:214 lib/authenticationplugin.php:219 #, fuzzy msgid "Password changing failed" msgstr "Ο κωδικός αποθηκεÏτηκε." -#: lib/authenticationplugin.php:197 +#: lib/authenticationplugin.php:229 #, fuzzy msgid "Password changing is not allowed" msgstr "Ο κωδικός αποθηκεÏτηκε." @@ -4277,7 +4618,7 @@ msgstr "" #: lib/command.php:88 #, fuzzy, php-format -msgid "Could not find a user with nickname %s." +msgid "Could not find a user with nickname %s" msgstr "Απέτυχε η ενημέÏωση χÏήστη μέσω επιβεβαιωμένης email διεÏθυνσης." #: lib/command.php:92 @@ -4286,7 +4627,7 @@ msgstr "" #: lib/command.php:99 #, php-format -msgid "Nudge sent to %s." +msgid "Nudge sent to %s" msgstr "" #: lib/command.php:126 @@ -4297,166 +4638,191 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:399 lib/command.php:460 -msgid "Notice with that id does not exist." +#: lib/command.php:152 lib/command.php:390 lib/command.php:451 +msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:415 lib/command.php:476 -#: lib/command.php:532 -msgid "User has no last notice." +#: lib/command.php:168 lib/command.php:406 lib/command.php:467 +#: lib/command.php:523 +msgid "User has no last notice" msgstr "" #: lib/command.php:190 msgid "Notice marked as fave." msgstr "" -#: lib/command.php:284 +#: lib/command.php:217 +#, fuzzy +msgid "You are already a member of that group" +msgstr "Ομάδες με τα πεÏισσότεÏα μέλη" + +#: lib/command.php:231 #, fuzzy, php-format -msgid "Could not remove user %1$s to group %2$s." +msgid "Could not join user %s to group %s" +msgstr "ΑδÏνατη η αποθήκευση των νέων πληÏοφοÏιών του Ï€Ïοφίλ" + +#: lib/command.php:236 +#, fuzzy, php-format +msgid "%s joined group %s" +msgstr "ομάδες των χÏηστών %s" + +#: lib/command.php:275 +#, fuzzy, php-format +msgid "Could not remove user %s to group %s" msgstr "ΑδÏνατη η αποθήκευση του Ï€Ïοφίλ." -#: lib/command.php:318 -#, php-format -msgid "Fullname: %s" -msgstr "" +#: lib/command.php:280 +#, fuzzy, php-format +msgid "%s left group %s" +msgstr "ομάδες των χÏηστών %s" -#: lib/command.php:321 +#: lib/command.php:309 +#, fuzzy, php-format +msgid "Fullname: %s" +msgstr "Ονοματεπώνυμο" + +#: lib/command.php:312 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "" -#: lib/command.php:324 +#: lib/command.php:315 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "" -#: lib/command.php:327 +#: lib/command.php:318 #, php-format msgid "About: %s" msgstr "" -#: lib/command.php:358 +#: lib/command.php:349 #, php-format -msgid "Message too long - maximum is %1$d characters, you sent %2$d." +msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:376 +#: lib/command.php:367 #, php-format -msgid "Direct message to %s sent." +msgid "Direct message to %s sent" msgstr "" -#: lib/command.php:378 +#: lib/command.php:369 msgid "Error sending direct message." msgstr "" -#: lib/command.php:435 +#: lib/command.php:413 +#, fuzzy +msgid "Cannot repeat your own notice" +msgstr "Αδυναμία διαγÏαφής Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… μηνÏματος." + +#: lib/command.php:418 +#, fuzzy +msgid "Already repeated that notice" +msgstr "Αδυναμία διαγÏαφής Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… μηνÏματος." + +#: lib/command.php:426 #, fuzzy, php-format -msgid "Notice from %s repeated." +msgid "Notice from %s repeated" msgstr "Ρυθμίσεις OpenID" -#: lib/command.php:437 +#: lib/command.php:428 msgid "Error repeating notice." msgstr "" +#: lib/command.php:482 +#, php-format +msgid "Notice too long - maximum is %d characters, you sent %d" +msgstr "" + #: lib/command.php:491 #, php-format -msgid "Notice too long - maximum is %1$d characters, you sent %2$d." +msgid "Reply to %s sent" msgstr "" -#: lib/command.php:500 -#, php-format -msgid "Reply to %s sent." -msgstr "" - -#: lib/command.php:502 +#: lib/command.php:493 msgid "Error saving notice." msgstr "" -#: lib/command.php:556 -msgid "Specify the name of the user to subscribe to." +#: lib/command.php:547 +msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:563 +#: lib/command.php:554 #, php-format msgid "Subscribed to %s" msgstr "" -#: lib/command.php:584 -msgid "Specify the name of the user to unsubscribe from." +#: lib/command.php:575 +msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:591 +#: lib/command.php:582 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:609 lib/command.php:632 +#: lib/command.php:600 lib/command.php:623 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:612 +#: lib/command.php:603 msgid "Notification off." msgstr "" -#: lib/command.php:614 +#: lib/command.php:605 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:635 +#: lib/command.php:626 msgid "Notification on." msgstr "" -#: lib/command.php:637 +#: lib/command.php:628 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:650 -msgid "Login command is disabled." +#: lib/command.php:641 +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:652 #, php-format -msgid "This link is useable only once, and is good for only 2 minutes: %s." +msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:685 +#: lib/command.php:668 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Δεν επιτÏέπεται να κάνεις συνδÏομητές του λογαÏÎ¹Î±ÏƒÎ¼Î¿Ï ÏƒÎ¿Ï… άλλους." -#: lib/command.php:687 +#: lib/command.php:670 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:690 #, fuzzy msgid "No one is subscribed to you." msgstr "Δεν επιτÏέπεται να κάνεις συνδÏομητές του λογαÏÎ¹Î±ÏƒÎ¼Î¿Ï ÏƒÎ¿Ï… άλλους." -#: lib/command.php:709 +#: lib/command.php:692 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:712 msgid "You are not a member of any groups." msgstr "Δεν είστε μέλος καμίας ομάδας." -#: lib/command.php:731 +#: lib/command.php:714 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:728 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4497,20 +4863,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:199 +#: lib/common.php:131 #, fuzzy msgid "No configuration file found. " msgstr "Ο κωδικός επιβεβαίωσης δεν βÏέθηκε." -#: lib/common.php:200 +#: lib/common.php:132 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:201 +#: lib/common.php:134 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:202 +#: lib/common.php:135 msgid "Go to the installer." msgstr "" @@ -4526,6 +4892,15 @@ msgstr "" msgid "Updates by SMS" msgstr "" +#: lib/connectsettingsaction.php:120 +#, fuzzy +msgid "Connections" +msgstr "ΣÏνδεση" + +#: lib/connectsettingsaction.php:121 +msgid "Authorized connected applications" +msgstr "" + #: lib/dberroraction.php:60 msgid "Database error" msgstr "" @@ -4710,11 +5085,16 @@ msgstr "" msgid "kB" msgstr "" -#: lib/jabber.php:191 +#: lib/jabber.php:202 #, php-format msgid "[%s]" msgstr "" +#: lib/jabber.php:385 +#, php-format +msgid "Unknown inbox source %d." +msgstr "" + #: lib/joinform.php:114 msgid "Join" msgstr "Συμμετοχή" @@ -4772,21 +5152,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" @@ -4975,7 +5343,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 @@ -4984,7 +5352,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 @@ -4994,7 +5362,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 @@ -5028,16 +5396,18 @@ msgstr "" #: lib/noticeform.php:212 #, fuzzy -msgid "Share my location." -msgstr "ΑδÏνατη η αποθήκευση του Ï€Ïοφίλ." - -#: lib/noticeform.php:214 -#, fuzzy -msgid "Do not share my location." +msgid "Share my location" msgstr "ΑδÏνατη η αποθήκευση του Ï€Ïοφίλ." #: lib/noticeform.php:215 -msgid "Hide this info" +#, fuzzy +msgid "Do not share my location" +msgstr "ΑδÏνατη η αποθήκευση του Ï€Ïοφίλ." + +#: lib/noticeform.php:216 +msgid "" +"Sorry, retrieving your geo location is taking longer than expected, please " +"try again later" msgstr "" #: lib/noticelist.php:428 @@ -5303,25 +5673,25 @@ msgstr "" msgid "User has blocked you." msgstr "" -#: lib/subs.php:60 +#: lib/subs.php:63 msgid "Could not subscribe." msgstr "Απέτυχε η συνδÏομή." -#: lib/subs.php:79 +#: lib/subs.php:82 msgid "Could not subscribe other to you." msgstr "Δεν επιτÏέπεται να κάνεις συνδÏομητές του λογαÏÎ¹Î±ÏƒÎ¼Î¿Ï ÏƒÎ¿Ï… άλλους." -#: lib/subs.php:128 +#: lib/subs.php:137 #, fuzzy msgid "Not subscribed!" msgstr "Απέτυχε η συνδÏομή." -#: lib/subs.php:133 +#: lib/subs.php:142 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "Απέτυχε η διαγÏαφή συνδÏομής." -#: lib/subs.php:146 +#: lib/subs.php:158 msgid "Couldn't delete subscription." msgstr "Απέτυχε η διαγÏαφή συνδÏομής." @@ -5335,10 +5705,6 @@ msgstr "" msgid "People Tagcloud as tagged" msgstr "" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(κανένα)" - #: lib/tagcloudsection.php:56 msgid "None" msgstr "Κανένα" @@ -5401,47 +5767,47 @@ msgstr "Μήνυμα" msgid "Moderate" msgstr "" -#: lib/util.php:837 +#: lib/util.php:875 msgid "a few seconds ago" msgstr "" -#: lib/util.php:839 +#: lib/util.php:877 msgid "about a minute ago" msgstr "" -#: lib/util.php:841 +#: lib/util.php:879 #, php-format msgid "about %d minutes ago" msgstr "" -#: lib/util.php:843 +#: lib/util.php:881 msgid "about an hour ago" msgstr "" -#: lib/util.php:845 +#: lib/util.php:883 #, php-format msgid "about %d hours ago" msgstr "" -#: lib/util.php:847 +#: lib/util.php:885 msgid "about a day ago" msgstr "" -#: lib/util.php:849 +#: lib/util.php:887 #, php-format msgid "about %d days ago" msgstr "" -#: lib/util.php:851 +#: lib/util.php:889 msgid "about a month ago" msgstr "" -#: lib/util.php:853 +#: lib/util.php:891 #, php-format msgid "about %d months ago" msgstr "" -#: lib/util.php:855 +#: lib/util.php:893 msgid "about a year ago" msgstr "" @@ -5457,5 +5823,5 @@ msgstr "" #: scripts/xmppdaemon.php:301 #, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po index 8ec4ae61c0..6735bd23c0 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-10 00:46+0000\n" -"PO-Revision-Date: 2010-01-10 00:47:30+0000\n" +"POT-Creation-Date: 2010-01-15 19:15+0000\n" +"PO-Revision-Date: 2010-01-15 19:16:41+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 (r60878); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r61101); 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" @@ -35,25 +35,30 @@ msgstr "No such page" #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 +#: actions/apistatusesupdate.php:149 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 #: 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 #: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 -#: lib/command.php:163 lib/command.php:311 lib/command.php:364 -#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/command.php:163 lib/command.php:302 lib/command.php:355 +#: lib/command.php:401 lib/command.php:462 lib/command.php:518 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/subs.php:34 lib/subs.php:125 msgid "No such user." msgstr "No such user." +#: actions/all.php:84 +#, fuzzy, php-format +msgid "%1$s and friends, page %2$d" +msgstr "%s blocked profiles, page %d" + #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 +#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -112,7 +117,7 @@ msgstr "" msgid "You and friends" msgstr "You and friends" -#: actions/allrss.php:119 actions/apitimelinefriends.php:122 +#: actions/allrss.php:119 actions/apitimelinefriends.php:121 #: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" @@ -123,6 +128,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:155 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." @@ -136,7 +158,7 @@ msgstr "API method not found." #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:114 +#: actions/apistatusesupdate.php:119 msgid "This method requires a POST." msgstr "This method requires a POST." @@ -169,8 +191,9 @@ msgstr "Couldn't save profile." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257 -#: actions/designadminpanel.php:122 actions/newnotice.php:94 +#: actions/apistatusesupdate.php:132 actions/avatarsettings.php:257 +#: actions/designadminpanel.php:122 actions/editapplication.php:118 +#: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format msgid "" @@ -184,6 +207,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!" @@ -224,26 +250,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!" @@ -267,7 +273,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 @@ -275,7 +282,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 @@ -296,7 +304,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 @@ -329,7 +338,8 @@ msgstr "Nickname already in use. Try another one." msgid "Not a valid nickname." msgstr "Not a valid nickname." -#: actions/apigroupcreate.php:196 actions/editgroup.php:195 +#: actions/apigroupcreate.php:196 actions/editapplication.php:212 +#: actions/editgroup.php:195 actions/newapplication.php:200 #: actions/newgroup.php:139 actions/profilesettings.php:222 #: actions/register.php:217 msgid "Homepage is not a valid URL." @@ -341,7 +351,8 @@ msgstr "Homepage is not a valid URL." msgid "Full name is too long (max 255 chars)." msgstr "Full name is too long (max 255 chars)." -#: actions/apigroupcreate.php:213 +#: actions/apigroupcreate.php:213 actions/editapplication.php:187 +#: actions/newapplication.php:169 #, php-format msgid "Description is too long (max %d chars)." msgstr "Description is too long (max %d chars)" @@ -381,7 +392,7 @@ msgstr "Alias can't be the same as nickname." msgid "Group not found!" msgstr "Group not found!" -#: actions/apigroupjoin.php:110 lib/command.php:217 +#: 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." @@ -389,7 +400,7 @@ 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 lib/command.php:234 +#: actions/apigroupjoin.php:138 actions/joingroup.php:124 #, fuzzy, php-format msgid "Could not join user %1$s to group %2$s." msgstr "Could not join user %s to group %s." @@ -398,7 +409,7 @@ msgstr "Could not join user %s to group %s." msgid "You are not a member of this group." msgstr "You are not a member of this group." -#: actions/apigroupleave.php:124 actions/leavegroup.php:127 +#: actions/apigroupleave.php:124 actions/leavegroup.php:119 #, fuzzy, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "Could not remove user %s to group %s." @@ -418,6 +429,102 @@ msgstr "%s groups" msgid "groups on %s" msgstr "groups on %s" +#: actions/apioauthauthorize.php:108 actions/apioauthauthorize.php:114 +msgid "Bad request." +msgstr "" + +#: actions/apioauthauthorize.php:134 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:115 actions/makeadmin.php:66 +#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 +#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:139 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 +#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/subscribe.php:46 actions/tagother.php:166 +#: 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 "There was a problem with your session token. Try again, please." + +#: actions/apioauthauthorize.php:146 +#, fuzzy +msgid "Invalid nickname / password!" +msgstr "Invalid username or password." + +#: actions/apioauthauthorize.php:170 +#, fuzzy +msgid "DB error deleting OAuth app user." +msgstr "Error setting user." + +#: actions/apioauthauthorize.php:196 +#, fuzzy +msgid "DB error inserting OAuth app user." +msgstr "DB error inserting hashtag: %s" + +#: actions/apioauthauthorize.php:231 +#, php-format +msgid "" +"The request token %s has been authorized. Please exchange it for an access " +"token." +msgstr "" + +#: actions/apioauthauthorize.php:241 +#, php-format +msgid "The request token %s has been denied." +msgstr "" + +#: actions/apioauthauthorize.php:246 actions/avatarsettings.php:281 +#: actions/designadminpanel.php:103 actions/editapplication.php:139 +#: actions/emailsettings.php:256 actions/grouplogo.php:319 +#: actions/imsettings.php:220 actions/newapplication.php:121 +#: actions/oauthconnectionssettings.php:151 actions/recoverpassword.php:44 +#: actions/smssettings.php:248 lib/designsettings.php:304 +msgid "Unexpected form submission." +msgstr "Unexpected form submission." + +#: actions/apioauthauthorize.php:273 +msgid "An application would like to connect to your account" +msgstr "" + +#: actions/apioauthauthorize.php:290 +msgid "Allow or deny access" +msgstr "" + +#: actions/apioauthauthorize.php:320 lib/action.php:435 +msgid "Account" +msgstr "Account" + +#: actions/apioauthauthorize.php:323 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/apioauthauthorize.php:326 actions/login.php:233 +#: actions/register.php:429 lib/accountsettingsaction.php:116 +msgid "Password" +msgstr "Password" + +#: actions/apioauthauthorize.php:338 +#, fuzzy +msgid "Deny" +msgstr "Design" + +#: actions/apioauthauthorize.php:344 +#, fuzzy +msgid "Allow" +msgstr "All" + +#: actions/apioauthauthorize.php:361 +msgid "Allow or deny access to your account information." +msgstr "" + #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." msgstr "This method requires a POST or DELETE." @@ -431,11 +538,11 @@ msgstr "You may not delete another user's status." msgid "No such notice." msgstr "No such notice." -#: actions/apistatusesretweet.php:83 lib/command.php:422 +#: actions/apistatusesretweet.php:83 msgid "Cannot repeat your own notice." msgstr "Cannot repeat your own notice." -#: actions/apistatusesretweet.php:91 lib/command.php:427 +#: actions/apistatusesretweet.php:91 msgid "Already repeated that notice." msgstr "Already repeated that notice." @@ -447,17 +554,17 @@ msgstr "Status deleted." msgid "No status with that ID found." msgstr "No status with that ID found." -#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:162 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "That's too long. Max notice size is %d chars." -#: actions/apistatusesupdate.php:198 +#: actions/apistatusesupdate.php:203 msgid "Not found" msgstr "Not found" -#: actions/apistatusesupdate.php:221 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:226 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "Max notice size is %d chars, including attachment URL." @@ -541,8 +648,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." @@ -565,8 +675,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" @@ -598,29 +708,6 @@ 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/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 -#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 -#: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 -#: actions/subscribe.php:46 actions/tagother.php:166 -#: 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 "There was a problem with your session token. Try again, please." - -#: actions/avatarsettings.php:281 actions/designadminpanel.php:103 -#: actions/emailsettings.php:256 actions/grouplogo.php:319 -#: actions/imsettings.php:220 actions/recoverpassword.php:44 -#: actions/smssettings.php:248 lib/designsettings.php:304 -msgid "Unexpected form submission." -msgstr "Unexpected form submission." - #: actions/avatarsettings.php:328 msgid "Pick a square area of the image to be your avatar" msgstr "Pick a square area of the image to be your avatar" @@ -682,19 +769,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:260 +msgid "No such group." +msgstr "No such group." #: actions/blockedfromgroup.php:90 #, php-format @@ -761,7 +844,8 @@ msgid "Couldn't delete email confirmation." msgstr "Couldn't delete e-mail confirmation." #: actions/confirmaddress.php:144 -msgid "Confirm Address" +#, fuzzy +msgid "Confirm address" msgstr "Confirm Address" #: actions/confirmaddress.php:159 @@ -816,10 +900,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." @@ -955,7 +1035,8 @@ msgstr "Reset back to default" #: actions/pathsadminpanel.php:324 actions/profilesettings.php:174 #: actions/siteadminpanel.php:388 actions/smssettings.php:181 #: actions/subscriptions.php:203 actions/tagother.php:154 -#: actions/useradminpanel.php:313 lib/designsettings.php:256 +#: actions/useradminpanel.php:313 lib/applicationeditform.php:335 +#: lib/applicationeditform.php:336 lib/designsettings.php:256 #: lib/groupeditform.php:202 msgid "Save" msgstr "Save" @@ -976,6 +1057,86 @@ msgstr "Add to favourites" msgid "No such document." msgstr "No such document." +#: actions/editapplication.php:54 lib/applicationeditform.php:136 +msgid "Edit application" +msgstr "" + +#: actions/editapplication.php:66 +#, fuzzy +msgid "You must be logged in to edit an application." +msgstr "You must be logged in to create a group." + +#: actions/editapplication.php:77 actions/showapplication.php:94 +#, fuzzy +msgid "You are not the owner of this application." +msgstr "You are not a member of this group." + +#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:163 +#: actions/showapplication.php:87 +#, fuzzy +msgid "No such application." +msgstr "No such notice." + +#: actions/editapplication.php:127 actions/newapplication.php:110 +#: actions/showapplication.php:118 lib/action.php:1167 +msgid "There was a problem with your session token." +msgstr "There was a problem with your session token." + +#: actions/editapplication.php:161 +#, fuzzy +msgid "Use this form to edit your application." +msgstr "Use this form to edit the group." + +#: actions/editapplication.php:177 actions/newapplication.php:159 +#, fuzzy +msgid "Name is required." +msgstr "Same as password above. Required." + +#: actions/editapplication.php:180 actions/newapplication.php:162 +#, fuzzy +msgid "Name is too long (max 255 chars)." +msgstr "Full name is too long (max 255 chars)." + +#: actions/editapplication.php:183 actions/newapplication.php:165 +#, fuzzy +msgid "Description is required." +msgstr "Description" + +#: actions/editapplication.php:191 +msgid "Source URL is too long." +msgstr "" + +#: actions/editapplication.php:197 actions/newapplication.php:182 +#, fuzzy +msgid "Source URL is not valid." +msgstr "Homepage is not a valid URL." + +#: actions/editapplication.php:200 actions/newapplication.php:185 +msgid "Organization is required." +msgstr "" + +#: actions/editapplication.php:203 actions/newapplication.php:188 +#, fuzzy +msgid "Organization is too long (max 255 chars)." +msgstr "Location is too long (max 255 chars)." + +#: actions/editapplication.php:206 actions/newapplication.php:191 +msgid "Organization homepage is required." +msgstr "" + +#: actions/editapplication.php:215 actions/newapplication.php:203 +msgid "Callback is too long." +msgstr "" + +#: actions/editapplication.php:222 actions/newapplication.php:212 +msgid "Callback URL is not valid." +msgstr "" + +#: actions/editapplication.php:255 +#, fuzzy +msgid "Could not update application." +msgstr "Could not update group." + #: actions/editgroup.php:56 #, php-format msgid "Edit %s group" @@ -987,7 +1148,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 @@ -1012,7 +1174,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 @@ -1044,13 +1207,15 @@ msgstr "" "a message with further instructions." #: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 +#: actions/smssettings.php:126 lib/applicationeditform.php:333 +#: lib/applicationeditform.php:334 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\"" @@ -1123,8 +1288,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 @@ -1311,13 +1477,6 @@ 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:79 #, fuzzy msgid "No such file." @@ -1336,7 +1495,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." @@ -1386,8 +1545,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 @@ -1414,13 +1574,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." @@ -1436,6 +1589,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." @@ -1560,7 +1718,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 @@ -1590,7 +1749,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 @@ -1687,7 +1847,7 @@ 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 lib/command.php:315 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -1732,7 +1892,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:234 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236 msgid "Send" msgstr "Send" @@ -1802,16 +1962,7 @@ 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 -msgid "You are already a member of that group" -msgstr "You are already a member of that group" - -#: 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/joingroup.php:135 lib/command.php:239 +#: actions/joingroup.php:131 #, fuzzy, php-format msgid "%1$s joined group %2$s" msgstr "%s joined group %s" @@ -1820,70 +1971,50 @@ msgstr "%s joined group %s" msgid "You must be logged in to leave a group." msgstr "You must be logged in to leave a group." -#: actions/leavegroup.php:90 lib/command.php:268 +#: actions/leavegroup.php:90 lib/command.php:265 msgid "You are not a member of that group." msgstr "You are not a member of that group." -#: actions/leavegroup.php:119 lib/command.php:278 -msgid "Could not find membership record." -msgstr "Could not find membership record." - -#: actions/leavegroup.php:134 lib/command.php:289 +#: actions/leavegroup.php:127 #, 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:460 +#: 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 -#: lib/groupeditform.php:152 lib/userprofile.php:131 -msgid "Nickname" -msgstr "Nickname" - -#: actions/login.php:253 actions/register.php:428 -#: 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." @@ -1891,7 +2022,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]" @@ -1910,19 +2041,42 @@ 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 %1$s in group %2$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 #, fuzzy, php-format -msgid "Can't make %1$s an admin for group %2$s" +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" msgstr "No current status" +#: actions/newapplication.php:52 +msgid "New application" +msgstr "" + +#: actions/newapplication.php:64 +#, fuzzy +msgid "You must be logged in to register an application." +msgstr "You must be logged in to create a group." + +#: actions/newapplication.php:143 +#, fuzzy +msgid "Use this form to register a new application." +msgstr "Use this form to create a new group." + +#: actions/newapplication.php:173 +msgid "Source URL is required." +msgstr "" + +#: actions/newapplication.php:255 actions/newapplication.php:264 +#, fuzzy +msgid "Could not create application." +msgstr "Could not create aliases" + #: actions/newgroup.php:53 msgid "New group" msgstr "New group" @@ -1935,12 +2089,12 @@ msgstr "Use this form to create a new group." msgid "New message" msgstr "New message" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 msgid "You can't send a message to this user." msgstr "You can't send a message to this user." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:484 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 +#: lib/command.php:475 msgid "No content!" msgstr "No content!" @@ -1948,7 +2102,7 @@ msgstr "No content!" msgid "No recipient specified." msgstr "No recipient specified." -#: actions/newmessage.php:164 lib/command.php:370 +#: actions/newmessage.php:164 lib/command.php:361 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -1959,8 +2113,8 @@ msgid "Message sent" msgstr "Message sent" #: actions/newmessage.php:185 -#, php-format -msgid "Direct message to %s sent" +#, fuzzy, php-format +msgid "Direct message to %s sent." msgstr "Direct message to %s sent" #: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 @@ -2031,6 +2185,51 @@ msgstr "Nudge sent" msgid "Nudge sent!" msgstr "Nudge sent!" +#: actions/oauthappssettings.php:59 +#, fuzzy +msgid "You must be logged in to list your applications." +msgstr "You must be logged in to create a group." + +#: actions/oauthappssettings.php:74 +#, fuzzy +msgid "OAuth applications" +msgstr "Other options" + +#: actions/oauthappssettings.php:85 +msgid "Applications you have registered" +msgstr "" + +#: actions/oauthappssettings.php:135 +#, php-format +msgid "You have not registered any applications yet." +msgstr "" + +#: actions/oauthconnectionssettings.php:71 +msgid "Connected applications" +msgstr "" + +#: actions/oauthconnectionssettings.php:87 +msgid "You have allowed the following applications to access you account." +msgstr "" + +#: actions/oauthconnectionssettings.php:170 +#, fuzzy +msgid "You are not a user of that application." +msgstr "You are not a member of that group." + +#: actions/oauthconnectionssettings.php:180 +msgid "Unable to revoke access for app: " +msgstr "" + +#: actions/oauthconnectionssettings.php:192 +#, php-format +msgid "You have not authorized any applications to use your account." +msgstr "" + +#: actions/oauthconnectionssettings.php:205 +msgid "Developers can edit the registration settings for their applications " +msgstr "" + #: actions/oembed.php:79 actions/shownotice.php:100 msgid "Notice has no profile" msgstr "Notice has no profile" @@ -2049,8 +2248,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:1038 +#: lib/api.php:1066 lib/api.php:1176 msgid "Not a supported data format." msgstr "Not a supported data format." @@ -2063,7 +2262,8 @@ msgid "Notice Search" msgstr "Notice Search" #: actions/othersettings.php:60 -msgid "Other Settings" +#, fuzzy +msgid "Other settings" msgstr "Other Settings" #: actions/othersettings.php:71 @@ -2095,6 +2295,31 @@ msgstr "" msgid "URL shortening service is too long (max 50 chars)." msgstr "URL shortening service is too long (max 50 chars)." +#: 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 msgid "Outbox for %s" @@ -2129,7 +2354,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" @@ -2296,8 +2521,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" @@ -2357,42 +2583,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 -#: lib/groupeditform.php:161 +#: actions/profilesettings.php:115 actions/register.php:453 +#: lib/applicationeditform.php:230 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\"" @@ -2698,7 +2924,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." @@ -2711,7 +2937,7 @@ msgstr "Error with confirmation code." msgid "Registration successful" msgstr "Registration successful" -#: actions/register.php:114 actions/register.php:502 lib/action.php:457 +#: actions/register.php:114 actions/register.php:503 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Register" @@ -2724,58 +2950,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 " @@ -2784,7 +3006,7 @@ msgstr "" " except this private data: password, e-mail address, IM address, phone " "number." -#: actions/register.php:537 +#: actions/register.php:538 #, fuzzy, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -2817,7 +3039,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.)" @@ -2972,6 +3194,84 @@ msgstr "You cannot sandbox users on this site." msgid "User is already sandboxed." msgstr "User is already sandboxed." +#: actions/showapplication.php:82 +#, fuzzy +msgid "You must be logged in to view an application." +msgstr "You must be logged in to leave a group." + +#: actions/showapplication.php:158 +#, fuzzy +msgid "Application profile" +msgstr "Notice has no profile" + +#: actions/showapplication.php:160 lib/applicationeditform.php:182 +msgid "Icon" +msgstr "" + +#: actions/showapplication.php:170 actions/version.php:195 +#: lib/applicationeditform.php:197 +#, fuzzy +msgid "Name" +msgstr "Nickname" + +#: actions/showapplication.php:179 lib/applicationeditform.php:224 +#, fuzzy +msgid "Organization" +msgstr "Pagination" + +#: actions/showapplication.php:188 actions/version.php:198 +#: lib/applicationeditform.php:211 lib/groupeditform.php:172 +msgid "Description" +msgstr "Description" + +#: actions/showapplication.php:193 actions/showgroup.php:429 +#: lib/profileaction.php:174 +msgid "Statistics" +msgstr "Statistics" + +#: actions/showapplication.php:204 +#, php-format +msgid "created by %1$s - %2$s access by default - %3$d users" +msgstr "" + +#: actions/showapplication.php:214 +msgid "Application actions" +msgstr "" + +#: actions/showapplication.php:233 +msgid "Reset key & secret" +msgstr "" + +#: actions/showapplication.php:241 +msgid "Application info" +msgstr "" + +#: actions/showapplication.php:243 +msgid "Consumer key" +msgstr "" + +#: actions/showapplication.php:248 +msgid "Consumer secret" +msgstr "" + +#: actions/showapplication.php:253 +msgid "Request token URL" +msgstr "" + +#: actions/showapplication.php:258 +msgid "Access token URL" +msgstr "" + +#: actions/showapplication.php:263 +msgid "Authorize URL" +msgstr "" + +#: actions/showapplication.php:268 +msgid "" +"Note: We support HMAC-SHA1 signatures. We do not support the plaintext " +"signature method." +msgstr "" + #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "Could not retrieve favourite notices." @@ -3069,7 +3369,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)" @@ -3077,10 +3377,6 @@ msgstr "(None)" msgid "All members" msgstr "All members" -#: actions/showgroup.php:429 lib/profileaction.php:174 -msgid "Statistics" -msgstr "Statistics" - #: actions/showgroup.php:432 msgid "Created" msgstr "Created" @@ -3229,12 +3525,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 @@ -3416,7 +3712,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 @@ -3446,7 +3743,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 @@ -3700,10 +3998,6 @@ 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" @@ -3910,11 +4204,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" @@ -3993,11 +4282,6 @@ msgstr "" msgid "Plugins" msgstr "" -#: actions/version.php:195 -#, fuzzy -msgid "Name" -msgstr "Nickname" - #: actions/version.php:196 lib/action.php:741 #, fuzzy msgid "Version" @@ -4007,27 +4291,43 @@ msgstr "Personal" msgid "Author(s)" msgstr "" -#: actions/version.php:198 lib/groupeditform.php:172 -msgid "Description" -msgstr "Description" - -#: classes/File.php:137 +#: 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/Group_member.php:41 +#, fuzzy +msgid "Group join failed." +msgstr "Group profile" + +#: classes/Group_member.php:53 +#, fuzzy +msgid "Not part of group." +msgstr "Could not update group." + +#: classes/Group_member.php:60 +#, fuzzy +msgid "Group leave failed." +msgstr "Group profile" + +#: 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." @@ -4041,27 +4341,27 @@ msgstr "Could not insert message." msgid "Could not update message with new URI." msgstr "Could not update message with new URI." -#: classes/Notice.php:172 +#: classes/Notice.php:171 #, php-format msgid "DB error inserting hashtag: %s" msgstr "DB error inserting hashtag: %s" -#: classes/Notice.php:226 +#: classes/Notice.php:225 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Problem saving notice." -#: classes/Notice.php:230 +#: classes/Notice.php:229 msgid "Problem saving notice. Unknown user." msgstr "Problem saving notice. Unknown user." -#: classes/Notice.php:235 +#: classes/Notice.php:234 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Too many notices too fast; take a breather and post again in a few minutes." -#: classes/Notice.php:241 +#: classes/Notice.php:240 #, fuzzy msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " @@ -4069,25 +4369,25 @@ msgid "" msgstr "" "Too many notices too fast; take a breather and post again in a few minutes." -#: classes/Notice.php:247 +#: classes/Notice.php:246 msgid "You are banned from posting notices on this site." msgstr "You are banned from posting notices on this site." -#: classes/Notice.php:309 classes/Notice.php:334 +#: classes/Notice.php:305 classes/Notice.php:330 msgid "Problem saving notice." msgstr "Problem saving notice." -#: classes/Notice.php:1034 +#: classes/Notice.php:1052 #, php-format msgid "DB error inserting reply: %s" msgstr "DB error inserting reply: %s" -#: classes/Notice.php:1359 +#: classes/Notice.php:1423 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" -#: classes/User.php:368 +#: classes/User.php:382 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Welcome to %1$s, @%2$s!" @@ -4128,6 +4428,11 @@ msgstr "Other" msgid "Other options" msgstr "Other options" +#: lib/action.php:144 +#, fuzzy, php-format +msgid "%1$s - %2$s" +msgstr "%1$s (%2$s)" + #: lib/action.php:159 msgid "Untitled page" msgstr "Untitled page" @@ -4144,10 +4449,6 @@ msgstr "Home" msgid "Personal profile and friends timeline" msgstr "Personal profile and friends timeline" -#: lib/action.php:435 -msgid "Account" -msgstr "Account" - #: lib/action.php:435 msgid "Change your email, avatar, password, profile" msgstr "Change your e-mail, avatar, password, profile" @@ -4304,10 +4605,6 @@ msgstr "After" msgid "Before" msgstr "Before" -#: lib/action.php:1167 -msgid "There was a problem with your session token." -msgstr "There was a problem with your session token." - #: lib/adminpanelaction.php:96 #, fuzzy msgid "You cannot make changes to this site." @@ -4347,6 +4644,72 @@ msgstr "Design configuration" msgid "Paths configuration" msgstr "SMS confirmation" +#: lib/applicationeditform.php:186 +msgid "Icon for this application" +msgstr "" + +#: lib/applicationeditform.php:206 +#, fuzzy, php-format +msgid "Describe your application in %d characters" +msgstr "Describe the group or topic in %d characters" + +#: lib/applicationeditform.php:209 +#, fuzzy +msgid "Describe your application" +msgstr "Describe the group or topic" + +#: lib/applicationeditform.php:218 +#, fuzzy +msgid "Source URL" +msgstr "Source" + +#: lib/applicationeditform.php:220 +#, fuzzy +msgid "URL of the homepage of this application" +msgstr "URL of the homepage or blog of the group or topic" + +#: lib/applicationeditform.php:226 +msgid "Organization responsible for this application" +msgstr "" + +#: lib/applicationeditform.php:232 +#, fuzzy +msgid "URL for the homepage of the organization" +msgstr "URL of the homepage or blog of the group or topic" + +#: lib/applicationeditform.php:238 +msgid "URL to redirect to after authentication" +msgstr "" + +#: lib/applicationeditform.php:260 +msgid "Browser" +msgstr "" + +#: lib/applicationeditform.php:276 +msgid "Desktop" +msgstr "" + +#: lib/applicationeditform.php:277 +msgid "Type of application, browser or desktop" +msgstr "" + +#: lib/applicationeditform.php:299 +msgid "Read-only" +msgstr "" + +#: lib/applicationeditform.php:317 +msgid "Read-write" +msgstr "" + +#: lib/applicationeditform.php:318 +msgid "Default access for this application: read-only, or read-write" +msgstr "" + +#: lib/applicationlist.php:154 +#, fuzzy +msgid "Revoke" +msgstr "Remove" + #: lib/attachmentlist.php:87 msgid "Attachments" msgstr "" @@ -4368,12 +4731,12 @@ msgstr "" msgid "Tags for this attachment" msgstr "" -#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 +#: lib/authenticationplugin.php:214 lib/authenticationplugin.php:219 #, fuzzy msgid "Password changing failed" msgstr "Password change" -#: lib/authenticationplugin.php:197 +#: lib/authenticationplugin.php:229 #, fuzzy msgid "Password changing is not allowed" msgstr "Password change" @@ -4395,8 +4758,8 @@ msgid "Sorry, this command is not yet implemented." msgstr "Sorry, this command is not yet implemented." #: lib/command.php:88 -#, fuzzy, php-format -msgid "Could not find a user with nickname %s." +#, php-format +msgid "Could not find a user with nickname %s" msgstr "Could not find a user with nickname %s" #: lib/command.php:92 @@ -4404,8 +4767,8 @@ msgid "It does not make a lot of sense to nudge yourself!" msgstr "" #: lib/command.php:99 -#, fuzzy, php-format -msgid "Nudge sent to %s." +#, php-format +msgid "Nudge sent to %s" msgstr "Nudge sent to %s" #: lib/command.php:126 @@ -4416,172 +4779,191 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:399 lib/command.php:460 +#: lib/command.php:152 lib/command.php:390 lib/command.php:451 #, fuzzy -msgid "Notice with that id does not exist." +msgid "Notice with that id does not exist" msgstr "No profile with that id." -#: lib/command.php:168 lib/command.php:415 lib/command.php:476 -#: lib/command.php:532 -#, fuzzy -msgid "User has no last notice." +#: lib/command.php:168 lib/command.php:406 lib/command.php:467 +#: lib/command.php:523 +msgid "User has no last notice" msgstr "User has no last notice" #: lib/command.php:190 msgid "Notice marked as fave." msgstr "Notice marked as fave." -#: lib/command.php:284 -#, fuzzy, php-format -msgid "Could not remove user %1$s to group %2$s." +#: lib/command.php:217 +msgid "You are already a member of that group" +msgstr "You are already a member of that group." + +#: lib/command.php:231 +#, php-format +msgid "Could not join user %s to group %s" +msgstr "Could not join user %s to group %s." + +#: lib/command.php:236 +#, php-format +msgid "%s joined group %s" +msgstr "%s joined group %s" + +#: lib/command.php:275 +#, php-format +msgid "Could not remove user %s to group %s" msgstr "Could not remove user %s to group %s" -#: lib/command.php:318 +#: lib/command.php:280 +#, php-format +msgid "%s left group %s" +msgstr "%s left group %s" + +#: lib/command.php:309 #, php-format msgid "Fullname: %s" msgstr "Fullname: %s" -#: lib/command.php:321 +#: lib/command.php:312 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "Location: %s" -#: lib/command.php:324 +#: lib/command.php:315 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "Homepage: %s" -#: lib/command.php:327 +#: lib/command.php:318 #, php-format msgid "About: %s" msgstr "About: %s" -#: lib/command.php:358 -#, fuzzy, php-format -msgid "Message too long - maximum is %1$d characters, you sent %2$d." +#: lib/command.php:349 +#, 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." +#: lib/command.php:367 +#, php-format +msgid "Direct message to %s sent" msgstr "Direct message to %s sent" -#: lib/command.php:378 +#: lib/command.php:369 msgid "Error sending direct message." msgstr "Error sending direct message." -#: lib/command.php:435 +#: lib/command.php:413 +msgid "Cannot repeat your own notice" +msgstr "Cannot repeat your own notice." + +#: lib/command.php:418 +msgid "Already repeated that notice" +msgstr "Already repeated that notice." + +#: lib/command.php:426 #, fuzzy, php-format -msgid "Notice from %s repeated." +msgid "Notice from %s repeated" msgstr "Notice posted" -#: lib/command.php:437 +#: lib/command.php:428 #, fuzzy msgid "Error repeating notice." msgstr "Error saving notice." -#: lib/command.php:491 -#, fuzzy, php-format -msgid "Notice too long - maximum is %1$d characters, you sent %2$d." +#: lib/command.php:482 +#, 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 -#, fuzzy, php-format -msgid "Reply to %s sent." +#: lib/command.php:491 +#, php-format +msgid "Reply to %s sent" msgstr "Reply to %s sent" -#: lib/command.php:502 +#: lib/command.php:493 msgid "Error saving notice." msgstr "Error saving notice." -#: lib/command.php:556 -#, fuzzy -msgid "Specify the name of the user to subscribe to." +#: lib/command.php:547 +msgid "Specify the name of the user to subscribe to" msgstr "Specify the name of the user to subscribe to" -#: lib/command.php:563 +#: lib/command.php:554 #, php-format msgid "Subscribed to %s" msgstr "Subscribed to %s" -#: lib/command.php:584 -#, fuzzy -msgid "Specify the name of the user to unsubscribe from." +#: lib/command.php:575 +msgid "Specify the name of the user to unsubscribe from" msgstr "Specify the name of the user to unsubscribe from" -#: lib/command.php:591 +#: lib/command.php:582 #, php-format msgid "Unsubscribed from %s" msgstr "Unsubscribed from %s" -#: lib/command.php:609 lib/command.php:632 +#: lib/command.php:600 lib/command.php:623 msgid "Command not yet implemented." msgstr "Command not yet implemented." -#: lib/command.php:612 +#: lib/command.php:603 msgid "Notification off." msgstr "Notification off." -#: lib/command.php:614 +#: lib/command.php:605 msgid "Can't turn off notification." msgstr "Can't turn off notification." -#: lib/command.php:635 +#: lib/command.php:626 msgid "Notification on." msgstr "Notification on." -#: lib/command.php:637 +#: lib/command.php:628 msgid "Can't turn on notification." msgstr "Can't turn on notification." -#: lib/command.php:650 -msgid "Login command is disabled." +#: lib/command.php:641 +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:652 #, php-format -msgid "This link is useable only once, and is good for only 2 minutes: %s." +msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:685 +#: lib/command.php:668 #, fuzzy msgid "You are not subscribed to anyone." msgstr "You are not subscribed to that profile." -#: lib/command.php:687 +#: lib/command.php:670 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:690 #, fuzzy msgid "No one is subscribed to you." msgstr "Could not subscribe other to you." -#: lib/command.php:709 +#: lib/command.php:692 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:712 #, 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:714 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:728 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4622,19 +5004,19 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:199 +#: lib/common.php:131 msgid "No configuration file found. " msgstr "No configuration file found" -#: lib/common.php:200 +#: lib/common.php:132 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:201 +#: lib/common.php:134 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:202 +#: lib/common.php:135 msgid "Go to the installer." msgstr "Go to the installer." @@ -4650,6 +5032,15 @@ msgstr "Updates by instant messenger (I.M.)" msgid "Updates by SMS" msgstr "Updates by SMS" +#: lib/connectsettingsaction.php:120 +#, fuzzy +msgid "Connections" +msgstr "Connect" + +#: lib/connectsettingsaction.php:121 +msgid "Authorized connected applications" +msgstr "" + #: lib/dberroraction.php:60 msgid "Database error" msgstr "" @@ -4835,11 +5226,16 @@ msgstr "" msgid "kB" msgstr "" -#: lib/jabber.php:191 +#: lib/jabber.php:202 #, php-format msgid "[%s]" msgstr "" +#: lib/jabber.php:385 +#, php-format +msgid "Unknown inbox source %d." +msgstr "" + #: lib/joinform.php:114 msgid "Join" msgstr "Join" @@ -4907,21 +5303,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" @@ -5119,7 +5503,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 @@ -5127,7 +5511,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 @@ -5137,7 +5522,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 @@ -5171,16 +5556,18 @@ msgstr "" #: lib/noticeform.php:212 #, fuzzy -msgid "Share my location." -msgstr "Couldn't save tags." - -#: lib/noticeform.php:214 -#, fuzzy -msgid "Do not share my location." +msgid "Share my location" msgstr "Couldn't save tags." #: lib/noticeform.php:215 -msgid "Hide this info" +#, fuzzy +msgid "Do not share my location" +msgstr "Couldn't save tags." + +#: lib/noticeform.php:216 +msgid "" +"Sorry, retrieving your geo location is taking longer than expected, please " +"try again later" msgstr "" #: lib/noticelist.php:428 @@ -5448,25 +5835,25 @@ msgstr "" msgid "User has blocked you." msgstr "User has blocked you." -#: lib/subs.php:60 +#: lib/subs.php:63 msgid "Could not subscribe." msgstr "Could not subscribe." -#: lib/subs.php:79 +#: lib/subs.php:82 msgid "Could not subscribe other to you." msgstr "Could not subscribe other to you." -#: lib/subs.php:128 +#: lib/subs.php:137 #, fuzzy msgid "Not subscribed!" msgstr "Not subscribed!" -#: lib/subs.php:133 +#: lib/subs.php:142 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "Couldn't delete subscription." -#: lib/subs.php:146 +#: lib/subs.php:158 msgid "Couldn't delete subscription." msgstr "Couldn't delete subscription." @@ -5480,10 +5867,6 @@ msgstr "" msgid "People Tagcloud as tagged" msgstr "" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(none)" - #: lib/tagcloudsection.php:56 msgid "None" msgstr "None" @@ -5544,47 +5927,47 @@ msgstr "Message" msgid "Moderate" msgstr "" -#: lib/util.php:837 +#: lib/util.php:875 msgid "a few seconds ago" msgstr "a few seconds ago" -#: lib/util.php:839 +#: lib/util.php:877 msgid "about a minute ago" msgstr "about a minute ago" -#: lib/util.php:841 +#: lib/util.php:879 #, php-format msgid "about %d minutes ago" msgstr "about %d minutes ago" -#: lib/util.php:843 +#: lib/util.php:881 msgid "about an hour ago" msgstr "about an hour ago" -#: lib/util.php:845 +#: lib/util.php:883 #, php-format msgid "about %d hours ago" msgstr "about %d hours ago" -#: lib/util.php:847 +#: lib/util.php:885 msgid "about a day ago" msgstr "about a day ago" -#: lib/util.php:849 +#: lib/util.php:887 #, php-format msgid "about %d days ago" msgstr "about %d days ago" -#: lib/util.php:851 +#: lib/util.php:889 msgid "about a month ago" msgstr "about a month ago" -#: lib/util.php:853 +#: lib/util.php:891 #, php-format msgid "about %d months ago" msgstr "about %d months ago" -#: lib/util.php:855 +#: lib/util.php:893 msgid "about a year ago" msgstr "about a year ago" @@ -5599,6 +5982,6 @@ 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/xmppdaemon.php:301 -#, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +#, fuzzy, php-format +msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "Message too long - maximum is %d characters, you sent %d" diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po index 82db26304b..c035fc281e 100644 --- a/locale/es/LC_MESSAGES/statusnet.po +++ b/locale/es/LC_MESSAGES/statusnet.po @@ -3,6 +3,7 @@ # Author@translatewiki.net: Brion # Author@translatewiki.net: Crazymadlover # Author@translatewiki.net: McDutchie +# Author@translatewiki.net: Peter17 # Author@translatewiki.net: Translationista # -- # 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-10 00:46+0000\n" -"PO-Revision-Date: 2010-01-10 00:47:35+0000\n" +"POT-Creation-Date: 2010-01-15 19:15+0000\n" +"PO-Revision-Date: 2010-01-15 19:16:44+0000\n" "Language-Team: Spanish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60878); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r61101); 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" @@ -36,44 +37,49 @@ msgstr "No existe tal página" #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 +#: actions/apistatusesupdate.php:149 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 #: 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 #: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 -#: lib/command.php:163 lib/command.php:311 lib/command.php:364 -#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/command.php:163 lib/command.php:302 lib/command.php:355 +#: lib/command.php:401 lib/command.php:462 lib/command.php:518 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/subs.php:34 lib/subs.php:125 msgid "No such user." msgstr "No existe ese usuario." +#: actions/all.php:84 +#, fuzzy, php-format +msgid "%1$s and friends, page %2$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 +#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" msgstr "%s y amigos" #: actions/all.php:99 -#, fuzzy, php-format +#, php-format msgid "Feed for friends of %s (RSS 1.0)" -msgstr "Feed de los amigos de %s" +msgstr "Feed de los amigos de %s (RSS 1.0)" #: actions/all.php:107 -#, fuzzy, php-format +#, php-format msgid "Feed for friends of %s (RSS 2.0)" -msgstr "Feed de los amigos de %s" +msgstr "Feed de los amigos de %s (RSS 2.0)" #: actions/all.php:115 -#, fuzzy, php-format +#, php-format msgid "Feed for friends of %s (Atom)" -msgstr "Feed de los amigos de %s" +msgstr "Feed de los amigos de %s (Atom)" #: actions/all.php:127 #, php-format @@ -106,7 +112,7 @@ msgstr "" msgid "You and friends" msgstr "Tú y amigos" -#: actions/allrss.php:119 actions/apitimelinefriends.php:122 +#: actions/allrss.php:119 actions/apitimelinefriends.php:121 #: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" @@ -117,6 +123,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:155 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!" @@ -131,7 +154,7 @@ msgstr "¡No se encontró el método de la API!" #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:114 +#: actions/apistatusesupdate.php:119 msgid "This method requires a POST." msgstr "Este método requiere un POST." @@ -162,8 +185,9 @@ msgstr "No se pudo guardar el perfil." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257 -#: actions/designadminpanel.php:122 actions/newnotice.php:94 +#: actions/apistatusesupdate.php:132 actions/avatarsettings.php:257 +#: actions/designadminpanel.php:122 actions/editapplication.php:118 +#: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format msgid "" @@ -177,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 #, fuzzy msgid "Unable to save your design settings." msgstr "¡No se pudo guardar tu configuración de Twitter!" @@ -219,26 +246,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!" @@ -262,16 +269,16 @@ 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!" -msgstr "¡Este status ya está en favoritos!" +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 msgid "Could not create favorite." msgstr "No se pudo crear favorito." #: actions/apifavoritedestroy.php:122 -msgid "That status is not a favorite!" -msgstr "¡Este status no es un favorito!" +msgid "That status is not a favorite." +msgstr "Este status no es un favorito." #: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 msgid "Could not delete favorite." @@ -291,8 +298,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!" -msgstr "¡No puedes dejar de seguirte a ti mismo!" +msgid "You cannot unfollow yourself." +msgstr "No puedes dejar de seguirte a ti mismo." #: actions/apifriendshipsexists.php:94 msgid "Two user ids or screen_names must be supplied." @@ -326,7 +333,8 @@ msgstr "El apodo ya existe. Prueba otro." msgid "Not a valid nickname." msgstr "Apodo no válido" -#: actions/apigroupcreate.php:196 actions/editgroup.php:195 +#: actions/apigroupcreate.php:196 actions/editapplication.php:212 +#: actions/editgroup.php:195 actions/newapplication.php:200 #: actions/newgroup.php:139 actions/profilesettings.php:222 #: actions/register.php:217 msgid "Homepage is not a valid URL." @@ -338,7 +346,8 @@ msgstr "La página de inicio no es un URL válido." msgid "Full name is too long (max 255 chars)." msgstr "Tu nombre es demasiado largo (max. 255 carac.)" -#: actions/apigroupcreate.php:213 +#: actions/apigroupcreate.php:213 actions/editapplication.php:187 +#: actions/newapplication.php:169 #, php-format msgid "Description is too long (max %d chars)." msgstr "La descripción es demasiado larga (máx. %d caracteres)." @@ -379,7 +388,7 @@ msgstr "" msgid "Group not found!" msgstr "¡No se encontró el método de la API!" -#: actions/apigroupjoin.php:110 lib/command.php:217 +#: actions/apigroupjoin.php:110 actions/joingroup.php:90 msgid "You are already a member of that group." msgstr "Ya eres miembro de ese grupo" @@ -387,7 +396,7 @@ msgstr "Ya eres miembro de ese grupo" msgid "You have been blocked from that group by the admin." msgstr "" -#: actions/apigroupjoin.php:138 lib/command.php:234 +#: actions/apigroupjoin.php:138 actions/joingroup.php:124 #, fuzzy, php-format msgid "Could not join user %1$s to group %2$s." msgstr "No se puede unir usuario %s a grupo %s" @@ -396,7 +405,7 @@ msgstr "No se puede unir usuario %s a grupo %s" msgid "You are not a member of this group." msgstr "No eres miembro de este grupo." -#: actions/apigroupleave.php:124 actions/leavegroup.php:127 +#: actions/apigroupleave.php:124 actions/leavegroup.php:119 #, fuzzy, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "No se pudo eliminar a usuario %s de grupo %s" @@ -416,6 +425,102 @@ msgstr "Grupos %s" msgid "groups on %s" msgstr "Grupos en %s" +#: actions/apioauthauthorize.php:108 actions/apioauthauthorize.php:114 +msgid "Bad request." +msgstr "" + +#: actions/apioauthauthorize.php:134 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:115 actions/makeadmin.php:66 +#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 +#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:139 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 +#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/subscribe.php:46 actions/tagother.php:166 +#: 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 "" +"Hubo un problema con tu clave de sesión. Por favor, intenta nuevamente." + +#: actions/apioauthauthorize.php:146 +#, fuzzy +msgid "Invalid nickname / password!" +msgstr "Usuario o contraseña inválidos." + +#: actions/apioauthauthorize.php:170 +#, fuzzy +msgid "DB error deleting OAuth app user." +msgstr "Error al configurar el usuario." + +#: actions/apioauthauthorize.php:196 +#, fuzzy +msgid "DB error inserting OAuth app user." +msgstr "Error de la BD al insertar la etiqueta clave: %s" + +#: actions/apioauthauthorize.php:231 +#, php-format +msgid "" +"The request token %s has been authorized. Please exchange it for an access " +"token." +msgstr "" + +#: actions/apioauthauthorize.php:241 +#, php-format +msgid "The request token %s has been denied." +msgstr "" + +#: actions/apioauthauthorize.php:246 actions/avatarsettings.php:281 +#: actions/designadminpanel.php:103 actions/editapplication.php:139 +#: actions/emailsettings.php:256 actions/grouplogo.php:319 +#: actions/imsettings.php:220 actions/newapplication.php:121 +#: actions/oauthconnectionssettings.php:151 actions/recoverpassword.php:44 +#: actions/smssettings.php:248 lib/designsettings.php:304 +msgid "Unexpected form submission." +msgstr "Envío de formulario inesperado." + +#: actions/apioauthauthorize.php:273 +msgid "An application would like to connect to your account" +msgstr "" + +#: actions/apioauthauthorize.php:290 +msgid "Allow or deny access" +msgstr "" + +#: actions/apioauthauthorize.php:320 lib/action.php:435 +msgid "Account" +msgstr "Cuenta" + +#: actions/apioauthauthorize.php:323 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/apioauthauthorize.php:326 actions/login.php:233 +#: actions/register.php:429 lib/accountsettingsaction.php:116 +msgid "Password" +msgstr "Contraseña" + +#: actions/apioauthauthorize.php:338 +msgid "Deny" +msgstr "" + +#: actions/apioauthauthorize.php:344 +#, fuzzy +msgid "Allow" +msgstr "Todo" + +#: actions/apioauthauthorize.php:361 +msgid "Allow or deny access to your account information." +msgstr "" + #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." msgstr "Este método requiere un PUBLICAR O ELIMINAR" @@ -429,12 +534,12 @@ msgstr "No puedes borrar el estado de otro usuario." msgid "No such notice." msgstr "No existe ese aviso." -#: actions/apistatusesretweet.php:83 lib/command.php:422 +#: actions/apistatusesretweet.php:83 #, fuzzy msgid "Cannot repeat your own notice." msgstr "No se puede activar notificación." -#: actions/apistatusesretweet.php:91 lib/command.php:427 +#: actions/apistatusesretweet.php:91 #, fuzzy msgid "Already repeated that notice." msgstr "Borrar este aviso" @@ -447,17 +552,17 @@ msgstr "Status borrado." msgid "No status with that ID found." msgstr "No hay estado para ese ID" -#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:162 actions/newnotice.php:155 #: 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. " -#: actions/apistatusesupdate.php:198 +#: actions/apistatusesupdate.php:203 msgid "Not found" msgstr "No encontrado" -#: actions/apistatusesupdate.php:221 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:226 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -543,8 +648,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." @@ -567,8 +675,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" @@ -600,30 +708,6 @@ 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/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 -#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 -#: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 -#: actions/subscribe.php:46 actions/tagother.php:166 -#: 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 "" -"Hubo un problema con tu clave de sesión. Por favor, intenta nuevamente." - -#: actions/avatarsettings.php:281 actions/designadminpanel.php:103 -#: actions/emailsettings.php:256 actions/grouplogo.php:319 -#: actions/imsettings.php:220 actions/recoverpassword.php:44 -#: actions/smssettings.php:248 lib/designsettings.php:304 -msgid "Unexpected form submission." -msgstr "Envío de formulario inesperado." - #: actions/avatarsettings.php:328 msgid "Pick a square area of the image to be your avatar" msgstr "Elige un área cuadrada de la imagen para que sea tu avatar" @@ -685,19 +769,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:260 +msgid "No such group." +msgstr "No existe ese grupo." #: actions/blockedfromgroup.php:90 #, fuzzy, php-format @@ -765,7 +845,8 @@ msgid "Couldn't delete email confirmation." msgstr "No se pudo eliminar la confirmación de correo electrónico." #: actions/confirmaddress.php:144 -msgid "Confirm Address" +#, fuzzy +msgid "Confirm address" msgstr "Confirmar la dirección" #: actions/confirmaddress.php:159 @@ -822,12 +903,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." @@ -964,7 +1039,8 @@ msgstr "" #: actions/pathsadminpanel.php:324 actions/profilesettings.php:174 #: actions/siteadminpanel.php:388 actions/smssettings.php:181 #: actions/subscriptions.php:203 actions/tagother.php:154 -#: actions/useradminpanel.php:313 lib/designsettings.php:256 +#: actions/useradminpanel.php:313 lib/applicationeditform.php:335 +#: lib/applicationeditform.php:336 lib/designsettings.php:256 #: lib/groupeditform.php:202 msgid "Save" msgstr "Guardar" @@ -985,6 +1061,86 @@ msgstr "Agregar a favoritos" msgid "No such document." msgstr "No existe ese documento." +#: actions/editapplication.php:54 lib/applicationeditform.php:136 +msgid "Edit application" +msgstr "" + +#: actions/editapplication.php:66 +#, fuzzy +msgid "You must be logged in to edit an application." +msgstr "Debes estar conectado para editar un grupo." + +#: actions/editapplication.php:77 actions/showapplication.php:94 +#, fuzzy +msgid "You are not the owner of this application." +msgstr "No eres miembro de este grupo." + +#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:163 +#: actions/showapplication.php:87 +#, fuzzy +msgid "No such application." +msgstr "No existe ese aviso." + +#: actions/editapplication.php:127 actions/newapplication.php:110 +#: actions/showapplication.php:118 lib/action.php:1167 +msgid "There was a problem with your session token." +msgstr "Hubo problemas con tu clave de sesión." + +#: actions/editapplication.php:161 +#, fuzzy +msgid "Use this form to edit your application." +msgstr "Usa este formulario para editar el grupo." + +#: actions/editapplication.php:177 actions/newapplication.php:159 +#, fuzzy +msgid "Name is required." +msgstr "Igual a la contraseña de arriba. Requerida" + +#: actions/editapplication.php:180 actions/newapplication.php:162 +#, fuzzy +msgid "Name is too long (max 255 chars)." +msgstr "Tu nombre es demasiado largo (max. 255 carac.)" + +#: actions/editapplication.php:183 actions/newapplication.php:165 +#, fuzzy +msgid "Description is required." +msgstr "Descripción" + +#: actions/editapplication.php:191 +msgid "Source URL is too long." +msgstr "" + +#: actions/editapplication.php:197 actions/newapplication.php:182 +#, fuzzy +msgid "Source URL is not valid." +msgstr "La página de inicio no es un URL válido." + +#: actions/editapplication.php:200 actions/newapplication.php:185 +msgid "Organization is required." +msgstr "" + +#: actions/editapplication.php:203 actions/newapplication.php:188 +#, fuzzy +msgid "Organization is too long (max 255 chars)." +msgstr "La ubicación es demasiado larga (máx. 255 caracteres)." + +#: actions/editapplication.php:206 actions/newapplication.php:191 +msgid "Organization homepage is required." +msgstr "" + +#: actions/editapplication.php:215 actions/newapplication.php:203 +msgid "Callback is too long." +msgstr "" + +#: actions/editapplication.php:222 actions/newapplication.php:212 +msgid "Callback URL is not valid." +msgstr "" + +#: actions/editapplication.php:255 +#, fuzzy +msgid "Could not update application." +msgstr "No se pudo actualizar el grupo." + #: actions/editgroup.php:56 #, php-format msgid "Edit %s group" @@ -996,7 +1152,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 @@ -1022,7 +1179,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 @@ -1054,13 +1212,15 @@ msgstr "" "la de spam!) por un mensaje con las instrucciones." #: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 +#: actions/smssettings.php:126 lib/applicationeditform.php:333 +#: lib/applicationeditform.php:334 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\"" @@ -1137,9 +1297,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." @@ -1321,13 +1482,6 @@ 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:79 msgid "No such file." msgstr "No existe tal archivo." @@ -1344,7 +1498,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" @@ -1389,9 +1543,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." @@ -1414,13 +1568,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." @@ -1436,6 +1583,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." @@ -1565,7 +1717,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 @@ -1597,7 +1750,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 @@ -1697,7 +1851,7 @@ 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 lib/command.php:315 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -1742,7 +1896,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:234 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236 msgid "Send" msgstr "Enviar" @@ -1812,17 +1966,7 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "Debes estar conectado para unirte a un grupo." -#: actions/joingroup.php:90 -#, fuzzy -msgid "You are already a member of that group" -msgstr "Ya eres miembro de ese grupo" - -#: actions/joingroup.php:128 -#, fuzzy, php-format -msgid "Could not join user %1$s to group %2$s" -msgstr "No se puede unir usuario %s a grupo %s" - -#: actions/joingroup.php:135 lib/command.php:239 +#: actions/joingroup.php:131 #, fuzzy, php-format msgid "%1$s joined group %2$s" msgstr "%s se unió a grupo %s" @@ -1831,74 +1975,53 @@ msgstr "%s se unió a grupo %s" msgid "You must be logged in to leave a group." msgstr "Debes estar conectado para dejar un grupo." -#: actions/leavegroup.php:90 lib/command.php:268 +#: actions/leavegroup.php:90 lib/command.php:265 #, fuzzy msgid "You are not a member of that group." msgstr "No eres miembro de ese grupo" -#: actions/leavegroup.php:119 lib/command.php:278 -#, fuzzy -msgid "Could not find membership record." -msgstr "No se pudo encontrar registro de miembro" - -#: actions/leavegroup.php:134 lib/command.php:289 +#: actions/leavegroup.php:127 #, fuzzy, php-format 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:460 +#: 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 -#: lib/groupeditform.php:152 lib/userprofile.php:131 -msgid "Nickname" -msgstr "Apodo" - -#: actions/login.php:253 actions/register.php:428 -#: 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." @@ -1906,7 +2029,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]" @@ -1926,19 +2049,42 @@ 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 %1$s in group %2$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 #, fuzzy, php-format -msgid "Can't make %1$s an admin for group %2$s" +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" msgstr "No existe estado actual" +#: actions/newapplication.php:52 +msgid "New application" +msgstr "" + +#: actions/newapplication.php:64 +#, fuzzy +msgid "You must be logged in to register an application." +msgstr "Debes estar conectado para crear un grupo" + +#: actions/newapplication.php:143 +#, fuzzy +msgid "Use this form to register a new application." +msgstr "Usa este formulario para crear un grupo nuevo." + +#: actions/newapplication.php:173 +msgid "Source URL is required." +msgstr "" + +#: actions/newapplication.php:255 actions/newapplication.php:264 +#, fuzzy +msgid "Could not create application." +msgstr "No se pudo crear favorito." + #: actions/newgroup.php:53 msgid "New group" msgstr "Grupo nuevo " @@ -1951,12 +2097,12 @@ msgstr "Usa este formulario para crear un grupo nuevo." msgid "New message" msgstr "Nuevo Mensaje " -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 msgid "You can't send a message to this user." msgstr "No puedes enviar mensaje a este usuario." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:484 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 +#: lib/command.php:475 msgid "No content!" msgstr "¡Ningún contenido!" @@ -1964,7 +2110,7 @@ msgstr "¡Ningún contenido!" msgid "No recipient specified." msgstr "No se especificó receptor." -#: actions/newmessage.php:164 lib/command.php:370 +#: actions/newmessage.php:164 lib/command.php:361 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "No te auto envíes un mensaje; dícetelo a ti mismo." @@ -1975,8 +2121,8 @@ msgid "Message sent" msgstr "Mensaje" #: actions/newmessage.php:185 -#, php-format -msgid "Direct message to %s sent" +#, fuzzy, php-format +msgid "Direct message to %s sent." msgstr "Se envió mensaje directo a %s" #: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 @@ -2050,6 +2196,51 @@ msgstr "Se envió zumbido" msgid "Nudge sent!" msgstr "¡Zumbido enviado!" +#: actions/oauthappssettings.php:59 +#, fuzzy +msgid "You must be logged in to list your applications." +msgstr "Debes estar conectado para editar un grupo." + +#: actions/oauthappssettings.php:74 +#, fuzzy +msgid "OAuth applications" +msgstr "Otras opciones" + +#: actions/oauthappssettings.php:85 +msgid "Applications you have registered" +msgstr "" + +#: actions/oauthappssettings.php:135 +#, php-format +msgid "You have not registered any applications yet." +msgstr "" + +#: actions/oauthconnectionssettings.php:71 +msgid "Connected applications" +msgstr "" + +#: actions/oauthconnectionssettings.php:87 +msgid "You have allowed the following applications to access you account." +msgstr "" + +#: actions/oauthconnectionssettings.php:170 +#, fuzzy +msgid "You are not a user of that application." +msgstr "No eres miembro de ese grupo" + +#: actions/oauthconnectionssettings.php:180 +msgid "Unable to revoke access for app: " +msgstr "" + +#: actions/oauthconnectionssettings.php:192 +#, php-format +msgid "You have not authorized any applications to use your account." +msgstr "" + +#: actions/oauthconnectionssettings.php:205 +msgid "Developers can edit the registration settings for their applications " +msgstr "" + #: actions/oembed.php:79 actions/shownotice.php:100 msgid "Notice has no profile" msgstr "Aviso sin perfil" @@ -2068,8 +2259,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:1038 +#: lib/api.php:1066 lib/api.php:1176 msgid "Not a supported data format." msgstr "No es un formato de dato soportado" @@ -2083,7 +2274,7 @@ msgstr "Búsqueda de avisos" #: actions/othersettings.php:60 #, fuzzy -msgid "Other Settings" +msgid "Other settings" msgstr "Otras configuraciones" #: actions/othersettings.php:71 @@ -2116,6 +2307,31 @@ msgstr "" msgid "URL shortening service is too long (max 50 chars)." msgstr "Servicio de acorte de URL demasiado largo (máx. 50 caracteres)." +#: 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 msgid "Outbox for %s" @@ -2153,7 +2369,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" @@ -2324,8 +2540,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" @@ -2389,43 +2606,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 -#: lib/groupeditform.php:161 +#: actions/profilesettings.php:115 actions/register.php:453 +#: lib/applicationeditform.php:230 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\"" @@ -2732,7 +2949,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." @@ -2745,7 +2962,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:457 +#: actions/register.php:114 actions/register.php:503 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Registrarse" @@ -2758,61 +2975,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 " @@ -2821,7 +3034,7 @@ 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 +#: actions/register.php:538 #, fuzzy, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -2854,7 +3067,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.)" @@ -3010,6 +3223,84 @@ msgstr "No puedes enviar mensaje a este usuario." msgid "User is already sandboxed." msgstr "El usuario te ha bloqueado." +#: actions/showapplication.php:82 +#, fuzzy +msgid "You must be logged in to view an application." +msgstr "Debes estar conectado para dejar un grupo." + +#: actions/showapplication.php:158 +#, fuzzy +msgid "Application profile" +msgstr "Aviso sin perfil" + +#: actions/showapplication.php:160 lib/applicationeditform.php:182 +msgid "Icon" +msgstr "" + +#: actions/showapplication.php:170 actions/version.php:195 +#: lib/applicationeditform.php:197 +#, fuzzy +msgid "Name" +msgstr "Apodo" + +#: actions/showapplication.php:179 lib/applicationeditform.php:224 +#, fuzzy +msgid "Organization" +msgstr "Paginación" + +#: actions/showapplication.php:188 actions/version.php:198 +#: lib/applicationeditform.php:211 lib/groupeditform.php:172 +msgid "Description" +msgstr "Descripción" + +#: actions/showapplication.php:193 actions/showgroup.php:429 +#: lib/profileaction.php:174 +msgid "Statistics" +msgstr "Estadísticas" + +#: actions/showapplication.php:204 +#, php-format +msgid "created by %1$s - %2$s access by default - %3$d users" +msgstr "" + +#: actions/showapplication.php:214 +msgid "Application actions" +msgstr "" + +#: actions/showapplication.php:233 +msgid "Reset key & secret" +msgstr "" + +#: actions/showapplication.php:241 +msgid "Application info" +msgstr "" + +#: actions/showapplication.php:243 +msgid "Consumer key" +msgstr "" + +#: actions/showapplication.php:248 +msgid "Consumer secret" +msgstr "" + +#: actions/showapplication.php:253 +msgid "Request token URL" +msgstr "" + +#: actions/showapplication.php:258 +msgid "Access token URL" +msgstr "" + +#: actions/showapplication.php:263 +msgid "Authorize URL" +msgstr "" + +#: actions/showapplication.php:268 +msgid "" +"Note: We support HMAC-SHA1 signatures. We do not support the plaintext " +"signature method." +msgstr "" + #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "No se pudo recibir avisos favoritos." @@ -3110,7 +3401,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)" @@ -3118,10 +3409,6 @@ msgstr "(Ninguno)" msgid "All members" msgstr "Todos los miembros" -#: actions/showgroup.php:429 lib/profileaction.php:174 -msgid "Statistics" -msgstr "Estadísticas" - #: actions/showgroup.php:432 #, fuzzy msgid "Created" @@ -3267,12 +3554,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 @@ -3463,7 +3750,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 @@ -3493,7 +3781,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 @@ -3754,10 +4043,6 @@ 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" @@ -3965,10 +4250,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" @@ -4047,11 +4328,6 @@ msgstr "" msgid "Plugins" msgstr "" -#: actions/version.php:195 -#, fuzzy -msgid "Name" -msgstr "Apodo" - #: actions/version.php:196 lib/action.php:741 #, fuzzy msgid "Version" @@ -4061,27 +4337,43 @@ msgstr "Sesiones" msgid "Author(s)" msgstr "" -#: actions/version.php:198 lib/groupeditform.php:172 -msgid "Description" -msgstr "Descripción" - -#: classes/File.php:137 +#: 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/Group_member.php:41 +#, fuzzy +msgid "Group join failed." +msgstr "Perfil de grupo" + +#: classes/Group_member.php:53 +#, fuzzy +msgid "Not part of group." +msgstr "No se pudo actualizar el grupo." + +#: classes/Group_member.php:60 +#, fuzzy +msgid "Group leave failed." +msgstr "Perfil de grupo" + +#: 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." @@ -4095,29 +4387,29 @@ msgstr "No se pudo insertar mensaje." msgid "Could not update message with new URI." msgstr "No se pudo actualizar mensaje con nuevo URI." -#: classes/Notice.php:172 +#: classes/Notice.php:171 #, php-format msgid "DB error inserting hashtag: %s" msgstr "Error de la BD al insertar la etiqueta clave: %s" -#: classes/Notice.php:226 +#: classes/Notice.php:225 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Hubo un problema al guardar el aviso." -#: classes/Notice.php:230 +#: classes/Notice.php:229 #, fuzzy msgid "Problem saving notice. Unknown user." msgstr "Hubo problemas al guardar el aviso. Usuario desconocido." -#: classes/Notice.php:235 +#: classes/Notice.php:234 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Demasiados avisos demasiado rápido; para y publicar nuevamente en unos " "minutos." -#: classes/Notice.php:241 +#: classes/Notice.php:240 #, fuzzy msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " @@ -4126,25 +4418,25 @@ msgstr "" "Demasiados avisos demasiado rápido; para y publicar nuevamente en unos " "minutos." -#: classes/Notice.php:247 +#: classes/Notice.php:246 msgid "You are banned from posting notices on this site." msgstr "Tienes prohibido publicar avisos en este sitio." -#: classes/Notice.php:309 classes/Notice.php:334 +#: classes/Notice.php:305 classes/Notice.php:330 msgid "Problem saving notice." msgstr "Hubo un problema al guardar el aviso." -#: classes/Notice.php:1034 +#: classes/Notice.php:1052 #, php-format msgid "DB error inserting reply: %s" msgstr "Error de BD al insertar respuesta: %s" -#: classes/Notice.php:1359 +#: classes/Notice.php:1423 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" -#: classes/User.php:368 +#: classes/User.php:382 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Bienvenido a %1$s, @%2$s!" @@ -4186,6 +4478,11 @@ msgstr "Otro" msgid "Other options" msgstr "Otras opciones" +#: lib/action.php:144 +#, 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" @@ -4202,10 +4499,6 @@ msgstr "Inicio" msgid "Personal profile and friends timeline" msgstr "Perfil personal y línea de tiempo de amigos" -#: lib/action.php:435 -msgid "Account" -msgstr "Cuenta" - #: lib/action.php:435 msgid "Change your email, avatar, password, profile" msgstr "Cambia tu correo electrónico, avatar, contraseña, perfil" @@ -4361,10 +4654,6 @@ msgstr "Después" msgid "Before" msgstr "Antes" -#: lib/action.php:1167 -msgid "There was a problem with your session token." -msgstr "Hubo problemas con tu clave de sesión." - #: lib/adminpanelaction.php:96 #, fuzzy msgid "You cannot make changes to this site." @@ -4405,6 +4694,72 @@ msgstr "SMS confirmación" msgid "Paths configuration" msgstr "SMS confirmación" +#: lib/applicationeditform.php:186 +msgid "Icon for this application" +msgstr "" + +#: lib/applicationeditform.php:206 +#, fuzzy, php-format +msgid "Describe your application in %d characters" +msgstr "Describir al grupo o tema en %d caracteres" + +#: lib/applicationeditform.php:209 +#, fuzzy +msgid "Describe your application" +msgstr "Describir al grupo o tema" + +#: lib/applicationeditform.php:218 +#, fuzzy +msgid "Source URL" +msgstr "Fuente" + +#: lib/applicationeditform.php:220 +#, fuzzy +msgid "URL of the homepage of this application" +msgstr "El URL de página de inicio o blog del grupo or tema" + +#: lib/applicationeditform.php:226 +msgid "Organization responsible for this application" +msgstr "" + +#: lib/applicationeditform.php:232 +#, fuzzy +msgid "URL for the homepage of the organization" +msgstr "El URL de página de inicio o blog del grupo or tema" + +#: lib/applicationeditform.php:238 +msgid "URL to redirect to after authentication" +msgstr "" + +#: lib/applicationeditform.php:260 +msgid "Browser" +msgstr "" + +#: lib/applicationeditform.php:276 +msgid "Desktop" +msgstr "" + +#: lib/applicationeditform.php:277 +msgid "Type of application, browser or desktop" +msgstr "" + +#: lib/applicationeditform.php:299 +msgid "Read-only" +msgstr "" + +#: lib/applicationeditform.php:317 +msgid "Read-write" +msgstr "" + +#: lib/applicationeditform.php:318 +msgid "Default access for this application: read-only, or read-write" +msgstr "" + +#: lib/applicationlist.php:154 +#, fuzzy +msgid "Revoke" +msgstr "Eliminar" + #: lib/attachmentlist.php:87 msgid "Attachments" msgstr "" @@ -4425,12 +4780,12 @@ msgstr "" msgid "Tags for this attachment" msgstr "" -#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 +#: lib/authenticationplugin.php:214 lib/authenticationplugin.php:219 #, fuzzy msgid "Password changing failed" msgstr "Cambio de contraseña " -#: lib/authenticationplugin.php:197 +#: lib/authenticationplugin.php:229 #, fuzzy msgid "Password changing is not allowed" msgstr "Cambio de contraseña " @@ -4453,7 +4808,7 @@ msgstr "Disculpa, todavía no se implementa este comando." #: lib/command.php:88 #, fuzzy, php-format -msgid "Could not find a user with nickname %s." +msgid "Could not find a user with nickname %s" msgstr "" "No se pudo actualizar el usuario con la dirección de correo confirmada." @@ -4462,8 +4817,8 @@ msgid "It does not make a lot of sense to nudge yourself!" msgstr "" #: lib/command.php:99 -#, fuzzy, php-format -msgid "Nudge sent to %s." +#, php-format +msgid "Nudge sent to %s" msgstr "zumbido enviado a %s" #: lib/command.php:126 @@ -4474,170 +4829,192 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:399 lib/command.php:460 +#: lib/command.php:152 lib/command.php:390 lib/command.php:451 #, fuzzy -msgid "Notice with that id does not exist." +msgid "Notice with that id does not exist" msgstr "Ningún perfil con ese ID." -#: lib/command.php:168 lib/command.php:415 lib/command.php:476 -#: lib/command.php:532 -#, fuzzy -msgid "User has no last notice." +#: lib/command.php:168 lib/command.php:406 lib/command.php:467 +#: lib/command.php:523 +msgid "User has no last notice" msgstr "Usuario no tiene último aviso" #: lib/command.php:190 msgid "Notice marked as fave." msgstr "Aviso marcado como favorito." -#: lib/command.php:284 +#: lib/command.php:217 +#, fuzzy +msgid "You are already a member of that group" +msgstr "Ya eres miembro de ese grupo" + +#: lib/command.php:231 #, fuzzy, php-format -msgid "Could not remove user %1$s to group %2$s." +msgid "Could not join user %s to group %s" +msgstr "No se puede unir usuario %s a grupo %s" + +#: lib/command.php:236 +#, php-format +msgid "%s joined group %s" +msgstr "%s se unió a grupo %s" + +#: lib/command.php:275 +#, 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:318 +#: lib/command.php:280 +#, php-format +msgid "%s left group %s" +msgstr "%s dejó grupo %s" + +#: lib/command.php:309 #, php-format msgid "Fullname: %s" msgstr "Nombre completo: %s" -#: lib/command.php:321 +#: lib/command.php:312 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "Lugar: %s" -#: lib/command.php:324 +#: lib/command.php:315 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "Página de inicio: %s" -#: lib/command.php:327 +#: lib/command.php:318 #, php-format msgid "About: %s" msgstr "Sobre: %s" -#: lib/command.php:358 +#: lib/command.php:349 #, fuzzy, php-format -msgid "Message too long - maximum is %1$d characters, you sent %2$d." +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." +#: lib/command.php:367 +#, php-format +msgid "Direct message to %s sent" msgstr "Se envió mensaje directo a %s" -#: lib/command.php:378 +#: lib/command.php:369 msgid "Error sending direct message." msgstr "Error al enviar mensaje directo." -#: lib/command.php:435 +#: lib/command.php:413 +#, fuzzy +msgid "Cannot repeat your own notice" +msgstr "No se puede activar notificación." + +#: lib/command.php:418 +#, fuzzy +msgid "Already repeated that notice" +msgstr "Borrar este aviso" + +#: lib/command.php:426 #, fuzzy, php-format -msgid "Notice from %s repeated." +msgid "Notice from %s repeated" msgstr "Aviso publicado" -#: lib/command.php:437 +#: lib/command.php:428 #, fuzzy msgid "Error repeating notice." msgstr "Hubo un problema al guardar el aviso." -#: lib/command.php:491 +#: lib/command.php:482 #, fuzzy, php-format -msgid "Notice too long - maximum is %1$d characters, you sent %2$d." +msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Mensaje muy largo - máximo 140 caracteres, enviaste %d" -#: lib/command.php:500 +#: lib/command.php:491 #, fuzzy, php-format -msgid "Reply to %s sent." +msgid "Reply to %s sent" msgstr "Responder este aviso." -#: lib/command.php:502 +#: lib/command.php:493 #, fuzzy 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." +#: lib/command.php:547 +msgid "Specify the name of the user to subscribe to" msgstr "Especificar el nombre del usuario a suscribir" -#: lib/command.php:563 +#: lib/command.php:554 #, php-format msgid "Subscribed to %s" msgstr "Suscrito a %s" -#: lib/command.php:584 -#, fuzzy -msgid "Specify the name of the user to unsubscribe from." +#: lib/command.php:575 +msgid "Specify the name of the user to unsubscribe from" msgstr "Especificar el nombre del usuario para desuscribirse de" -#: lib/command.php:591 +#: lib/command.php:582 #, php-format msgid "Unsubscribed from %s" msgstr "Desuscrito de %s" -#: lib/command.php:609 lib/command.php:632 +#: lib/command.php:600 lib/command.php:623 msgid "Command not yet implemented." msgstr "Todavía no se implementa comando." -#: lib/command.php:612 +#: lib/command.php:603 msgid "Notification off." msgstr "Notificación no activa." -#: lib/command.php:614 +#: lib/command.php:605 msgid "Can't turn off notification." msgstr "No se puede desactivar notificación." -#: lib/command.php:635 +#: lib/command.php:626 msgid "Notification on." msgstr "Notificación activada." -#: lib/command.php:637 +#: lib/command.php:628 msgid "Can't turn on notification." msgstr "No se puede activar notificación." -#: lib/command.php:650 -msgid "Login command is disabled." +#: lib/command.php:641 +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:652 #, php-format -msgid "This link is useable only once, and is good for only 2 minutes: %s." +msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:685 +#: lib/command.php:668 msgid "You are not subscribed to anyone." msgstr "No estás suscrito a nadie." -#: lib/command.php:687 +#: lib/command.php:670 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:690 msgid "No one is subscribed to you." msgstr "Nadie está suscrito a ti." -#: lib/command.php:709 +#: lib/command.php:692 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:712 msgid "You are not a member of any groups." msgstr "No eres miembro de ningún grupo" -#: lib/command.php:731 +#: lib/command.php:714 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:728 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4678,19 +5055,19 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:199 +#: lib/common.php:131 msgid "No configuration file found. " msgstr "Ningún archivo de configuración encontrado. " -#: lib/common.php:200 +#: lib/common.php:132 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:201 +#: lib/common.php:134 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:202 +#: lib/common.php:135 msgid "Go to the installer." msgstr "Ir al instalador." @@ -4706,6 +5083,15 @@ msgstr "Actualizaciones por mensajería instantánea" msgid "Updates by SMS" msgstr "Actualizaciones por sms" +#: lib/connectsettingsaction.php:120 +#, fuzzy +msgid "Connections" +msgstr "Conectarse" + +#: lib/connectsettingsaction.php:121 +msgid "Authorized connected applications" +msgstr "" + #: lib/dberroraction.php:60 msgid "Database error" msgstr "" @@ -4893,11 +5279,16 @@ msgstr "MB" msgid "kB" msgstr "kB" -#: lib/jabber.php:191 +#: lib/jabber.php:202 #, php-format msgid "[%s]" msgstr "" +#: lib/jabber.php:385 +#, php-format +msgid "Unknown inbox source %d." +msgstr "" + #: lib/joinform.php:114 msgid "Join" msgstr "Unirse" @@ -4961,21 +5352,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" @@ -5172,7 +5551,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 @@ -5180,7 +5559,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 @@ -5190,7 +5570,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 @@ -5226,16 +5606,18 @@ msgstr "" #: lib/noticeform.php:212 #, fuzzy -msgid "Share my location." -msgstr "No se pudo guardar tags." - -#: lib/noticeform.php:214 -#, fuzzy -msgid "Do not share my location." +msgid "Share my location" msgstr "No se pudo guardar tags." #: lib/noticeform.php:215 -msgid "Hide this info" +#, fuzzy +msgid "Do not share my location" +msgstr "No se pudo guardar tags." + +#: lib/noticeform.php:216 +msgid "" +"Sorry, retrieving your geo location is taking longer than expected, please " +"try again later" msgstr "" #: lib/noticelist.php:428 @@ -5507,25 +5889,25 @@ msgstr "" msgid "User has blocked you." msgstr "El usuario te ha bloqueado." -#: lib/subs.php:60 +#: lib/subs.php:63 msgid "Could not subscribe." msgstr "No se pudo suscribir." -#: lib/subs.php:79 +#: lib/subs.php:82 msgid "Could not subscribe other to you." msgstr "No se pudo suscribir otro a ti." -#: lib/subs.php:128 +#: lib/subs.php:137 #, fuzzy msgid "Not subscribed!" msgstr "¡No estás suscrito!" -#: lib/subs.php:133 +#: lib/subs.php:142 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "No se pudo eliminar la suscripción." -#: lib/subs.php:146 +#: lib/subs.php:158 msgid "Couldn't delete subscription." msgstr "No se pudo eliminar la suscripción." @@ -5539,10 +5921,6 @@ msgstr "" msgid "People Tagcloud as tagged" msgstr "" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(ninguno)" - #: lib/tagcloudsection.php:56 msgid "None" msgstr "Ninguno" @@ -5605,47 +5983,47 @@ msgstr "Mensaje" msgid "Moderate" msgstr "Moderar" -#: lib/util.php:837 +#: lib/util.php:875 msgid "a few seconds ago" msgstr "hace unos segundos" -#: lib/util.php:839 +#: lib/util.php:877 msgid "about a minute ago" msgstr "hace un minuto" -#: lib/util.php:841 +#: lib/util.php:879 #, php-format msgid "about %d minutes ago" msgstr "hace %d minutos" -#: lib/util.php:843 +#: lib/util.php:881 msgid "about an hour ago" msgstr "hace una hora" -#: lib/util.php:845 +#: lib/util.php:883 #, php-format msgid "about %d hours ago" msgstr "hace %d horas" -#: lib/util.php:847 +#: lib/util.php:885 msgid "about a day ago" msgstr "hace un día" -#: lib/util.php:849 +#: lib/util.php:887 #, php-format msgid "about %d days ago" msgstr "hace %d días" -#: lib/util.php:851 +#: lib/util.php:889 msgid "about a month ago" msgstr "hace un mes" -#: lib/util.php:853 +#: lib/util.php:891 #, php-format msgid "about %d months ago" msgstr "hace %d meses" -#: lib/util.php:855 +#: lib/util.php:893 msgid "about a year ago" msgstr "hace un año" @@ -5661,5 +6039,5 @@ msgstr "" #: scripts/xmppdaemon.php:301 #, fuzzy, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "Mensaje muy largo - máximo 140 caracteres, enviaste %d" diff --git a/locale/fa/LC_MESSAGES/statusnet.po b/locale/fa/LC_MESSAGES/statusnet.po index e79e74ecda..c5999c1e2c 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-10 00:46+0000\n" -"PO-Revision-Date: 2010-01-10 00:47:43+0000\n" +"POT-Creation-Date: 2010-01-15 19:15+0000\n" +"PO-Revision-Date: 2010-01-15 19:16:52+0000\n" "Last-Translator: Ahmad Sufi Mahmudi\n" "Language-Team: Persian\n" "MIME-Version: 1.0\n" @@ -20,7 +20,7 @@ msgstr "" "X-Language-Code: fa\n" "X-Message-Group: out-statusnet\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: MediaWiki 1.16alpha (r60878); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r61101); 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 @@ -37,25 +37,30 @@ msgstr "چنین صÙحه‌ای وجود ندارد" #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 +#: actions/apistatusesupdate.php:149 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 #: 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 #: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 -#: lib/command.php:163 lib/command.php:311 lib/command.php:364 -#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/command.php:163 lib/command.php:302 lib/command.php:355 +#: lib/command.php:401 lib/command.php:462 lib/command.php:518 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/subs.php:34 lib/subs.php:125 msgid "No such user." msgstr "چنین کاربری وجود ندارد." +#: actions/all.php:84 +#, fuzzy, php-format +msgid "%1$s and friends, page %2$d" +msgstr "%s کاربران مسدود شده، صÙحه‌ی %d" + #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 +#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -113,7 +118,7 @@ msgstr "" msgid "You and friends" msgstr "شما Ùˆ دوستان" -#: actions/allrss.php:119 actions/apitimelinefriends.php:122 +#: actions/allrss.php:119 actions/apitimelinefriends.php:121 #: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" @@ -124,6 +129,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:155 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 "رابط مورد نظر پیدا نشد." @@ -137,7 +159,7 @@ msgstr "رابط مورد نظر پیدا نشد." #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:114 +#: actions/apistatusesupdate.php:119 msgid "This method requires a POST." msgstr "برای استÙاده از این روش باید اطلاعات را به صورت پست بÙرستید" @@ -166,8 +188,9 @@ msgstr "نمی‌توان شناس‌نامه را ذخیره کرد." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257 -#: actions/designadminpanel.php:122 actions/newnotice.php:94 +#: actions/apistatusesupdate.php:132 actions/avatarsettings.php:257 +#: actions/designadminpanel.php:122 actions/editapplication.php:118 +#: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format msgid "" @@ -180,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 "نمی‌توان تنظیمات طرح‌تان را ذخیره کرد." @@ -220,26 +246,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 "هیچ پیام متنی وجود ندارد!" @@ -263,7 +269,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 @@ -271,7 +278,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 @@ -292,7 +300,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 @@ -325,7 +334,8 @@ msgstr "این لقب در حال حاضر ثبت شده است. لطÙا یکی msgid "Not a valid nickname." msgstr "لقب نا معتبر." -#: actions/apigroupcreate.php:196 actions/editgroup.php:195 +#: actions/apigroupcreate.php:196 actions/editapplication.php:212 +#: actions/editgroup.php:195 actions/newapplication.php:200 #: actions/newgroup.php:139 actions/profilesettings.php:222 #: actions/register.php:217 msgid "Homepage is not a valid URL." @@ -337,7 +347,8 @@ msgstr "برگهٔ آغازین یک نشانی معتبر نیست." msgid "Full name is too long (max 255 chars)." msgstr "نام کامل طولانی است (Û²ÛµÛµ حر٠در حالت بیشینه(." -#: actions/apigroupcreate.php:213 +#: actions/apigroupcreate.php:213 actions/editapplication.php:187 +#: actions/newapplication.php:169 #, php-format msgid "Description is too long (max %d chars)." msgstr "توصی٠بسیار زیاد است (حداکثر %d حرÙ)." @@ -377,7 +388,7 @@ msgstr "نام Ùˆ نام مستعار شما نمی تواند یکی باشد . msgid "Group not found!" msgstr "گروه یاÙت نشد!" -#: actions/apigroupjoin.php:110 lib/command.php:217 +#: actions/apigroupjoin.php:110 actions/joingroup.php:90 msgid "You are already a member of that group." msgstr "شما از پیش یک عضو این گروه هستید." @@ -385,7 +396,7 @@ msgstr "شما از پیش یک عضو این گروه هستید." msgid "You have been blocked from that group by the admin." msgstr "دسترسی شما به گروه توسط مدیر آن محدود شده است." -#: actions/apigroupjoin.php:138 lib/command.php:234 +#: actions/apigroupjoin.php:138 actions/joingroup.php:124 #, fuzzy, php-format msgid "Could not join user %1$s to group %2$s." msgstr "عضویت %s در گروه %s نا موÙÙ‚ بود." @@ -394,7 +405,7 @@ msgstr "عضویت %s در گروه %s نا موÙÙ‚ بود." msgid "You are not a member of this group." msgstr "شما یک عضو این گروه نیستید." -#: actions/apigroupleave.php:124 actions/leavegroup.php:127 +#: actions/apigroupleave.php:124 actions/leavegroup.php:119 #, fuzzy, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "خارج شدن %s از گروه %s نا موÙÙ‚ بود" @@ -414,6 +425,100 @@ msgstr "%s گروه" msgid "groups on %s" msgstr "گروه‌ها در %s" +#: actions/apioauthauthorize.php:108 actions/apioauthauthorize.php:114 +msgid "Bad request." +msgstr "" + +#: actions/apioauthauthorize.php:134 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:115 actions/makeadmin.php:66 +#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 +#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:139 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 +#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/subscribe.php:46 actions/tagother.php:166 +#: 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 "مشکلی در دریاÙت جلسه‌ی شما وجود دارد. لطÙا بعدا سعی کنید." + +#: actions/apioauthauthorize.php:146 +#, fuzzy +msgid "Invalid nickname / password!" +msgstr "نام کاربری یا کلمه ÛŒ عبور نا معتبر." + +#: actions/apioauthauthorize.php:170 +msgid "DB error deleting OAuth app user." +msgstr "" + +#: actions/apioauthauthorize.php:196 +msgid "DB error inserting OAuth app user." +msgstr "" + +#: actions/apioauthauthorize.php:231 +#, php-format +msgid "" +"The request token %s has been authorized. Please exchange it for an access " +"token." +msgstr "" + +#: actions/apioauthauthorize.php:241 +#, php-format +msgid "The request token %s has been denied." +msgstr "" + +#: actions/apioauthauthorize.php:246 actions/avatarsettings.php:281 +#: actions/designadminpanel.php:103 actions/editapplication.php:139 +#: actions/emailsettings.php:256 actions/grouplogo.php:319 +#: actions/imsettings.php:220 actions/newapplication.php:121 +#: actions/oauthconnectionssettings.php:151 actions/recoverpassword.php:44 +#: actions/smssettings.php:248 lib/designsettings.php:304 +msgid "Unexpected form submission." +msgstr "ارسال غیر قابل انتظار Ùرم." + +#: actions/apioauthauthorize.php:273 +msgid "An application would like to connect to your account" +msgstr "" + +#: actions/apioauthauthorize.php:290 +msgid "Allow or deny access" +msgstr "" + +#: actions/apioauthauthorize.php:320 lib/action.php:435 +msgid "Account" +msgstr "حساب کاربری" + +#: actions/apioauthauthorize.php:323 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/apioauthauthorize.php:326 actions/login.php:233 +#: actions/register.php:429 lib/accountsettingsaction.php:116 +msgid "Password" +msgstr "گذرواژه" + +#: actions/apioauthauthorize.php:338 +#, fuzzy +msgid "Deny" +msgstr "طرح" + +#: actions/apioauthauthorize.php:344 +#, fuzzy +msgid "Allow" +msgstr "همه" + +#: actions/apioauthauthorize.php:361 +msgid "Allow or deny access to your account information." +msgstr "" + #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." msgstr "این روش نیازمند POST یا DELETE است." @@ -427,11 +532,11 @@ msgstr "شما توانایی حذ٠وضعیت کاربر دیگری را ند msgid "No such notice." msgstr "چنین پیامی وجود ندارد." -#: actions/apistatusesretweet.php:83 lib/command.php:422 +#: actions/apistatusesretweet.php:83 msgid "Cannot repeat your own notice." msgstr "نمی توانید خبر خود را تکرار کنید." -#: actions/apistatusesretweet.php:91 lib/command.php:427 +#: actions/apistatusesretweet.php:91 msgid "Already repeated that notice." msgstr "ابن خبر قبلا Ùرستاده شده" @@ -443,17 +548,17 @@ msgstr "وضعیت حذ٠شد." msgid "No status with that ID found." msgstr "هیچ وضعیتی با آن شناسه یاÙت نشد." -#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:162 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "خیلی طولانی است. حداکثر طول مجاز پیام %d حر٠است." -#: actions/apistatusesupdate.php:198 +#: actions/apistatusesupdate.php:203 msgid "Not found" msgstr "یاÙت نشد" -#: actions/apistatusesupdate.php:221 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:226 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "حداکثر طول پیام %d حر٠است Ú©Ù‡ شامل ضمیمه نیز می‌باشد" @@ -537,8 +642,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 +670,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 "کاربر بدون مشخصات" @@ -595,29 +703,6 @@ 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/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 -#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 -#: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 -#: actions/subscribe.php:46 actions/tagother.php:166 -#: 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 "مشکلی در دریاÙت جلسه‌ی شما وجود دارد. لطÙا بعدا سعی کنید." - -#: actions/avatarsettings.php:281 actions/designadminpanel.php:103 -#: actions/emailsettings.php:256 actions/grouplogo.php:319 -#: actions/imsettings.php:220 actions/recoverpassword.php:44 -#: actions/smssettings.php:248 lib/designsettings.php:304 -msgid "Unexpected form submission." -msgstr "ارسال غیر قابل انتظار Ùرم." - #: actions/avatarsettings.php:328 msgid "Pick a square area of the image to be your avatar" msgstr "یک مربع از عکس خود را انتخاب کنید تا چهره‌ی شما باشد." @@ -680,19 +765,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:260 +msgid "No such group." +msgstr "چنین گروهی وجود ندارد." #: actions/blockedfromgroup.php:90 #, php-format @@ -759,7 +840,8 @@ msgid "Couldn't delete email confirmation." msgstr "نمی‌توان تصدیق پست الکترونیک را پاک کرد." #: actions/confirmaddress.php:144 -msgid "Confirm Address" +#, fuzzy +msgid "Confirm address" msgstr "تایید نشانی" #: actions/confirmaddress.php:159 @@ -814,10 +896,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 "شما نمی‌توانید کاربران را پاک کنید." @@ -951,7 +1029,8 @@ msgstr "برگشت به حالت پیش گزیده" #: actions/pathsadminpanel.php:324 actions/profilesettings.php:174 #: actions/siteadminpanel.php:388 actions/smssettings.php:181 #: actions/subscriptions.php:203 actions/tagother.php:154 -#: actions/useradminpanel.php:313 lib/designsettings.php:256 +#: actions/useradminpanel.php:313 lib/applicationeditform.php:335 +#: lib/applicationeditform.php:336 lib/designsettings.php:256 #: lib/groupeditform.php:202 msgid "Save" msgstr "ذخیره‌کردن" @@ -972,6 +1051,84 @@ msgstr "اÙزودن به علاقه‌مندی‌ها" msgid "No such document." msgstr "چنین سندی وجود ندارد." +#: actions/editapplication.php:54 lib/applicationeditform.php:136 +msgid "Edit application" +msgstr "" + +#: actions/editapplication.php:66 +#, fuzzy +msgid "You must be logged in to edit an application." +msgstr "برای ویرایش گروه باید وارد شوید." + +#: actions/editapplication.php:77 actions/showapplication.php:94 +#, fuzzy +msgid "You are not the owner of this application." +msgstr "شما یک عضو این گروه نیستید." + +#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:163 +#: actions/showapplication.php:87 +#, fuzzy +msgid "No such application." +msgstr "چنین پیامی وجود ندارد." + +#: actions/editapplication.php:127 actions/newapplication.php:110 +#: actions/showapplication.php:118 lib/action.php:1167 +msgid "There was a problem with your session token." +msgstr "" + +#: actions/editapplication.php:161 +#, fuzzy +msgid "Use this form to edit your application." +msgstr "از این روش برای ویرایش گروه استÙاده کنید." + +#: actions/editapplication.php:177 actions/newapplication.php:159 +msgid "Name is required." +msgstr "" + +#: actions/editapplication.php:180 actions/newapplication.php:162 +#, fuzzy +msgid "Name is too long (max 255 chars)." +msgstr "نام کامل طولانی است (Û²ÛµÛµ حر٠در حالت بیشینه(." + +#: actions/editapplication.php:183 actions/newapplication.php:165 +msgid "Description is required." +msgstr "" + +#: actions/editapplication.php:191 +msgid "Source URL is too long." +msgstr "" + +#: actions/editapplication.php:197 actions/newapplication.php:182 +#, fuzzy +msgid "Source URL is not valid." +msgstr "برگهٔ آغازین یک نشانی معتبر نیست." + +#: actions/editapplication.php:200 actions/newapplication.php:185 +msgid "Organization is required." +msgstr "" + +#: actions/editapplication.php:203 actions/newapplication.php:188 +#, fuzzy +msgid "Organization is too long (max 255 chars)." +msgstr "مکان طولانی است (حداکثر Û²ÛµÛµ حرÙ)" + +#: actions/editapplication.php:206 actions/newapplication.php:191 +msgid "Organization homepage is required." +msgstr "" + +#: actions/editapplication.php:215 actions/newapplication.php:203 +msgid "Callback is too long." +msgstr "" + +#: actions/editapplication.php:222 actions/newapplication.php:212 +msgid "Callback URL is not valid." +msgstr "" + +#: actions/editapplication.php:255 +#, fuzzy +msgid "Could not update application." +msgstr "نمی‌توان گروه را به‌هنگام‌سازی کرد." + #: actions/editgroup.php:56 #, php-format msgid "Edit %s group" @@ -983,7 +1140,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 @@ -1008,7 +1166,8 @@ msgid "Options saved." msgstr "گزینه‌ها ذخیره شدند." #: actions/emailsettings.php:60 -msgid "Email Settings" +#, fuzzy +msgid "Email settings" msgstr "تنظیمات پست الکترونیک" #: actions/emailsettings.php:71 @@ -1038,13 +1197,15 @@ msgid "" msgstr "" #: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 +#: actions/smssettings.php:126 lib/applicationeditform.php:333 +#: lib/applicationeditform.php:334 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\"" @@ -1118,9 +1279,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." @@ -1300,13 +1462,6 @@ 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:79 msgid "No such file." msgstr "چنین پرونده‌ای وجود ندارد." @@ -1323,7 +1478,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 "کاربری با چنین شناسه‌ای وجود ندارد." @@ -1368,9 +1523,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." @@ -1391,12 +1546,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 "ترجیحات طرح ذخیره شد." @@ -1411,6 +1560,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 "یک ناحیه‌ی مربع از تصویر را انتخاب کنید تا به عنوان نشان باشد." @@ -1538,7 +1692,8 @@ msgid "Error removing the block." msgstr "اشکال در پاکسازی" #: actions/imsettings.php:59 -msgid "IM Settings" +#, fuzzy +msgid "IM settings" msgstr "تنظیمات پیام‌رسان Ùوری" #: actions/imsettings.php:70 @@ -1568,7 +1723,8 @@ msgstr "" "بیش‌تر بررسی کنید. (آیا %s را به Ùهرست خود اضاÙÙ‡ کرده اید؟) " #: actions/imsettings.php:124 -msgid "IM Address" +#, fuzzy +msgid "IM address" msgstr "نشانی پیام‌رسان Ùوری" #: actions/imsettings.php:126 @@ -1665,7 +1821,7 @@ msgstr "دعوت کردن کاربران تازه" msgid "You are already subscribed to these users:" msgstr "هم اکنون شما این کاربران را دنبال می‌کنید: " -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:315 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 #, php-format msgid "%1$s (%2$s)" msgstr "" @@ -1709,7 +1865,7 @@ msgstr "پیام خصوصی" msgid "Optionally add a personal message to the invitation." msgstr "اگر دوست دارید می‌توانید یک پیام به همراه دعوت نامه ارسال کنید." -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236 msgid "Send" msgstr "Ùرستادن" @@ -1753,16 +1909,7 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "برای پیوستن به یک گروه، باید وارد شده باشید." -#: actions/joingroup.php:90 -msgid "You are already a member of that group" -msgstr "شما یک کاربر این گروه هستید." - -#: actions/joingroup.php:128 -#, fuzzy, php-format -msgid "Could not join user %1$s to group %2$s" -msgstr "نمی‌توان کاربر %s را به گروه %s پیوند داد." - -#: actions/joingroup.php:135 lib/command.php:239 +#: actions/joingroup.php:131 #, fuzzy, php-format msgid "%1$s joined group %2$s" msgstr "ملحق شدن به گروه" @@ -1771,68 +1918,49 @@ msgstr "ملحق شدن به گروه" msgid "You must be logged in to leave a group." msgstr "برای ترک یک گروه، شما باید وارد شده باشید." -#: actions/leavegroup.php:90 lib/command.php:268 +#: actions/leavegroup.php:90 lib/command.php:265 msgid "You are not a member of that group." msgstr "شما یک کاربر این گروه نیستید." -#: actions/leavegroup.php:119 lib/command.php:278 -msgid "Could not find membership record." -msgstr "عضویت ثبت شده پیدا نشد." - -#: actions/leavegroup.php:134 lib/command.php:289 +#: actions/leavegroup.php:127 #, 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:460 +#: 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 -#: lib/groupeditform.php:152 lib/userprofile.php:131 -msgid "Nickname" -msgstr "نام کاربری" - -#: actions/login.php:253 actions/register.php:428 -#: 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." @@ -1840,7 +1968,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]" @@ -1860,18 +1988,41 @@ msgstr "%s از قبل مدیر گروه %s بود." #: actions/makeadmin.php:132 #, fuzzy, php-format -msgid "Can't get membership record for %1$s in group %2$s" +msgid "Can't get membership record for %1$s in group %2$s." msgstr "نمی‌توان اطلاعات عضویت %s را در گروه %s به دست آورد." #: actions/makeadmin.php:145 #, fuzzy, php-format -msgid "Can't make %1$s an admin for group %2$s" +msgid "Can't make %1$s an admin for group %2$s." msgstr "نمی‌توان %s را مدیر گروه %s کرد." #: actions/microsummary.php:69 msgid "No current status" msgstr "بدون وضعیت Ùعلی" +#: actions/newapplication.php:52 +msgid "New application" +msgstr "" + +#: actions/newapplication.php:64 +#, fuzzy +msgid "You must be logged in to register an application." +msgstr "برای ساخت یک گروه، باید وارد شده باشید." + +#: actions/newapplication.php:143 +#, fuzzy +msgid "Use this form to register a new application." +msgstr "از این Ùرم برای ساختن یک گروه جدید استÙاده کنید" + +#: actions/newapplication.php:173 +msgid "Source URL is required." +msgstr "" + +#: actions/newapplication.php:255 actions/newapplication.php:264 +#, fuzzy +msgid "Could not create application." +msgstr "نمی‌توان نام‌های مستعار را ساخت." + #: actions/newgroup.php:53 msgid "New group" msgstr "گروه جدید" @@ -1884,12 +2035,12 @@ msgstr "از این Ùرم برای ساختن یک گروه جدید استÙا msgid "New message" msgstr "پیام جدید" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 msgid "You can't send a message to this user." msgstr "شما نمی توانید به این کاربر پیام بÙرستید." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:484 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 +#: lib/command.php:475 msgid "No content!" msgstr "بدون محتوا!" @@ -1897,7 +2048,7 @@ msgstr "بدون محتوا!" msgid "No recipient specified." msgstr "هیچ گیرنده ای مشخص نشده" -#: actions/newmessage.php:164 lib/command.php:370 +#: actions/newmessage.php:164 lib/command.php:361 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "یک پیام را به خودتان Ù†Ùرستید؛ در عوض آن را آهسته برای خود بگویید." @@ -1907,8 +2058,8 @@ msgid "Message sent" msgstr "پیام Ùرستاده‌شد" #: actions/newmessage.php:185 -#, php-format -msgid "Direct message to %s sent" +#, fuzzy, php-format +msgid "Direct message to %s sent." msgstr "پیام مستقیم به %s Ùرستاده شد." #: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 @@ -1984,6 +2135,51 @@ msgstr "Ùرتادن اژیر" msgid "Nudge sent!" msgstr "سقلمه Ùرستاده شد!" +#: actions/oauthappssettings.php:59 +#, fuzzy +msgid "You must be logged in to list your applications." +msgstr "برای ویرایش گروه باید وارد شوید." + +#: actions/oauthappssettings.php:74 +#, fuzzy +msgid "OAuth applications" +msgstr "انتخابات دیگر" + +#: actions/oauthappssettings.php:85 +msgid "Applications you have registered" +msgstr "" + +#: actions/oauthappssettings.php:135 +#, php-format +msgid "You have not registered any applications yet." +msgstr "" + +#: actions/oauthconnectionssettings.php:71 +msgid "Connected applications" +msgstr "" + +#: actions/oauthconnectionssettings.php:87 +msgid "You have allowed the following applications to access you account." +msgstr "" + +#: actions/oauthconnectionssettings.php:170 +#, fuzzy +msgid "You are not a user of that application." +msgstr "شما یک کاربر این گروه نیستید." + +#: actions/oauthconnectionssettings.php:180 +msgid "Unable to revoke access for app: " +msgstr "" + +#: actions/oauthconnectionssettings.php:192 +#, php-format +msgid "You have not authorized any applications to use your account." +msgstr "" + +#: actions/oauthconnectionssettings.php:205 +msgid "Developers can edit the registration settings for their applications " +msgstr "" + #: actions/oembed.php:79 actions/shownotice.php:100 msgid "Notice has no profile" msgstr "ابن خبر ذخیره ای ندارد ." @@ -2001,8 +2197,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:1038 +#: lib/api.php:1066 lib/api.php:1176 msgid "Not a supported data format." msgstr "یک قالب دادهٔ پشتیبانی‌شده نیست." @@ -2015,7 +2211,8 @@ msgid "Notice Search" msgstr "جست‌وجوی آگهی‌ها" #: actions/othersettings.php:60 -msgid "Other Settings" +#, fuzzy +msgid "Other settings" msgstr "تنظیمات دیگر" #: actions/othersettings.php:71 @@ -2046,6 +2243,30 @@ msgstr "نمایش یا عدم‌نمایش طراحی‌های کاربران." msgid "URL shortening service is too long (max 50 chars)." 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 +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" @@ -2082,7 +2303,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 "تایید" @@ -2244,8 +2465,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" @@ -2306,42 +2528,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 -#: lib/groupeditform.php:161 +#: actions/profilesettings.php:115 actions/register.php:453 +#: lib/applicationeditform.php:230 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 "" @@ -2636,7 +2858,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 "با عرض معذرت، تنها اÙراد دعوت شده Ù…ÛŒ توانند ثبت نام کنند." @@ -2648,7 +2870,7 @@ msgstr "با عرض تاسÙØŒ کد دعوت نا معتبر است." msgid "Registration successful" msgstr "ثبت نام با موÙقیت انجام شد." -#: actions/register.php:114 actions/register.php:502 lib/action.php:457 +#: actions/register.php:114 actions/register.php:503 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "ثبت نام" @@ -2661,58 +2883,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." @@ -2720,7 +2938,7 @@ msgstr "" "به استثنای این داده ÛŒ محرمانه : کلمه ÛŒ عبور، آدرس ایمیل، آدرس IMØŒ Ùˆ شماره " "تلÙÙ†." -#: actions/register.php:537 +#: actions/register.php:538 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -2739,7 +2957,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.)" @@ -2881,6 +3099,85 @@ msgstr "" msgid "User is already sandboxed." msgstr "" +#: actions/showapplication.php:82 +#, fuzzy +msgid "You must be logged in to view an application." +msgstr "برای ترک یک گروه، شما باید وارد شده باشید." + +#: actions/showapplication.php:158 +#, fuzzy +msgid "Application profile" +msgstr "ابن خبر ذخیره ای ندارد ." + +#: actions/showapplication.php:160 lib/applicationeditform.php:182 +msgid "Icon" +msgstr "" + +#: actions/showapplication.php:170 actions/version.php:195 +#: lib/applicationeditform.php:197 +#, fuzzy +msgid "Name" +msgstr "نام کاربری" + +#: actions/showapplication.php:179 lib/applicationeditform.php:224 +#, fuzzy +msgid "Organization" +msgstr "صÙحه بندى" + +#: actions/showapplication.php:188 actions/version.php:198 +#: lib/applicationeditform.php:211 lib/groupeditform.php:172 +msgid "Description" +msgstr "" + +#: actions/showapplication.php:193 actions/showgroup.php:429 +#: lib/profileaction.php:174 +msgid "Statistics" +msgstr "آمار" + +#: actions/showapplication.php:204 +#, php-format +msgid "created by %1$s - %2$s access by default - %3$d users" +msgstr "" + +#: actions/showapplication.php:214 +msgid "Application actions" +msgstr "" + +#: actions/showapplication.php:233 +msgid "Reset key & secret" +msgstr "" + +#: actions/showapplication.php:241 +msgid "Application info" +msgstr "" + +#: actions/showapplication.php:243 +msgid "Consumer key" +msgstr "" + +#: actions/showapplication.php:248 +msgid "Consumer secret" +msgstr "" + +#: actions/showapplication.php:253 +msgid "Request token URL" +msgstr "" + +#: actions/showapplication.php:258 +msgid "Access token URL" +msgstr "" + +#: actions/showapplication.php:263 +#, fuzzy +msgid "Authorize URL" +msgstr "مؤلÙ" + +#: actions/showapplication.php:268 +msgid "" +"Note: We support HMAC-SHA1 signatures. We do not support the plaintext " +"signature method." +msgstr "" + #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "ناتوان در بازیابی Ø¢Ú¯Ù‡ÛŒ های محبوب." @@ -2978,7 +3275,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 "هیچ" @@ -2986,10 +3283,6 @@ msgstr "هیچ" msgid "All members" msgstr "همه ÛŒ اعضا" -#: actions/showgroup.php:429 lib/profileaction.php:174 -msgid "Statistics" -msgstr "آمار" - #: actions/showgroup.php:432 msgid "Created" msgstr "ساخته شد" @@ -3130,12 +3423,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 @@ -3317,8 +3611,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 @@ -3346,7 +3641,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 @@ -3584,10 +3880,6 @@ 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 "" @@ -3778,10 +4070,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 "طراحی پروÙیل" @@ -3858,11 +4146,6 @@ msgstr "" msgid "Plugins" msgstr "" -#: actions/version.php:195 -#, fuzzy -msgid "Name" -msgstr "نام کاربری" - #: actions/version.php:196 lib/action.php:741 #, fuzzy msgid "Version" @@ -3873,27 +4156,41 @@ msgstr "شخصی" msgid "Author(s)" msgstr "مؤلÙ" -#: actions/version.php:198 lib/groupeditform.php:172 -msgid "Description" -msgstr "" - -#: classes/File.php:137 +#: 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/Group_member.php:41 +msgid "Group join failed." +msgstr "" + +#: classes/Group_member.php:53 +#, fuzzy +msgid "Not part of group." +msgstr "نمی‌توان گروه را به‌هنگام‌سازی کرد." + +#: classes/Group_member.php:60 +msgid "Group leave failed." +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 "شما از Ùرستادن پیام مستقیم مردود شده اید." @@ -3906,27 +4203,27 @@ msgstr "پیغام نمی تواند درج گردد" msgid "Could not update message with new URI." msgstr "" -#: classes/Notice.php:172 +#: classes/Notice.php:171 #, php-format msgid "DB error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:226 +#: classes/Notice.php:225 msgid "Problem saving notice. Too long." msgstr "مشکل در ذخیره کردن پیام. بسیار طولانی." -#: classes/Notice.php:230 +#: classes/Notice.php:229 msgid "Problem saving notice. Unknown user." msgstr "مشکل در ذخیره کردن پیام. کاربر نا شناخته." -#: classes/Notice.php:235 +#: classes/Notice.php:234 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "تعداد خیلی زیاد Ø¢Ú¯Ù‡ÛŒ Ùˆ بسیار سریع؛ استراحت کنید Ùˆ مجددا دقایقی دیگر ارسال " "کنید." -#: classes/Notice.php:241 +#: classes/Notice.php:240 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -3934,25 +4231,25 @@ msgstr "" "تعداد زیاد پیام های دو نسخه ای Ùˆ بسرعت؛ استراحت کنید Ùˆ دقایقی دیگر مجددا " "ارسال کنید." -#: classes/Notice.php:247 +#: classes/Notice.php:246 msgid "You are banned from posting notices on this site." msgstr "شما از Ùرستادن پست در این سایت مردود شدید ." -#: classes/Notice.php:309 classes/Notice.php:334 +#: classes/Notice.php:305 classes/Notice.php:330 msgid "Problem saving notice." msgstr "مشکل در ذخیره کردن Ø¢Ú¯Ù‡ÛŒ." -#: classes/Notice.php:1034 +#: classes/Notice.php:1052 #, php-format msgid "DB error inserting reply: %s" msgstr "" -#: classes/Notice.php:1359 +#: classes/Notice.php:1423 #, php-format msgid "RT @%1$s %2$s" msgstr "" -#: classes/User.php:368 +#: classes/User.php:382 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "خوش امدید به %1$s , @%2$s!" @@ -3993,6 +4290,11 @@ msgstr "دیگر" msgid "Other options" msgstr "انتخابات دیگر" +#: lib/action.php:144 +#, fuzzy, php-format +msgid "%1$s - %2$s" +msgstr "%s گروه %s را ترک کرد." + #: lib/action.php:159 msgid "Untitled page" msgstr "صÙحه ÛŒ بدون عنوان" @@ -4009,10 +4311,6 @@ msgstr "خانه" msgid "Personal profile and friends timeline" msgstr "" -#: lib/action.php:435 -msgid "Account" -msgstr "حساب کاربری" - #: lib/action.php:435 msgid "Change your email, avatar, password, profile" msgstr "آدرس ایمیل، آواتار، کلمه ÛŒ عبور، پروÙایل خود را تغییر دهید" @@ -4162,10 +4460,6 @@ msgstr "بعد از" msgid "Before" msgstr "قبل از" -#: lib/action.php:1167 -msgid "There was a problem with your session token." -msgstr "" - #: lib/adminpanelaction.php:96 msgid "You cannot make changes to this site." msgstr "شما نمی توانید در این سایت تغیری ایجاد کنید" @@ -4199,6 +4493,69 @@ msgstr "" msgid "Paths configuration" msgstr "" +#: lib/applicationeditform.php:186 +msgid "Icon for this application" +msgstr "" + +#: lib/applicationeditform.php:206 +#, php-format +msgid "Describe your application in %d characters" +msgstr "" + +#: lib/applicationeditform.php:209 +msgid "Describe your application" +msgstr "" + +#: lib/applicationeditform.php:218 +#, fuzzy +msgid "Source URL" +msgstr "منبع" + +#: lib/applicationeditform.php:220 +msgid "URL of the homepage of this application" +msgstr "" + +#: lib/applicationeditform.php:226 +msgid "Organization responsible for this application" +msgstr "" + +#: lib/applicationeditform.php:232 +msgid "URL for the homepage of the organization" +msgstr "" + +#: lib/applicationeditform.php:238 +msgid "URL to redirect to after authentication" +msgstr "" + +#: lib/applicationeditform.php:260 +msgid "Browser" +msgstr "" + +#: lib/applicationeditform.php:276 +msgid "Desktop" +msgstr "" + +#: lib/applicationeditform.php:277 +msgid "Type of application, browser or desktop" +msgstr "" + +#: lib/applicationeditform.php:299 +msgid "Read-only" +msgstr "" + +#: lib/applicationeditform.php:317 +msgid "Read-write" +msgstr "" + +#: lib/applicationeditform.php:318 +msgid "Default access for this application: read-only, or read-write" +msgstr "" + +#: lib/applicationlist.php:154 +#, fuzzy +msgid "Revoke" +msgstr "حذÙ" + #: lib/attachmentlist.php:87 msgid "Attachments" msgstr "ضمائم" @@ -4219,12 +4576,12 @@ msgstr "" msgid "Tags for this attachment" msgstr "" -#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 +#: lib/authenticationplugin.php:214 lib/authenticationplugin.php:219 #, fuzzy msgid "Password changing failed" msgstr "تغییر گذرواژه" -#: lib/authenticationplugin.php:197 +#: lib/authenticationplugin.php:229 #, fuzzy msgid "Password changing is not allowed" msgstr "تغییر گذرواژه" @@ -4246,8 +4603,8 @@ msgid "Sorry, this command is not yet implemented." msgstr "متاسÙانه این دستور هنوز اجرا نشده." #: lib/command.php:88 -#, fuzzy, php-format -msgid "Could not find a user with nickname %s." +#, php-format +msgid "Could not find a user with nickname %s" msgstr "پیدا نشد %s کاریری یا نام مستعار" #: lib/command.php:92 @@ -4256,7 +4613,7 @@ msgstr "" #: lib/command.php:99 #, fuzzy, php-format -msgid "Nudge sent to %s." +msgid "Nudge sent to %s" msgstr "Ùرتادن اژیر" #: lib/command.php:126 @@ -4270,168 +4627,187 @@ msgstr "" "مشترک : %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." +#: lib/command.php:152 lib/command.php:390 lib/command.php:451 +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." +#: lib/command.php:168 lib/command.php:406 lib/command.php:467 +#: lib/command.php:523 +msgid "User has no last notice" msgstr "کاربر Ø¢Ú¯Ù‡ÛŒ آخر ندارد" #: lib/command.php:190 msgid "Notice marked as fave." msgstr "" -#: lib/command.php:284 +#: lib/command.php:217 +msgid "You are already a member of that group" +msgstr "شما از پیش یک عضو این گروه هستید." + +#: lib/command.php:231 +#, php-format +msgid "Could not join user %s to group %s" +msgstr "عضویت %s در گروه %s نا موÙÙ‚ بود." + +#: lib/command.php:236 +#, php-format +msgid "%s joined group %s" +msgstr "ملحق شدن به گروه" + +#: lib/command.php:275 #, fuzzy, php-format -msgid "Could not remove user %1$s to group %2$s." +msgid "Could not remove user %s to group %s" msgstr "خارج شدن %s از گروه %s نا موÙÙ‚ بود" -#: lib/command.php:318 +#: lib/command.php:280 +#, php-format +msgid "%s left group %s" +msgstr "%s گروه %s را ترک کرد." + +#: lib/command.php:309 #, php-format msgid "Fullname: %s" msgstr "نام کامل : %s" -#: lib/command.php:321 +#: lib/command.php:312 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "موقعیت : %s" -#: lib/command.php:324 +#: lib/command.php:315 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "صÙحه خانگی : %s" -#: lib/command.php:327 +#: lib/command.php:318 #, php-format msgid "About: %s" msgstr "درباره ÛŒ : %s" -#: lib/command.php:358 -#, fuzzy, php-format -msgid "Message too long - maximum is %1$d characters, you sent %2$d." +#: lib/command.php:349 +#, 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." +#: lib/command.php:367 +#, php-format +msgid "Direct message to %s sent" msgstr "پیام مستقیم به %s Ùرستاده شد." -#: lib/command.php:378 +#: lib/command.php:369 msgid "Error sending direct message." msgstr "خطا در Ùرستادن پیام مستقیم." -#: lib/command.php:435 +#: lib/command.php:413 +msgid "Cannot repeat your own notice" +msgstr "نمی توان Ø¢Ú¯Ù‡ÛŒ خودتان را تکرار کرد" + +#: lib/command.php:418 +msgid "Already repeated that notice" +msgstr "آن Ø¢Ú¯Ù‡ÛŒ قبلا تکرار شده است." + +#: lib/command.php:426 #, fuzzy, php-format -msgid "Notice from %s repeated." +msgid "Notice from %s repeated" msgstr "Ø¢Ú¯Ù‡ÛŒ تکرار شد" -#: lib/command.php:437 +#: lib/command.php:428 msgid "Error repeating notice." msgstr "خطا هنگام تکرار Ø¢Ú¯Ù‡ÛŒ." -#: lib/command.php:491 +#: lib/command.php:482 #, fuzzy, php-format -msgid "Notice too long - maximum is %1$d characters, you sent %2$d." +msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" "پیغام بسیار طولانی است - بیشترین اندازه امکان پذیر %d کاراکتر است , شما %d " "تا Ùرستادید" -#: lib/command.php:500 +#: lib/command.php:491 #, fuzzy, php-format -msgid "Reply to %s sent." +msgid "Reply to %s sent" msgstr "به این Ø¢Ú¯Ù‡ÛŒ جواب دهید" -#: lib/command.php:502 +#: lib/command.php:493 msgid "Error saving notice." msgstr "خطا هنگام ذخیره ÛŒ Ø¢Ú¯Ù‡ÛŒ" -#: lib/command.php:556 -msgid "Specify the name of the user to subscribe to." +#: lib/command.php:547 +msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:563 +#: lib/command.php:554 #, php-format msgid "Subscribed to %s" msgstr "" -#: lib/command.php:584 -msgid "Specify the name of the user to unsubscribe from." +#: lib/command.php:575 +msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:591 +#: lib/command.php:582 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:609 lib/command.php:632 +#: lib/command.php:600 lib/command.php:623 msgid "Command not yet implemented." msgstr "دستور هنوز اجرا نشده" -#: lib/command.php:612 +#: lib/command.php:603 msgid "Notification off." msgstr "" -#: lib/command.php:614 +#: lib/command.php:605 msgid "Can't turn off notification." msgstr "ناتوان در خاموش کردن آگاه سازی." -#: lib/command.php:635 +#: lib/command.php:626 msgid "Notification on." msgstr "آگاه سازی Ùعال است." -#: lib/command.php:637 +#: lib/command.php:628 msgid "Can't turn on notification." msgstr "ناتوان در روشن کردن آگاه سازی." -#: lib/command.php:650 -#, fuzzy -msgid "Login command is disabled." +#: lib/command.php:641 +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:652 #, php-format -msgid "This link is useable only once, and is good for only 2 minutes: %s." +msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:685 +#: lib/command.php:668 msgid "You are not subscribed to anyone." msgstr "شما توسط هیچ کس تصویب نشده اید ." -#: lib/command.php:687 +#: lib/command.php:670 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "هم اکنون شما این کاربران را دنبال می‌کنید: " -#: lib/command.php:707 +#: lib/command.php:690 msgid "No one is subscribed to you." msgstr "هیچکس شما را تایید نکرده ." -#: lib/command.php:709 +#: lib/command.php:692 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "هیچکس شما را تایید نکرده ." -#: lib/command.php:729 +#: lib/command.php:712 msgid "You are not a member of any groups." msgstr "شما در هیچ گروهی عضو نیستید ." -#: lib/command.php:731 +#: lib/command.php:714 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:728 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4472,19 +4848,19 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:199 +#: lib/common.php:131 msgid "No configuration file found. " msgstr "" -#: lib/common.php:200 +#: lib/common.php:132 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:201 +#: lib/common.php:134 msgid "You may wish to run the installer to fix this." msgstr "شما ممکن است بخواهید نصاب را اجرا کنید تا این را تعمیر کند." -#: lib/common.php:202 +#: lib/common.php:135 msgid "Go to the installer." msgstr "برو به نصاب." @@ -4500,6 +4876,15 @@ msgstr "" msgid "Updates by SMS" msgstr "به روز رسانی با پیامک" +#: lib/connectsettingsaction.php:120 +#, fuzzy +msgid "Connections" +msgstr "وصل‌شدن" + +#: lib/connectsettingsaction.php:121 +msgid "Authorized connected applications" +msgstr "" + #: lib/dberroraction.php:60 msgid "Database error" msgstr "خطای پایگاه داده" @@ -4683,11 +5068,16 @@ msgstr "مگابایت" msgid "kB" msgstr "کیلوبایت" -#: lib/jabber.php:191 +#: lib/jabber.php:202 #, php-format msgid "[%s]" msgstr "" +#: lib/jabber.php:385 +#, php-format +msgid "Unknown inbox source %d." +msgstr "" + #: lib/joinform.php:114 msgid "Join" msgstr "مشارکت کردن" @@ -4745,22 +5135,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 @@ -4953,7 +5331,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 @@ -4961,8 +5339,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 @@ -4971,7 +5350,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 @@ -5005,16 +5384,18 @@ msgstr "یک Ùایل ضمیمه کنید" #: lib/noticeform.php:212 #, fuzzy -msgid "Share my location." -msgstr "نمی‌توان تنظیمات مکانی را تنظیم کرد." - -#: lib/noticeform.php:214 -#, fuzzy -msgid "Do not share my location." +msgid "Share my location" msgstr "نمی‌توان تنظیمات مکانی را تنظیم کرد." #: lib/noticeform.php:215 -msgid "Hide this info" +#, fuzzy +msgid "Do not share my location" +msgstr "نمی‌توان تنظیمات مکانی را تنظیم کرد." + +#: lib/noticeform.php:216 +msgid "" +"Sorry, retrieving your geo location is taking longer than expected, please " +"try again later" msgstr "" #: lib/noticelist.php:428 @@ -5275,23 +5656,23 @@ msgstr "قبلا تایید شده !" msgid "User has blocked you." msgstr "" -#: lib/subs.php:60 +#: lib/subs.php:63 msgid "Could not subscribe." msgstr "" -#: lib/subs.php:79 +#: lib/subs.php:82 msgid "Could not subscribe other to you." msgstr "" -#: lib/subs.php:128 +#: lib/subs.php:137 msgid "Not subscribed!" msgstr "تایید نشده!" -#: lib/subs.php:133 +#: lib/subs.php:142 msgid "Couldn't delete self-subscription." msgstr "" -#: lib/subs.php:146 +#: lib/subs.php:158 msgid "Couldn't delete subscription." msgstr "" @@ -5305,10 +5686,6 @@ msgstr "" msgid "People Tagcloud as tagged" msgstr "" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(هیج)" - #: lib/tagcloudsection.php:56 msgid "None" msgstr "هیچ" @@ -5369,47 +5746,47 @@ msgstr "پیام" msgid "Moderate" msgstr "" -#: lib/util.php:837 +#: lib/util.php:875 msgid "a few seconds ago" msgstr "چند ثانیه پیش" -#: lib/util.php:839 +#: lib/util.php:877 msgid "about a minute ago" msgstr "حدود یک دقیقه پیش" -#: lib/util.php:841 +#: lib/util.php:879 #, php-format msgid "about %d minutes ago" msgstr "حدود %d دقیقه پیش" -#: lib/util.php:843 +#: lib/util.php:881 msgid "about an hour ago" msgstr "حدود یک ساعت پیش" -#: lib/util.php:845 +#: lib/util.php:883 #, php-format msgid "about %d hours ago" msgstr "حدود %d ساعت پیش" -#: lib/util.php:847 +#: lib/util.php:885 msgid "about a day ago" msgstr "حدود یک روز پیش" -#: lib/util.php:849 +#: lib/util.php:887 #, php-format msgid "about %d days ago" msgstr "حدود %d روز پیش" -#: lib/util.php:851 +#: lib/util.php:889 msgid "about a month ago" msgstr "حدود یک ماه پیش" -#: lib/util.php:853 +#: lib/util.php:891 #, php-format msgid "about %d months ago" msgstr "حدود %d ماه پیش" -#: lib/util.php:855 +#: lib/util.php:893 msgid "about a year ago" msgstr "حدود یک سال پیش" @@ -5424,8 +5801,8 @@ msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "%s یک رنگ صحیح نیست! از Û³ یا Û¶ حر٠مبنای شانزده استÙاده کنید" #: scripts/xmppdaemon.php:301 -#, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +#, fuzzy, php-format +msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" "پیغام بسیار طولانی است - بیشترین اندازه امکان پذیر %d کاراکتر است , شما %d " "تا Ùرستادید" diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po index 8892c2c18b..d225320094 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-10 00:46+0000\n" -"PO-Revision-Date: 2010-01-10 00:47:38+0000\n" +"POT-Creation-Date: 2010-01-15 19:15+0000\n" +"PO-Revision-Date: 2010-01-15 19:16:48+0000\n" "Language-Team: Finnish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60878); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r61101); 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" @@ -35,25 +35,30 @@ msgstr "Sivua ei ole." #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 +#: actions/apistatusesupdate.php:149 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 #: 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 #: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 -#: lib/command.php:163 lib/command.php:311 lib/command.php:364 -#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/command.php:163 lib/command.php:302 lib/command.php:355 +#: lib/command.php:401 lib/command.php:462 lib/command.php:518 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/subs.php:34 lib/subs.php:125 msgid "No such user." msgstr "Käyttäjää ei ole." +#: actions/all.php:84 +#, fuzzy, php-format +msgid "%1$s and friends, page %2$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 +#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -111,7 +116,7 @@ msgstr "" msgid "You and friends" msgstr "Sinä ja kaverit" -#: actions/allrss.php:119 actions/apitimelinefriends.php:122 +#: actions/allrss.php:119 actions/apitimelinefriends.php:121 #: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" @@ -122,6 +127,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:155 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!" @@ -136,7 +158,7 @@ msgstr "API-metodia ei löytynyt!" #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:114 +#: actions/apistatusesupdate.php:119 msgid "This method requires a POST." msgstr "Tämä metodi edellyttää POST sanoman." @@ -167,8 +189,9 @@ msgstr "Ei voitu tallentaa profiilia." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257 -#: actions/designadminpanel.php:122 actions/newnotice.php:94 +#: actions/apistatusesupdate.php:132 actions/avatarsettings.php:257 +#: actions/designadminpanel.php:122 actions/editapplication.php:118 +#: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format msgid "" @@ -180,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 #, fuzzy msgid "Unable to save your design settings." msgstr "Twitter-asetuksia ei voitu tallentaa!" @@ -223,26 +249,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ä!" @@ -267,7 +273,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 @@ -275,7 +282,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 @@ -296,7 +304,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 @@ -333,7 +342,8 @@ msgstr "Tunnus on jo käytössä. Yritä toista tunnusta." msgid "Not a valid nickname." msgstr "Tuo ei ole kelvollinen tunnus." -#: actions/apigroupcreate.php:196 actions/editgroup.php:195 +#: actions/apigroupcreate.php:196 actions/editapplication.php:212 +#: actions/editgroup.php:195 actions/newapplication.php:200 #: actions/newgroup.php:139 actions/profilesettings.php:222 #: actions/register.php:217 msgid "Homepage is not a valid URL." @@ -345,7 +355,8 @@ msgstr "Kotisivun verkko-osoite ei ole toimiva." msgid "Full name is too long (max 255 chars)." msgstr "Koko nimi on liian pitkä (max 255 merkkiä)." -#: actions/apigroupcreate.php:213 +#: actions/apigroupcreate.php:213 actions/editapplication.php:187 +#: actions/newapplication.php:169 #, fuzzy, php-format msgid "Description is too long (max %d chars)." msgstr "kuvaus on liian pitkä (max 140 merkkiä)." @@ -385,7 +396,7 @@ msgstr "Alias ei voi olla sama kuin ryhmätunnus." msgid "Group not found!" msgstr "Ryhmää ei löytynyt!" -#: actions/apigroupjoin.php:110 lib/command.php:217 +#: 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." @@ -393,7 +404,7 @@ 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 lib/command.php:234 +#: actions/apigroupjoin.php:138 actions/joingroup.php:124 #, 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." @@ -402,7 +413,7 @@ msgstr "Käyttäjä %s ei voinut liittyä ryhmään %s." msgid "You are not a member of this group." msgstr "Sinä et kuulu tähän ryhmään." -#: actions/apigroupleave.php:124 actions/leavegroup.php:127 +#: actions/apigroupleave.php:124 actions/leavegroup.php:119 #, 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" @@ -422,6 +433,104 @@ msgstr "Käyttäjän %s ryhmät" msgid "groups on %s" msgstr "Ryhmän toiminnot" +#: actions/apioauthauthorize.php:108 actions/apioauthauthorize.php:114 +msgid "Bad request." +msgstr "" + +#: actions/apioauthauthorize.php:134 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:115 actions/makeadmin.php:66 +#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 +#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:139 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 +#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/subscribe.php:46 actions/tagother.php:166 +#: 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 "" +"Istuntosi avaimen kanssa oli ongelmia. Olisitko ystävällinen ja kokeilisit " +"uudelleen." + +#: actions/apioauthauthorize.php:146 +#, fuzzy +msgid "Invalid nickname / password!" +msgstr "Käyttäjätunnus tai salasana ei kelpaa." + +#: actions/apioauthauthorize.php:170 +#, fuzzy +msgid "DB error deleting OAuth app user." +msgstr "Virhe tapahtui käyttäjän asettamisessa." + +#: actions/apioauthauthorize.php:196 +#, fuzzy +msgid "DB error inserting OAuth app user." +msgstr "Tietokantavirhe tallennettaessa risutagiä: %s" + +#: actions/apioauthauthorize.php:231 +#, php-format +msgid "" +"The request token %s has been authorized. Please exchange it for an access " +"token." +msgstr "" + +#: actions/apioauthauthorize.php:241 +#, php-format +msgid "The request token %s has been denied." +msgstr "" + +#: actions/apioauthauthorize.php:246 actions/avatarsettings.php:281 +#: actions/designadminpanel.php:103 actions/editapplication.php:139 +#: actions/emailsettings.php:256 actions/grouplogo.php:319 +#: actions/imsettings.php:220 actions/newapplication.php:121 +#: actions/oauthconnectionssettings.php:151 actions/recoverpassword.php:44 +#: actions/smssettings.php:248 lib/designsettings.php:304 +msgid "Unexpected form submission." +msgstr "Odottamaton lomakkeen lähetys." + +#: actions/apioauthauthorize.php:273 +msgid "An application would like to connect to your account" +msgstr "" + +#: actions/apioauthauthorize.php:290 +msgid "Allow or deny access" +msgstr "" + +#: actions/apioauthauthorize.php:320 lib/action.php:435 +msgid "Account" +msgstr "Käyttäjätili" + +#: actions/apioauthauthorize.php:323 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/apioauthauthorize.php:326 actions/login.php:233 +#: actions/register.php:429 lib/accountsettingsaction.php:116 +msgid "Password" +msgstr "Salasana" + +#: actions/apioauthauthorize.php:338 +#, fuzzy +msgid "Deny" +msgstr "Ulkoasu" + +#: actions/apioauthauthorize.php:344 +#, fuzzy +msgid "Allow" +msgstr "Kaikki" + +#: actions/apioauthauthorize.php:361 +msgid "Allow or deny access to your account information." +msgstr "" + #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." msgstr "Tämä metodi edellyttää joko POST tai DELETE sanoman." @@ -435,12 +544,12 @@ msgstr "Et voi poistaa toisen käyttäjän päivitystä." msgid "No such notice." msgstr "Päivitystä ei ole." -#: actions/apistatusesretweet.php:83 lib/command.php:422 +#: actions/apistatusesretweet.php:83 #, fuzzy msgid "Cannot repeat your own notice." msgstr "Ilmoituksia ei voi pistää päälle." -#: actions/apistatusesretweet.php:91 lib/command.php:427 +#: actions/apistatusesretweet.php:91 #, fuzzy msgid "Already repeated that notice." msgstr "Poista tämä päivitys" @@ -453,17 +562,17 @@ msgstr "Päivitys poistettu." msgid "No status with that ID found." msgstr "Käyttäjätunnukselle ei löytynyt statusviestiä." -#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:162 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Päivitys on liian pitkä. Maksimipituus on %d merkkiä." -#: actions/apistatusesupdate.php:198 +#: actions/apistatusesupdate.php:203 msgid "Not found" msgstr "Ei löytynyt" -#: actions/apistatusesupdate.php:221 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:226 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "Maksimikoko päivitykselle on %d merkkiä, mukaan lukien URL-osoite." @@ -548,8 +657,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." @@ -572,8 +684,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" @@ -605,31 +717,6 @@ 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/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 -#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 -#: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 -#: actions/subscribe.php:46 actions/tagother.php:166 -#: 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 "" -"Istuntosi avaimen kanssa oli ongelmia. Olisitko ystävällinen ja kokeilisit " -"uudelleen." - -#: actions/avatarsettings.php:281 actions/designadminpanel.php:103 -#: actions/emailsettings.php:256 actions/grouplogo.php:319 -#: actions/imsettings.php:220 actions/recoverpassword.php:44 -#: actions/smssettings.php:248 lib/designsettings.php:304 -msgid "Unexpected form submission." -msgstr "Odottamaton lomakkeen lähetys." - #: actions/avatarsettings.php:328 msgid "Pick a square area of the image to be your avatar" msgstr "Valitse neliön muotoinen alue kuvasta profiilikuvaksi" @@ -689,18 +776,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:260 +msgid "No such group." msgstr "Tuota ryhmää ei ole." #: actions/blockedfromgroup.php:90 @@ -769,7 +852,8 @@ msgid "Couldn't delete email confirmation." msgstr "Ei voitu poistaa sähköpostivahvistusta." #: actions/confirmaddress.php:144 -msgid "Confirm Address" +#, fuzzy +msgid "Confirm address" msgstr "Vahvista osoite" #: actions/confirmaddress.php:159 @@ -824,12 +908,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ä." @@ -968,7 +1046,8 @@ msgstr "" #: actions/pathsadminpanel.php:324 actions/profilesettings.php:174 #: actions/siteadminpanel.php:388 actions/smssettings.php:181 #: actions/subscriptions.php:203 actions/tagother.php:154 -#: actions/useradminpanel.php:313 lib/designsettings.php:256 +#: actions/useradminpanel.php:313 lib/applicationeditform.php:335 +#: lib/applicationeditform.php:336 lib/designsettings.php:256 #: lib/groupeditform.php:202 msgid "Save" msgstr "Tallenna" @@ -989,6 +1068,87 @@ msgstr "Lisää suosikkeihin" msgid "No such document." msgstr "Dokumenttia ei ole." +#: actions/editapplication.php:54 lib/applicationeditform.php:136 +msgid "Edit application" +msgstr "" + +#: actions/editapplication.php:66 +#, fuzzy +msgid "You must be logged in to edit an application." +msgstr "" +"Sinun pitää olla kirjautunut sisään, jotta voit muuttaa ryhmän tietoja." + +#: actions/editapplication.php:77 actions/showapplication.php:94 +#, fuzzy +msgid "You are not the owner of this application." +msgstr "Sinä et kuulu tähän ryhmään." + +#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:163 +#: actions/showapplication.php:87 +#, fuzzy +msgid "No such application." +msgstr "Päivitystä ei ole." + +#: actions/editapplication.php:127 actions/newapplication.php:110 +#: actions/showapplication.php:118 lib/action.php:1167 +msgid "There was a problem with your session token." +msgstr "Istuntoavaimesi kanssa oli ongelma." + +#: actions/editapplication.php:161 +#, fuzzy +msgid "Use this form to edit your application." +msgstr "Käytä tätä lomaketta muokataksesi ryhmää." + +#: actions/editapplication.php:177 actions/newapplication.php:159 +#, fuzzy +msgid "Name is required." +msgstr "Sama kuin ylläoleva salasana. Pakollinen." + +#: actions/editapplication.php:180 actions/newapplication.php:162 +#, fuzzy +msgid "Name is too long (max 255 chars)." +msgstr "Koko nimi on liian pitkä (max 255 merkkiä)." + +#: actions/editapplication.php:183 actions/newapplication.php:165 +#, fuzzy +msgid "Description is required." +msgstr "Kuvaus" + +#: actions/editapplication.php:191 +msgid "Source URL is too long." +msgstr "" + +#: actions/editapplication.php:197 actions/newapplication.php:182 +#, fuzzy +msgid "Source URL is not valid." +msgstr "Kotisivun verkko-osoite ei ole toimiva." + +#: actions/editapplication.php:200 actions/newapplication.php:185 +msgid "Organization is required." +msgstr "" + +#: actions/editapplication.php:203 actions/newapplication.php:188 +#, fuzzy +msgid "Organization is too long (max 255 chars)." +msgstr "Kotipaikka on liian pitkä (max 255 merkkiä)." + +#: actions/editapplication.php:206 actions/newapplication.php:191 +msgid "Organization homepage is required." +msgstr "" + +#: actions/editapplication.php:215 actions/newapplication.php:203 +msgid "Callback is too long." +msgstr "" + +#: actions/editapplication.php:222 actions/newapplication.php:212 +msgid "Callback URL is not valid." +msgstr "" + +#: actions/editapplication.php:255 +#, fuzzy +msgid "Could not update application." +msgstr "Ei voitu päivittää ryhmää." + #: actions/editgroup.php:56 #, php-format msgid "Edit %s group" @@ -1000,7 +1160,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 @@ -1025,7 +1186,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 @@ -1058,13 +1220,15 @@ msgstr "" "lisäohjeita. " #: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 +#: actions/smssettings.php:126 lib/applicationeditform.php:333 +#: lib/applicationeditform.php:334 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\"" @@ -1139,9 +1303,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." @@ -1325,13 +1490,6 @@ 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:79 msgid "No such file." msgstr "Tiedostoa ei ole." @@ -1348,7 +1506,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." @@ -1394,8 +1552,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 @@ -1418,12 +1577,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." @@ -1438,6 +1591,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" @@ -1559,7 +1717,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 @@ -1590,7 +1749,8 @@ msgstr "" "ystävälistaasi?)" #: actions/imsettings.php:124 -msgid "IM Address" +#, fuzzy +msgid "IM address" msgstr "Pikaviestiosoite" #: actions/imsettings.php:126 @@ -1691,7 +1851,7 @@ 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 lib/command.php:315 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -1738,7 +1898,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:234 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236 msgid "Send" msgstr "Lähetä" @@ -1807,16 +1967,7 @@ 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 -msgid "You are already a member of that group" -msgstr "Sinä kuulut jo tähän ryhmään " - -#: 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 liittää ryhmään %s" - -#: actions/joingroup.php:135 lib/command.php:239 +#: actions/joingroup.php:131 #, fuzzy, php-format msgid "%1$s joined group %2$s" msgstr "%s liittyi ryhmään %s" @@ -1825,72 +1976,52 @@ msgstr "%s liittyi ryhmään %s" msgid "You must be logged in to leave a group." msgstr "Sinun pitää olla kirjautunut sisään, jotta voit erota ryhmästä." -#: actions/leavegroup.php:90 lib/command.php:268 +#: actions/leavegroup.php:90 lib/command.php:265 msgid "You are not a member of that group." msgstr "Sinä et kuulu tähän ryhmään." -#: actions/leavegroup.php:119 lib/command.php:278 -msgid "Could not find membership record." -msgstr "Ei löydetty käyttäjän jäsenyystietoja." - -#: actions/leavegroup.php:134 lib/command.php:289 +#: actions/leavegroup.php:127 #, 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:460 +#: 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 -#: lib/groupeditform.php:152 lib/userprofile.php:131 -msgid "Nickname" -msgstr "Tunnus" - -#: actions/login.php:253 actions/register.php:428 -#: 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." @@ -1898,7 +2029,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]" @@ -1919,18 +2050,41 @@ msgstr "%s on jo ryhmän \"%s\" ylläpitäjä." #: actions/makeadmin.php:132 #, fuzzy, php-format -msgid "Can't get membership record for %1$s in group %2$s" +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 #, fuzzy, php-format -msgid "Can't make %1$s an admin for group %2$s" +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 msgid "No current status" msgstr "Ei nykyistä tilatietoa" +#: actions/newapplication.php:52 +msgid "New application" +msgstr "" + +#: actions/newapplication.php:64 +#, fuzzy +msgid "You must be logged in to register an application." +msgstr "Sinun pitää olla kirjautunut sisään jotta voit luoda ryhmän." + +#: actions/newapplication.php:143 +#, fuzzy +msgid "Use this form to register a new application." +msgstr "Käytä tätä lomaketta luodaksesi ryhmän." + +#: actions/newapplication.php:173 +msgid "Source URL is required." +msgstr "" + +#: actions/newapplication.php:255 actions/newapplication.php:264 +#, fuzzy +msgid "Could not create application." +msgstr "Ei voitu lisätä aliasta." + #: actions/newgroup.php:53 msgid "New group" msgstr "Uusi ryhmä" @@ -1943,12 +2097,12 @@ msgstr "Käytä tätä lomaketta luodaksesi ryhmän." msgid "New message" msgstr "Uusi viesti" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 msgid "You can't send a message to this user." msgstr "Et voi lähettää viestiä tälle käyttäjälle." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:484 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 +#: lib/command.php:475 msgid "No content!" msgstr "Ei sisältöä!" @@ -1956,7 +2110,7 @@ msgstr "Ei sisältöä!" msgid "No recipient specified." msgstr "Vastaanottajaa ei ole määritelty." -#: actions/newmessage.php:164 lib/command.php:370 +#: actions/newmessage.php:164 lib/command.php:361 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "Älä lähetä viestiä itsellesi, vaan kuiskaa se vain hiljaa itsellesi." @@ -1966,8 +2120,8 @@ msgid "Message sent" msgstr "Viesti lähetetty" #: actions/newmessage.php:185 -#, php-format -msgid "Direct message to %s sent" +#, fuzzy, php-format +msgid "Direct message to %s sent." msgstr "Suora viesti käyttäjälle %s lähetetty" #: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 @@ -2041,6 +2195,52 @@ msgstr "Tönäisy lähetetty" msgid "Nudge sent!" msgstr "Tönäisy lähetetty!" +#: actions/oauthappssettings.php:59 +#, fuzzy +msgid "You must be logged in to list your applications." +msgstr "" +"Sinun pitää olla kirjautunut sisään, jotta voit muuttaa ryhmän tietoja." + +#: actions/oauthappssettings.php:74 +#, fuzzy +msgid "OAuth applications" +msgstr "Muita asetuksia" + +#: actions/oauthappssettings.php:85 +msgid "Applications you have registered" +msgstr "" + +#: actions/oauthappssettings.php:135 +#, php-format +msgid "You have not registered any applications yet." +msgstr "" + +#: actions/oauthconnectionssettings.php:71 +msgid "Connected applications" +msgstr "" + +#: actions/oauthconnectionssettings.php:87 +msgid "You have allowed the following applications to access you account." +msgstr "" + +#: actions/oauthconnectionssettings.php:170 +#, fuzzy +msgid "You are not a user of that application." +msgstr "Sinä et kuulu tähän ryhmään." + +#: actions/oauthconnectionssettings.php:180 +msgid "Unable to revoke access for app: " +msgstr "" + +#: actions/oauthconnectionssettings.php:192 +#, php-format +msgid "You have not authorized any applications to use your account." +msgstr "" + +#: actions/oauthconnectionssettings.php:205 +msgid "Developers can edit the registration settings for their applications " +msgstr "" + #: actions/oembed.php:79 actions/shownotice.php:100 msgid "Notice has no profile" msgstr "Päivitykselle ei ole profiilia" @@ -2059,8 +2259,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:1038 +#: lib/api.php:1066 lib/api.php:1176 msgid "Not a supported data format." msgstr "Tuo ei ole tuettu tietomuoto." @@ -2073,7 +2273,8 @@ msgid "Notice Search" msgstr "Etsi Päivityksistä" #: actions/othersettings.php:60 -msgid "Other Settings" +#, fuzzy +msgid "Other settings" msgstr "Muita Asetuksia" #: actions/othersettings.php:71 @@ -2105,6 +2306,31 @@ 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/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 msgid "Outbox for %s" @@ -2139,7 +2365,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" @@ -2311,8 +2537,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" @@ -2377,42 +2604,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 -#: lib/groupeditform.php:161 +#: actions/profilesettings.php:115 actions/register.php:453 +#: lib/applicationeditform.php:230 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\"" @@ -2716,7 +2943,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ä." @@ -2728,7 +2955,7 @@ msgstr "Virheellinen kutsukoodin." msgid "Registration successful" msgstr "Rekisteröityminen onnistui" -#: actions/register.php:114 actions/register.php:502 lib/action.php:457 +#: actions/register.php:114 actions/register.php:503 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Rekisteröidy" @@ -2741,64 +2968,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." @@ -2806,7 +3029,7 @@ msgstr "" "poislukien yksityinen tieto: salasana, sähköpostiosoite, IM-osoite, " "puhelinnumero." -#: actions/register.php:537 +#: actions/register.php:538 #, fuzzy, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -2839,7 +3062,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.)" @@ -2999,6 +3222,84 @@ 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/showapplication.php:82 +#, fuzzy +msgid "You must be logged in to view an application." +msgstr "Sinun pitää olla kirjautunut sisään, jotta voit erota ryhmästä." + +#: actions/showapplication.php:158 +#, fuzzy +msgid "Application profile" +msgstr "Päivitykselle ei ole profiilia" + +#: actions/showapplication.php:160 lib/applicationeditform.php:182 +msgid "Icon" +msgstr "" + +#: actions/showapplication.php:170 actions/version.php:195 +#: lib/applicationeditform.php:197 +#, fuzzy +msgid "Name" +msgstr "Tunnus" + +#: actions/showapplication.php:179 lib/applicationeditform.php:224 +#, fuzzy +msgid "Organization" +msgstr "Sivutus" + +#: actions/showapplication.php:188 actions/version.php:198 +#: lib/applicationeditform.php:211 lib/groupeditform.php:172 +msgid "Description" +msgstr "Kuvaus" + +#: actions/showapplication.php:193 actions/showgroup.php:429 +#: lib/profileaction.php:174 +msgid "Statistics" +msgstr "Tilastot" + +#: actions/showapplication.php:204 +#, php-format +msgid "created by %1$s - %2$s access by default - %3$d users" +msgstr "" + +#: actions/showapplication.php:214 +msgid "Application actions" +msgstr "" + +#: actions/showapplication.php:233 +msgid "Reset key & secret" +msgstr "" + +#: actions/showapplication.php:241 +msgid "Application info" +msgstr "" + +#: actions/showapplication.php:243 +msgid "Consumer key" +msgstr "" + +#: actions/showapplication.php:248 +msgid "Consumer secret" +msgstr "" + +#: actions/showapplication.php:253 +msgid "Request token URL" +msgstr "" + +#: actions/showapplication.php:258 +msgid "Access token URL" +msgstr "" + +#: actions/showapplication.php:263 +msgid "Authorize URL" +msgstr "" + +#: actions/showapplication.php:268 +msgid "" +"Note: We support HMAC-SHA1 signatures. We do not support the plaintext " +"signature method." +msgstr "" + #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "Ei saatu haettua suosikkipäivityksiä." @@ -3096,7 +3397,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ä)" @@ -3104,10 +3405,6 @@ msgstr "(Tyhjä)" msgid "All members" msgstr "Kaikki jäsenet" -#: actions/showgroup.php:429 lib/profileaction.php:174 -msgid "Statistics" -msgstr "Tilastot" - #: actions/showgroup.php:432 msgid "Created" msgstr "Luotu" @@ -3255,12 +3552,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 @@ -3451,7 +3748,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 @@ -3481,7 +3779,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 @@ -3734,10 +4033,6 @@ 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" @@ -3947,11 +4242,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" @@ -4029,11 +4319,6 @@ msgstr "" msgid "Plugins" msgstr "" -#: actions/version.php:195 -#, fuzzy -msgid "Name" -msgstr "Tunnus" - #: actions/version.php:196 lib/action.php:741 #, fuzzy msgid "Version" @@ -4043,27 +4328,43 @@ msgstr "Omat" msgid "Author(s)" msgstr "" -#: actions/version.php:198 lib/groupeditform.php:172 -msgid "Description" -msgstr "Kuvaus" - -#: classes/File.php:137 +#: 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/Group_member.php:41 +#, fuzzy +msgid "Group join failed." +msgstr "Ryhmän profiili" + +#: classes/Group_member.php:53 +#, fuzzy +msgid "Not part of group." +msgstr "Ei voitu päivittää ryhmää." + +#: classes/Group_member.php:60 +#, fuzzy +msgid "Group leave failed." +msgstr "Ryhmän profiili" + +#: 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." @@ -4077,28 +4378,28 @@ msgstr "Viestin tallennus ei onnistunut." msgid "Could not update message with new URI." msgstr "Viestin päivittäminen uudella URI-osoitteella ei onnistunut." -#: classes/Notice.php:172 +#: classes/Notice.php:171 #, php-format msgid "DB error inserting hashtag: %s" msgstr "Tietokantavirhe tallennettaessa risutagiä: %s" -#: classes/Notice.php:226 +#: classes/Notice.php:225 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Ongelma päivityksen tallentamisessa." -#: classes/Notice.php:230 +#: classes/Notice.php:229 msgid "Problem saving notice. Unknown user." msgstr "Virhe tapahtui päivityksen tallennuksessa. Tuntematon käyttäjä." -#: classes/Notice.php:235 +#: classes/Notice.php:234 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Liian monta päivitystä liian nopeasti; pidä pieni hengähdystauko ja jatka " "päivityksien lähettämista muutaman minuutin päästä." -#: classes/Notice.php:241 +#: classes/Notice.php:240 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4106,25 +4407,25 @@ msgstr "" "Liian monta päivitystä liian nopeasti; pidä pieni hengähdystauko ja jatka " "päivityksien lähettämista muutaman minuutin päästä." -#: classes/Notice.php:247 +#: classes/Notice.php:246 msgid "You are banned from posting notices on this site." msgstr "Päivityksesi tähän palveluun on estetty." -#: classes/Notice.php:309 classes/Notice.php:334 +#: classes/Notice.php:305 classes/Notice.php:330 msgid "Problem saving notice." msgstr "Ongelma päivityksen tallentamisessa." -#: classes/Notice.php:1034 +#: classes/Notice.php:1052 #, php-format msgid "DB error inserting reply: %s" msgstr "Tietokantavirhe tallennettaessa vastausta: %s" -#: classes/Notice.php:1359 +#: classes/Notice.php:1423 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" -#: classes/User.php:368 +#: classes/User.php:382 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Viesti käyttäjälle %1$s, %2$s" @@ -4166,6 +4467,11 @@ msgstr "Muut" msgid "Other options" msgstr "Muita asetuksia" +#: lib/action.php:144 +#, fuzzy, php-format +msgid "%1$s - %2$s" +msgstr "%1$s (%2$s)" + #: lib/action.php:159 msgid "Untitled page" msgstr "Nimetön sivu" @@ -4182,10 +4488,6 @@ msgstr "Koti" msgid "Personal profile and friends timeline" msgstr "Henkilökohtainen profiili ja kavereiden aikajana" -#: lib/action.php:435 -msgid "Account" -msgstr "Käyttäjätili" - #: lib/action.php:435 msgid "Change your email, avatar, password, profile" msgstr "Muuta sähköpostiosoitettasi, kuvaasi, salasanaasi, profiiliasi" @@ -4344,10 +4646,6 @@ msgstr "Myöhemmin" msgid "Before" msgstr "Aiemmin" -#: lib/action.php:1167 -msgid "There was a problem with your session token." -msgstr "Istuntoavaimesi kanssa oli ongelma." - #: lib/adminpanelaction.php:96 #, fuzzy msgid "You cannot make changes to this site." @@ -4388,6 +4686,72 @@ msgstr "SMS vahvistus" msgid "Paths configuration" msgstr "SMS vahvistus" +#: lib/applicationeditform.php:186 +msgid "Icon for this application" +msgstr "" + +#: lib/applicationeditform.php:206 +#, fuzzy, php-format +msgid "Describe your application in %d characters" +msgstr "Kuvaile ryhmää tai aihetta 140 merkillä" + +#: lib/applicationeditform.php:209 +#, fuzzy +msgid "Describe your application" +msgstr "Kuvaile ryhmää tai aihetta 140 merkillä" + +#: lib/applicationeditform.php:218 +#, fuzzy +msgid "Source URL" +msgstr "Lähdekoodi" + +#: lib/applicationeditform.php:220 +#, fuzzy +msgid "URL of the homepage of this application" +msgstr "Ryhmän tai aiheen kotisivun tai blogin osoite" + +#: lib/applicationeditform.php:226 +msgid "Organization responsible for this application" +msgstr "" + +#: lib/applicationeditform.php:232 +#, fuzzy +msgid "URL for the homepage of the organization" +msgstr "Ryhmän tai aiheen kotisivun tai blogin osoite" + +#: lib/applicationeditform.php:238 +msgid "URL to redirect to after authentication" +msgstr "" + +#: lib/applicationeditform.php:260 +msgid "Browser" +msgstr "" + +#: lib/applicationeditform.php:276 +msgid "Desktop" +msgstr "" + +#: lib/applicationeditform.php:277 +msgid "Type of application, browser or desktop" +msgstr "" + +#: lib/applicationeditform.php:299 +msgid "Read-only" +msgstr "" + +#: lib/applicationeditform.php:317 +msgid "Read-write" +msgstr "" + +#: lib/applicationeditform.php:318 +msgid "Default access for this application: read-only, or read-write" +msgstr "" + +#: lib/applicationlist.php:154 +#, fuzzy +msgid "Revoke" +msgstr "Poista" + #: lib/attachmentlist.php:87 msgid "Attachments" msgstr "" @@ -4409,12 +4773,12 @@ msgstr "" msgid "Tags for this attachment" msgstr "" -#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 +#: lib/authenticationplugin.php:214 lib/authenticationplugin.php:219 #, fuzzy msgid "Password changing failed" msgstr "Salasanan vaihto" -#: lib/authenticationplugin.php:197 +#: lib/authenticationplugin.php:229 #, fuzzy msgid "Password changing is not allowed" msgstr "Salasanan vaihto" @@ -4437,7 +4801,7 @@ msgstr "Valitettavasti tätä komentoa ei ole vielä toteutettu." #: lib/command.php:88 #, fuzzy, php-format -msgid "Could not find a user with nickname %s." +msgid "Could not find a user with nickname %s" msgstr "Ei voitu päivittää käyttäjälle vahvistettua sähköpostiosoitetta." #: lib/command.php:92 @@ -4446,7 +4810,7 @@ msgstr "" #: lib/command.php:99 #, fuzzy, php-format -msgid "Nudge sent to %s." +msgid "Nudge sent to %s" msgstr "Tönäisy lähetetty" #: lib/command.php:126 @@ -4457,173 +4821,194 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:399 lib/command.php:460 +#: lib/command.php:152 lib/command.php:390 lib/command.php:451 #, fuzzy -msgid "Notice with that id does not exist." +msgid "Notice with that id does not exist" msgstr "Ei profiilia tuolla id:llä." -#: lib/command.php:168 lib/command.php:415 lib/command.php:476 -#: lib/command.php:532 -#, fuzzy -msgid "User has no last notice." +#: lib/command.php:168 lib/command.php:406 lib/command.php:467 +#: lib/command.php:523 +msgid "User has no last notice" msgstr "Käyttäjällä ei ole viimeistä päivitystä" #: lib/command.php:190 msgid "Notice marked as fave." msgstr "Päivitys on merkitty suosikiksi." -#: lib/command.php:284 -#, fuzzy, php-format -msgid "Could not remove user %1$s to group %2$s." +#: lib/command.php:217 +msgid "You are already a member of that group" +msgstr "Sinä kuulut jo tähän ryhmään." + +#: lib/command.php:231 +#, 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:236 +#, php-format +msgid "%s joined group %s" +msgstr "%s liittyi ryhmään %s" + +#: lib/command.php:275 +#, 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:318 +#: lib/command.php:280 +#, php-format +msgid "%s left group %s" +msgstr "%s erosi ryhmästä %s" + +#: lib/command.php:309 #, php-format msgid "Fullname: %s" msgstr "Koko nimi: %s" -#: lib/command.php:321 +#: lib/command.php:312 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "Kotipaikka: %s" -#: lib/command.php:324 +#: lib/command.php:315 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "Kotisivu: %s" -#: lib/command.php:327 +#: lib/command.php:318 #, php-format msgid "About: %s" msgstr "Tietoa: %s" -#: lib/command.php:358 +#: lib/command.php:349 #, fuzzy, php-format -msgid "Message too long - maximum is %1$d characters, you sent %2$d." +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." +#: lib/command.php:367 +#, php-format +msgid "Direct message to %s sent" msgstr "Suora viesti käyttäjälle %s lähetetty" -#: lib/command.php:378 +#: lib/command.php:369 msgid "Error sending direct message." msgstr "Tapahtui virhe suoran viestin lähetyksessä." -#: lib/command.php:435 +#: lib/command.php:413 +#, fuzzy +msgid "Cannot repeat your own notice" +msgstr "Ilmoituksia ei voi pistää päälle." + +#: lib/command.php:418 +#, fuzzy +msgid "Already repeated that notice" +msgstr "Poista tämä päivitys" + +#: lib/command.php:426 #, fuzzy, php-format -msgid "Notice from %s repeated." +msgid "Notice from %s repeated" msgstr "Päivitys lähetetty" -#: lib/command.php:437 +#: lib/command.php:428 #, fuzzy msgid "Error repeating notice." msgstr "Ongelma päivityksen tallentamisessa." -#: lib/command.php:491 +#: lib/command.php:482 #, fuzzy, php-format -msgid "Notice too long - maximum is %1$d characters, you sent %2$d." +msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Viesti oli liian pitkä - maksimikoko on 140 merkkiä, lähetit %d" -#: lib/command.php:500 +#: lib/command.php:491 #, fuzzy, php-format -msgid "Reply to %s sent." +msgid "Reply to %s sent" msgstr "Vastaa tähän päivitykseen" -#: lib/command.php:502 +#: lib/command.php:493 #, fuzzy msgid "Error saving notice." msgstr "Ongelma päivityksen tallentamisessa." -#: lib/command.php:556 -#, fuzzy -msgid "Specify the name of the user to subscribe to." +#: lib/command.php:547 +msgid "Specify the name of the user to subscribe to" msgstr "Anna käyttäjätunnus, jonka päivitykset haluat tilata" -#: lib/command.php:563 +#: lib/command.php:554 #, php-format 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." +#: lib/command.php:575 +msgid "Specify the name of the user to unsubscribe from" msgstr "Anna käyttäjätunnus, jonka päivityksien tilauksen haluat lopettaa" -#: lib/command.php:591 +#: lib/command.php:582 #, php-format msgid "Unsubscribed from %s" msgstr "Käyttäjän %s päivitysten tilaus lopetettu" -#: lib/command.php:609 lib/command.php:632 +#: lib/command.php:600 lib/command.php:623 msgid "Command not yet implemented." msgstr "Komentoa ei ole vielä toteutettu." -#: lib/command.php:612 +#: lib/command.php:603 msgid "Notification off." msgstr "Ilmoitukset pois päältä." -#: lib/command.php:614 +#: lib/command.php:605 msgid "Can't turn off notification." msgstr "Ilmoituksia ei voi pistää pois päältä." -#: lib/command.php:635 +#: lib/command.php:626 msgid "Notification on." msgstr "Ilmoitukset päällä." -#: lib/command.php:637 +#: lib/command.php:628 msgid "Can't turn on notification." msgstr "Ilmoituksia ei voi pistää päälle." -#: lib/command.php:650 -msgid "Login command is disabled." +#: lib/command.php:641 +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:652 #, php-format -msgid "This link is useable only once, and is good for only 2 minutes: %s." +msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:685 +#: lib/command.php:668 #, 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:670 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:690 #, fuzzy msgid "No one is subscribed to you." msgstr "Toista ei voitu asettaa tilaamaan sinua." -#: lib/command.php:709 +#: lib/command.php:692 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:712 #, 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:714 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:728 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4664,20 +5049,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:199 +#: lib/common.php:131 #, fuzzy msgid "No configuration file found. " msgstr "Varmistuskoodia ei ole annettu." -#: lib/common.php:200 +#: lib/common.php:132 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:201 +#: lib/common.php:134 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:202 +#: lib/common.php:135 #, fuzzy msgid "Go to the installer." msgstr "Kirjaudu sisään palveluun" @@ -4694,6 +5079,15 @@ msgstr "Päivitykset pikaviestintä käyttäen (IM)" msgid "Updates by SMS" msgstr "Päivitykset SMS:llä" +#: lib/connectsettingsaction.php:120 +#, fuzzy +msgid "Connections" +msgstr "Yhdistä" + +#: lib/connectsettingsaction.php:121 +msgid "Authorized connected applications" +msgstr "" + #: lib/dberroraction.php:60 msgid "Database error" msgstr "Tietokantavirhe" @@ -4883,11 +5277,16 @@ msgstr "" msgid "kB" msgstr "" -#: lib/jabber.php:191 +#: lib/jabber.php:202 #, php-format msgid "[%s]" msgstr "" +#: lib/jabber.php:385 +#, php-format +msgid "Unknown inbox source %d." +msgstr "" + #: lib/joinform.php:114 msgid "Join" msgstr "Liity" @@ -4955,21 +5354,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" @@ -5167,7 +5554,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 @@ -5175,7 +5562,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 @@ -5185,7 +5573,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 @@ -5219,16 +5607,18 @@ msgstr "" #: lib/noticeform.php:212 #, fuzzy -msgid "Share my location." -msgstr "Tageja ei voitu tallentaa." - -#: lib/noticeform.php:214 -#, fuzzy -msgid "Do not share my location." +msgid "Share my location" msgstr "Tageja ei voitu tallentaa." #: lib/noticeform.php:215 -msgid "Hide this info" +#, fuzzy +msgid "Do not share my location" +msgstr "Tageja ei voitu tallentaa." + +#: lib/noticeform.php:216 +msgid "" +"Sorry, retrieving your geo location is taking longer than expected, please " +"try again later" msgstr "" #: lib/noticelist.php:428 @@ -5505,25 +5895,25 @@ msgstr "" msgid "User has blocked you." msgstr "Käyttäjä on asettanut eston sinulle." -#: lib/subs.php:60 +#: lib/subs.php:63 msgid "Could not subscribe." msgstr "Ei voitu tilata." -#: lib/subs.php:79 +#: lib/subs.php:82 msgid "Could not subscribe other to you." msgstr "Toista ei voitu asettaa tilaamaan sinua." -#: lib/subs.php:128 +#: lib/subs.php:137 #, fuzzy msgid "Not subscribed!" msgstr "Ei ole tilattu!." -#: lib/subs.php:133 +#: lib/subs.php:142 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "Ei voitu poistaa tilausta." -#: lib/subs.php:146 +#: lib/subs.php:158 msgid "Couldn't delete subscription." msgstr "Ei voitu poistaa tilausta." @@ -5537,10 +5927,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" @@ -5605,47 +5991,47 @@ msgstr "Viesti" msgid "Moderate" msgstr "" -#: lib/util.php:837 +#: lib/util.php:875 msgid "a few seconds ago" msgstr "muutama sekunti sitten" -#: lib/util.php:839 +#: lib/util.php:877 msgid "about a minute ago" msgstr "noin minuutti sitten" -#: lib/util.php:841 +#: lib/util.php:879 #, php-format msgid "about %d minutes ago" msgstr "noin %d minuuttia sitten" -#: lib/util.php:843 +#: lib/util.php:881 msgid "about an hour ago" msgstr "noin tunti sitten" -#: lib/util.php:845 +#: lib/util.php:883 #, php-format msgid "about %d hours ago" msgstr "noin %d tuntia sitten" -#: lib/util.php:847 +#: lib/util.php:885 msgid "about a day ago" msgstr "noin päivä sitten" -#: lib/util.php:849 +#: lib/util.php:887 #, php-format msgid "about %d days ago" msgstr "noin %d päivää sitten" -#: lib/util.php:851 +#: lib/util.php:889 msgid "about a month ago" msgstr "noin kuukausi sitten" -#: lib/util.php:853 +#: lib/util.php:891 #, php-format msgid "about %d months ago" msgstr "noin %d kuukautta sitten" -#: lib/util.php:855 +#: lib/util.php:893 msgid "about a year ago" msgstr "noin vuosi sitten" @@ -5661,5 +6047,5 @@ msgstr "" #: scripts/xmppdaemon.php:301 #, fuzzy, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "Viesti oli liian pitkä - maksimikoko on 140 merkkiä, lähetit %d" diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po index fa318ff2e0..44a0113294 100644 --- a/locale/fr/LC_MESSAGES/statusnet.po +++ b/locale/fr/LC_MESSAGES/statusnet.po @@ -1,6 +1,6 @@ # Translation of StatusNet to French # -# Author@translatewiki.net: Brion +# Author@translatewiki.net: Crochet.david # Author@translatewiki.net: IAlex # Author@translatewiki.net: Isoph # Author@translatewiki.net: Jean-Frédéric @@ -13,12 +13,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-10 00:46+0000\n" -"PO-Revision-Date: 2010-01-10 00:47:47+0000\n" +"POT-Creation-Date: 2010-01-15 19:15+0000\n" +"PO-Revision-Date: 2010-01-16 17:52:07+0000\n" "Language-Team: French\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60878); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r61138); 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" @@ -38,25 +38,30 @@ msgstr "Page non trouvée" #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 +#: actions/apistatusesupdate.php:149 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 #: 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 #: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 -#: lib/command.php:163 lib/command.php:311 lib/command.php:364 -#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/command.php:163 lib/command.php:302 lib/command.php:355 +#: lib/command.php:401 lib/command.php:462 lib/command.php:518 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/subs.php:34 lib/subs.php:125 msgid "No such user." msgstr "Utilisateur non trouvé." +#: actions/all.php:84 +#, fuzzy, php-format +msgid "%1$s and friends, page %2$d" +msgstr "%1$s profils bloqués, page %2$d" + #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 +#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -95,14 +100,14 @@ msgstr "" "(%%action.groups%%) ou de poster quelque chose vous-même." #: actions/all.php:134 -#, fuzzy, php-format +#, php-format msgid "" "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 @@ -117,7 +122,7 @@ msgstr "" msgid "You and friends" msgstr "Vous et vos amis" -#: actions/allrss.php:119 actions/apitimelinefriends.php:122 +#: actions/allrss.php:119 actions/apitimelinefriends.php:121 #: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" @@ -128,6 +133,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:155 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 !" @@ -141,7 +163,7 @@ msgstr "Méthode API non trouvée !" #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:114 +#: actions/apistatusesupdate.php:119 msgid "This method requires a POST." msgstr "Ce processus requiert un POST." @@ -172,21 +194,25 @@ msgstr "Impossible d’enregistrer le profil." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257 -#: actions/designadminpanel.php:122 actions/newnotice.php:94 +#: actions/apistatusesupdate.php:132 actions/avatarsettings.php:257 +#: actions/designadminpanel.php:122 actions/editapplication.php:118 +#: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format 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." @@ -215,37 +241,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!" @@ -272,16 +278,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." @@ -301,8 +307,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." @@ -336,7 +342,8 @@ msgstr "Pseudo déjà utilisé. Essayez-en un autre." msgid "Not a valid nickname." msgstr "Pseudo invalide." -#: actions/apigroupcreate.php:196 actions/editgroup.php:195 +#: actions/apigroupcreate.php:196 actions/editapplication.php:212 +#: actions/editgroup.php:195 actions/newapplication.php:200 #: actions/newgroup.php:139 actions/profilesettings.php:222 #: actions/register.php:217 msgid "Homepage is not a valid URL." @@ -348,7 +355,8 @@ msgstr "L’adresse du site personnel n’est pas un URL valide. " msgid "Full name is too long (max 255 chars)." msgstr "Nom complet trop long (maximum de 255 caractères)." -#: actions/apigroupcreate.php:213 +#: actions/apigroupcreate.php:213 actions/editapplication.php:187 +#: actions/newapplication.php:169 #, php-format msgid "Description is too long (max %d chars)." msgstr "La description est trop longue (%d caractères maximum)." @@ -388,7 +396,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 lib/command.php:217 +#: 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." @@ -396,19 +404,19 @@ 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 lib/command.php:234 -#, fuzzy, php-format +#: actions/apigroupjoin.php:138 actions/joingroup.php:124 +#, php-format msgid "Could not join user %1$s to group %2$s." -msgstr "Impossible de joindre l’utilisateur %s au groupe %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/leavegroup.php:127 -#, fuzzy, php-format +#: actions/apigroupleave.php:124 actions/leavegroup.php:119 +#, php-format msgid "Could not remove user %1$s from group %2$s." -msgstr "Impossible de retirer l’utilisateur %s du groupe %s" +msgstr "Impossible de retirer l’utilisateur %1$s du groupe %2$s." #: actions/apigrouplist.php:95 #, php-format @@ -425,6 +433,102 @@ msgstr "Groupes de %s" msgid "groups on %s" msgstr "groupes sur %s" +#: actions/apioauthauthorize.php:108 actions/apioauthauthorize.php:114 +msgid "Bad request." +msgstr "" + +#: actions/apioauthauthorize.php:134 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:115 actions/makeadmin.php:66 +#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 +#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:139 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 +#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/subscribe.php:46 actions/tagother.php:166 +#: 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 "" +"Un problème est survenu avec votre jeton de session. Veuillez essayer à " +"nouveau." + +#: actions/apioauthauthorize.php:146 +#, fuzzy +msgid "Invalid nickname / password!" +msgstr "Identifiant ou mot de passe incorrect." + +#: actions/apioauthauthorize.php:170 +#, fuzzy +msgid "DB error deleting OAuth app user." +msgstr "Erreur lors de la configuration de l’utilisateur." + +#: actions/apioauthauthorize.php:196 +#, fuzzy +msgid "DB error inserting OAuth app user." +msgstr "Erreur de base de donnée en insérant la marque (hashtag) : %s" + +#: actions/apioauthauthorize.php:231 +#, php-format +msgid "" +"The request token %s has been authorized. Please exchange it for an access " +"token." +msgstr "" + +#: actions/apioauthauthorize.php:241 +#, php-format +msgid "The request token %s has been denied." +msgstr "" + +#: actions/apioauthauthorize.php:246 actions/avatarsettings.php:281 +#: actions/designadminpanel.php:103 actions/editapplication.php:139 +#: actions/emailsettings.php:256 actions/grouplogo.php:319 +#: actions/imsettings.php:220 actions/newapplication.php:121 +#: actions/oauthconnectionssettings.php:151 actions/recoverpassword.php:44 +#: actions/smssettings.php:248 lib/designsettings.php:304 +msgid "Unexpected form submission." +msgstr "Soumission de formulaire inattendue." + +#: actions/apioauthauthorize.php:273 +msgid "An application would like to connect to your account" +msgstr "" + +#: actions/apioauthauthorize.php:290 +msgid "Allow or deny access" +msgstr "" + +#: actions/apioauthauthorize.php:320 lib/action.php:435 +msgid "Account" +msgstr "Compte" + +#: actions/apioauthauthorize.php:323 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/apioauthauthorize.php:326 actions/login.php:233 +#: actions/register.php:429 lib/accountsettingsaction.php:116 +msgid "Password" +msgstr "Mot de passe" + +#: actions/apioauthauthorize.php:338 +msgid "Deny" +msgstr "Refuser" + +#: actions/apioauthauthorize.php:344 +msgid "Allow" +msgstr "Autoriser" + +#: actions/apioauthauthorize.php:361 +msgid "Allow or deny access to your account information." +msgstr "" + #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." msgstr "Ce processus requiert un POST ou un DELETE." @@ -438,11 +542,11 @@ msgstr "Vous ne pouvez pas supprimer le statut d’un autre utilisateur." msgid "No such notice." msgstr "Avis non trouvé." -#: actions/apistatusesretweet.php:83 lib/command.php:422 +#: actions/apistatusesretweet.php:83 msgid "Cannot repeat your own notice." msgstr "Vous ne pouvez pas reprendre votre propre avis." -#: actions/apistatusesretweet.php:91 lib/command.php:427 +#: actions/apistatusesretweet.php:91 msgid "Already repeated that notice." msgstr "Vous avez déjà repris cet avis." @@ -454,17 +558,17 @@ msgstr "Statut supprimé." msgid "No status with that ID found." msgstr "Aucun statut trouvé avec cet identifiant." -#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:162 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "C’est trop long ! La taille maximale de l’avis est de %d caractères." -#: actions/apistatusesupdate.php:198 +#: actions/apistatusesupdate.php:203 msgid "Not found" msgstr "Non trouvé" -#: actions/apistatusesupdate.php:221 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:226 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -476,14 +580,14 @@ msgid "Unsupported format." msgstr "Format non supporté." #: actions/apitimelinefavorites.php:108 -#, fuzzy, php-format +#, php-format msgid "%1$s / Favorites from %2$s" -msgstr "%s / Favoris de %s" +msgstr "%1$s / Favoris de %2$s" #: actions/apitimelinefavorites.php:120 -#, fuzzy, php-format +#, php-format msgid "%1$s updates favorited by %2$s / %2$s." -msgstr "%s statuts ont été ajoutés aux favoris de %s / %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 @@ -550,8 +654,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." @@ -576,8 +683,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" @@ -609,31 +716,6 @@ 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/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 -#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 -#: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 -#: actions/subscribe.php:46 actions/tagother.php:166 -#: 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 "" -"Un problème est survenu avec votre jeton de session. Veuillez essayer à " -"nouveau." - -#: actions/avatarsettings.php:281 actions/designadminpanel.php:103 -#: actions/emailsettings.php:256 actions/grouplogo.php:319 -#: actions/imsettings.php:220 actions/recoverpassword.php:44 -#: actions/smssettings.php:248 lib/designsettings.php:304 -msgid "Unexpected form submission." -msgstr "Soumission de formulaire inattendue." - #: actions/avatarsettings.php:328 msgid "Pick a square area of the image to be your avatar" msgstr "Sélectionnez une zone de forme carrée pour définir votre avatar" @@ -695,19 +777,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:260 +msgid "No such group." +msgstr "Aucun groupe trouvé." #: actions/blockedfromgroup.php:90 #, php-format @@ -715,9 +793,9 @@ msgid "%s blocked profiles" msgstr "%s profils bloqués" #: actions/blockedfromgroup.php:93 -#, fuzzy, php-format +#, php-format msgid "%1$s blocked profiles, page %2$d" -msgstr "%s profils bloqués, page %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." @@ -725,7 +803,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" @@ -774,7 +852,8 @@ msgid "Couldn't delete email confirmation." msgstr "Impossible de supprimer le courriel de confirmation." #: actions/confirmaddress.php:144 -msgid "Confirm Address" +#, fuzzy +msgid "Confirm address" msgstr "Confirmer l’adresse" #: actions/confirmaddress.php:159 @@ -829,12 +908,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." @@ -968,7 +1041,8 @@ msgstr "Revenir aux valeurs par défaut" #: actions/pathsadminpanel.php:324 actions/profilesettings.php:174 #: actions/siteadminpanel.php:388 actions/smssettings.php:181 #: actions/subscriptions.php:203 actions/tagother.php:154 -#: actions/useradminpanel.php:313 lib/designsettings.php:256 +#: actions/useradminpanel.php:313 lib/applicationeditform.php:335 +#: lib/applicationeditform.php:336 lib/designsettings.php:256 #: lib/groupeditform.php:202 msgid "Save" msgstr "Enregistrer" @@ -989,6 +1063,87 @@ msgstr "Ajouter aux favoris" msgid "No such document." msgstr "Document non trouvé." +#: actions/editapplication.php:54 lib/applicationeditform.php:136 +msgid "Edit application" +msgstr "" + +#: actions/editapplication.php:66 +#, fuzzy +msgid "You must be logged in to edit an application." +msgstr "Vous devez ouvrir une session pour modifier un groupe." + +#: actions/editapplication.php:77 actions/showapplication.php:94 +#, fuzzy +msgid "You are not the owner of this application." +msgstr "Vous n'êtes pas membre de ce groupe." + +#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:163 +#: actions/showapplication.php:87 +#, fuzzy +msgid "No such application." +msgstr "Avis non trouvé." + +#: actions/editapplication.php:127 actions/newapplication.php:110 +#: actions/showapplication.php:118 lib/action.php:1167 +msgid "There was a problem with your session token." +msgstr "Un problème est survenu avec votre jeton de session." + +#: actions/editapplication.php:161 +#, fuzzy +msgid "Use this form to edit your application." +msgstr "Remplissez ce formulaire pour modifier les options du groupe." + +#: actions/editapplication.php:177 actions/newapplication.php:159 +#, fuzzy +msgid "Name is required." +msgstr "Identique au mot de passe ci-dessus. Requis." + +#: actions/editapplication.php:180 actions/newapplication.php:162 +#, fuzzy +msgid "Name is too long (max 255 chars)." +msgstr "Nom complet trop long (maximum de 255 caractères)." + +#: actions/editapplication.php:183 actions/newapplication.php:165 +#, fuzzy +msgid "Description is required." +msgstr "Description" + +#: actions/editapplication.php:191 +msgid "Source URL is too long." +msgstr "" + +#: actions/editapplication.php:197 actions/newapplication.php:182 +#, fuzzy +msgid "Source URL is not valid." +msgstr "L’URL de l’avatar ‘%s’ n’est pas valide." + +#: actions/editapplication.php:200 actions/newapplication.php:185 +msgid "Organization is required." +msgstr "" + +#: actions/editapplication.php:203 actions/newapplication.php:188 +#, fuzzy +msgid "Organization is too long (max 255 chars)." +msgstr "Emplacement trop long (maximum de 255 caractères)." + +#: actions/editapplication.php:206 actions/newapplication.php:191 +msgid "Organization homepage is required." +msgstr "" + +#: actions/editapplication.php:215 actions/newapplication.php:203 +msgid "Callback is too long." +msgstr "" + +#: actions/editapplication.php:222 actions/newapplication.php:212 +#, fuzzy +msgid "Callback URL is not valid." +msgstr "L’URL de l’avatar ‘%s’ n’est pas valide." + +#: actions/editapplication.php:255 +#, fuzzy +msgid "Could not update application." +msgstr "Impossible de mettre à jour le groupe." + #: actions/editgroup.php:56 #, php-format msgid "Edit %s group" @@ -1000,8 +1155,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." @@ -1025,7 +1180,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 @@ -1057,13 +1212,14 @@ msgstr "" "réception (et celle de spam !) pour recevoir de nouvelles instructions." #: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 +#: actions/smssettings.php:126 lib/applicationeditform.php:333 +#: lib/applicationeditform.php:334 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\"" @@ -1138,9 +1294,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." @@ -1188,7 +1345,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 @@ -1201,7 +1358,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!" @@ -1272,11 +1429,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." @@ -1322,13 +1479,6 @@ 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:79 msgid "No such file." msgstr "Fichier non trouvé." @@ -1345,7 +1495,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." @@ -1371,14 +1521,14 @@ msgid "Block user from group" msgstr "Bloquer cet utilisateur du groupe" #: actions/groupblock.php:162 -#, fuzzy, php-format +#, php-format msgid "" "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " "will be removed from the group, unable to post, and unable to subscribe to " "the group in the future." msgstr "" -"Ê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 @@ -1394,9 +1544,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." @@ -1419,12 +1569,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." @@ -1441,6 +1585,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." @@ -1459,9 +1607,9 @@ msgid "%s group members" msgstr "Membres du groupe %s" #: actions/groupmembers.php:96 -#, fuzzy, php-format +#, php-format msgid "%1$s group members, page %2$d" -msgstr "Membres du groupe %s - page %d" +msgstr "Membres du groupe %1$s - page %2$d" #: actions/groupmembers.php:111 msgid "A list of the users in this group." @@ -1572,7 +1720,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 @@ -1604,7 +1752,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 @@ -1613,7 +1761,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." @@ -1707,7 +1855,7 @@ 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 lib/command.php:315 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -1753,7 +1901,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:234 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236 msgid "Send" msgstr "Envoyer" @@ -1825,90 +1973,62 @@ 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 -msgid "You are already a member of that group" -msgstr "Vous êtes déjà membre de ce groupe" - -#: actions/joingroup.php:128 -#, fuzzy, php-format -msgid "Could not join user %1$s to group %2$s" -msgstr "Impossible d’inscrire l’utilisateur %s au groupe %s" - -#: actions/joingroup.php:135 lib/command.php:239 -#, fuzzy, php-format +#: actions/joingroup.php:131 +#, php-format msgid "%1$s joined group %2$s" -msgstr "%s a rejoint le groupe %s" +msgstr "%1$s a rejoint le groupe %2$s" #: actions/leavegroup.php:60 msgid "You must be logged in to leave a group." msgstr "Vous devez ouvrir une session pour quitter un groupe." -#: actions/leavegroup.php:90 lib/command.php:268 +#: actions/leavegroup.php:90 lib/command.php:265 msgid "You are not a member of that group." msgstr "Vous n'êtes pas membre de ce groupe." -#: actions/leavegroup.php:119 lib/command.php:278 -msgid "Could not find membership record." -msgstr "Aucun enregistrement à ce groupe n’a été trouvé." - -#: actions/leavegroup.php:134 lib/command.php:289 -#, fuzzy, php-format +#: actions/leavegroup.php:127 +#, php-format msgid "%1$s left group %2$s" -msgstr "%s a quitté le groupe %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:460 +#: 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 -#: lib/groupeditform.php:152 lib/userprofile.php:131 -msgid "Nickname" -msgstr "Pseudo" - -#: actions/login.php:253 actions/register.php:428 -#: 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." @@ -1916,14 +2036,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 @@ -1932,26 +2052,49 @@ msgstr "" "Seul un administrateur peut faire d’un autre utilisateur un administrateur." #: actions/makeadmin.php:95 -#, fuzzy, php-format +#, php-format msgid "%1$s is already an admin for group \"%2$s\"." -msgstr "%s est déjà un administrateur du groupe « %s »." +msgstr "%1$s est déjà administrateur du groupe « %2$s »." #: actions/makeadmin.php:132 -#, fuzzy, php-format -msgid "Can't get membership record for %1$s in group %2$s" +#, php-format +msgid "Can't get membership record for %1$s in group %2$s." msgstr "" -"Impossible d'avoir les enregistrements d'appartenance pour %s dans le groupe " -"%s" +"Impossible d’obtenir les enregistrements d’appartenance pour %1$s dans le " +"groupe %2$s." #: actions/makeadmin.php:145 -#, fuzzy, php-format -msgid "Can't make %1$s an admin for group %2$s" -msgstr "Impossible de faire %s un administrateur du groupe %s" +#, php-format +msgid "Can't make %1$s an admin for group %2$s." +msgstr "Impossible de rendre %1$s administrateur du groupe %2$s." #: actions/microsummary.php:69 msgid "No current status" msgstr "Aucun statut actuel" +#: actions/newapplication.php:52 +msgid "New application" +msgstr "" + +#: actions/newapplication.php:64 +#, fuzzy +msgid "You must be logged in to register an application." +msgstr "Vous devez ouvrir une session pour créer un groupe." + +#: actions/newapplication.php:143 +#, fuzzy +msgid "Use this form to register a new application." +msgstr "Remplissez les champs ci-dessous pour créer un nouveau groupe :" + +#: actions/newapplication.php:173 +msgid "Source URL is required." +msgstr "" + +#: actions/newapplication.php:255 actions/newapplication.php:264 +#, fuzzy +msgid "Could not create application." +msgstr "Impossible de créer les alias." + #: actions/newgroup.php:53 msgid "New group" msgstr "Nouveau groupe" @@ -1964,12 +2107,12 @@ msgstr "Remplissez les champs ci-dessous pour créer un nouveau groupe :" msgid "New message" msgstr "Nouveau message" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 msgid "You can't send a message to this user." msgstr "Vous ne pouvez pas envoyer de messages à cet utilisateur." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:484 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 +#: lib/command.php:475 msgid "No content!" msgstr "Aucun contenu !" @@ -1977,7 +2120,7 @@ msgstr "Aucun contenu !" msgid "No recipient specified." msgstr "Aucun destinataire n’a été spécifié." -#: actions/newmessage.php:164 lib/command.php:370 +#: actions/newmessage.php:164 lib/command.php:361 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -1989,8 +2132,8 @@ msgstr "Message envoyé" #: 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" @@ -2018,9 +2161,9 @@ msgid "Text search" msgstr "Recherche de texte" #: actions/noticesearch.php:91 -#, fuzzy, php-format +#, php-format msgid "Search results for \"%1$s\" on %2$s" -msgstr "Résultat de la recherche pour « %s » sur %s" +msgstr "Résultats de la recherche pour « %1$s » sur %2$s" #: actions/noticesearch.php:121 #, php-format @@ -2056,7 +2199,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" @@ -2066,6 +2209,51 @@ msgstr "Clin d’œil envoyé" msgid "Nudge sent!" msgstr "Clin d’œil envoyé !" +#: actions/oauthappssettings.php:59 +#, fuzzy +msgid "You must be logged in to list your applications." +msgstr "Vous devez ouvrir une session pour modifier un groupe." + +#: actions/oauthappssettings.php:74 +#, fuzzy +msgid "OAuth applications" +msgstr "Autres options " + +#: actions/oauthappssettings.php:85 +msgid "Applications you have registered" +msgstr "" + +#: actions/oauthappssettings.php:135 +#, php-format +msgid "You have not registered any applications yet." +msgstr "" + +#: actions/oauthconnectionssettings.php:71 +msgid "Connected applications" +msgstr "" + +#: actions/oauthconnectionssettings.php:87 +msgid "You have allowed the following applications to access you account." +msgstr "" + +#: actions/oauthconnectionssettings.php:170 +#, fuzzy +msgid "You are not a user of that application." +msgstr "Vous n'êtes pas membre de ce groupe." + +#: actions/oauthconnectionssettings.php:180 +msgid "Unable to revoke access for app: " +msgstr "" + +#: actions/oauthconnectionssettings.php:192 +#, php-format +msgid "You have not authorized any applications to use your account." +msgstr "" + +#: actions/oauthconnectionssettings.php:205 +msgid "Developers can edit the registration settings for their applications " +msgstr "" + #: actions/oembed.php:79 actions/shownotice.php:100 msgid "Notice has no profile" msgstr "L’avis n’a pas de profil" @@ -2083,8 +2271,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:1038 +#: lib/api.php:1066 lib/api.php:1176 msgid "Not a supported data format." msgstr "Format de données non supporté." @@ -2097,7 +2285,8 @@ msgid "Notice Search" msgstr "Recherche d’avis" #: actions/othersettings.php:60 -msgid "Other Settings" +#, fuzzy +msgid "Other settings" msgstr "Autres paramètres" #: actions/othersettings.php:71 @@ -2128,6 +2317,26 @@ 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/otp.php:69 +msgid "No user ID specified." +msgstr "Aucun identifiant d'utilisateur n’a été spécifié." + +#: actions/otp.php:83 +msgid "No login token specified." +msgstr "Aucun jeton d'identification n’a été spécifié." + +#: actions/otp.php:90 +msgid "No login token requested." +msgstr "Aucune jeton d'identification requis." + +#: actions/otp.php:95 +msgid "Invalid login token specified." +msgstr "Jeton d'identification invalide." + +#: actions/otp.php:104 +msgid "Login token expired." +msgstr "Jeton d'identification périmé." + #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" @@ -2163,7 +2372,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" @@ -2274,7 +2483,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" @@ -2325,7 +2534,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 @@ -2334,8 +2543,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 @@ -2357,19 +2565,20 @@ msgid "Not a valid people tag: %s" msgstr "Cette marque est invalide : %s" #: actions/peopletag.php:144 -#, fuzzy, php-format +#, php-format msgid "Users self-tagged with %1$s - page %2$d" -msgstr "Utilisateurs marqués par eux-mêmes %s - page %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 -#, fuzzy, php-format +#, php-format 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" @@ -2390,42 +2599,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 -#: lib/groupeditform.php:161 +#: actions/profilesettings.php:115 actions/register.php:453 +#: lib/applicationeditform.php:230 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 »" @@ -2543,7 +2752,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 @@ -2595,7 +2804,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!" @@ -2742,7 +2951,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." @@ -2754,7 +2963,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:457 +#: actions/register.php:114 actions/register.php:503 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Créer un compte" @@ -2767,19 +2976,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. " @@ -2787,43 +2992,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." @@ -2831,8 +3036,8 @@ 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 -#, fuzzy, php-format +#: actions/register.php:538 +#, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " "want to...\n" @@ -2849,23 +3054,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.)" @@ -2977,13 +3182,13 @@ msgid "Replies feed for %s (Atom)" msgstr "Flux des réponses pour %s (Atom)" #: actions/replies.php:198 -#, fuzzy, php-format +#, php-format msgid "" "This is the timeline showing replies to %1$s but %2$s hasn't received a " "notice to his attention yet." msgstr "" -"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 @@ -2996,13 +3201,14 @@ msgstr "" "%)." #: actions/replies.php:205 -#, fuzzy, php-format +#, php-format msgid "" "You can try to [nudge %1$s](../%2$s) or [post something to his or her " "attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" -"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 @@ -3016,7 +3222,85 @@ msgstr "" #: actions/sandbox.php:72 msgid "User is already sandboxed." -msgstr "L'utilisateur est déjà dans le bac à sable." +msgstr "L’utilisateur est déjà dans le bac à sable." + +#: actions/showapplication.php:82 +#, fuzzy +msgid "You must be logged in to view an application." +msgstr "Vous devez ouvrir une session pour quitter un groupe." + +#: actions/showapplication.php:158 +#, fuzzy +msgid "Application profile" +msgstr "L’avis n’a pas de profil" + +#: actions/showapplication.php:160 lib/applicationeditform.php:182 +msgid "Icon" +msgstr "" + +#: actions/showapplication.php:170 actions/version.php:195 +#: lib/applicationeditform.php:197 +msgid "Name" +msgstr "Nom" + +#: actions/showapplication.php:179 lib/applicationeditform.php:224 +#, fuzzy +msgid "Organization" +msgstr "Pagination" + +#: actions/showapplication.php:188 actions/version.php:198 +#: lib/applicationeditform.php:211 lib/groupeditform.php:172 +msgid "Description" +msgstr "Description" + +#: actions/showapplication.php:193 actions/showgroup.php:429 +#: lib/profileaction.php:174 +msgid "Statistics" +msgstr "Statistiques" + +#: actions/showapplication.php:204 +#, php-format +msgid "created by %1$s - %2$s access by default - %3$d users" +msgstr "" + +#: actions/showapplication.php:214 +msgid "Application actions" +msgstr "" + +#: actions/showapplication.php:233 +msgid "Reset key & secret" +msgstr "" + +#: actions/showapplication.php:241 +msgid "Application info" +msgstr "" + +#: actions/showapplication.php:243 +msgid "Consumer key" +msgstr "" + +#: actions/showapplication.php:248 +msgid "Consumer secret" +msgstr "" + +#: actions/showapplication.php:253 +msgid "Request token URL" +msgstr "" + +#: actions/showapplication.php:258 +msgid "Access token URL" +msgstr "" + +#: actions/showapplication.php:263 +#, fuzzy +msgid "Authorize URL" +msgstr "Auteur" + +#: actions/showapplication.php:268 +msgid "" +"Note: We support HMAC-SHA1 signatures. We do not support the plaintext " +"signature method." +msgstr "" #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." @@ -3123,7 +3407,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)" @@ -3131,10 +3415,6 @@ msgstr "(aucun)" msgid "All members" msgstr "Tous les membres" -#: actions/showgroup.php:429 lib/profileaction.php:174 -msgid "Statistics" -msgstr "Statistiques" - #: actions/showgroup.php:432 msgid "Created" msgstr "Créé" @@ -3148,7 +3428,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](%%%%" @@ -3202,9 +3482,9 @@ msgid " tagged %s" msgstr " marqué %s" #: actions/showstream.php:122 -#, fuzzy, php-format +#, php-format msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" -msgstr "Fil des avis pour %s marqués %s (RSS 1.0)" +msgstr "Fil des avis pour %1$s marqués %2$s (RSS 1.0)" #: actions/showstream.php:129 #, php-format @@ -3227,9 +3507,10 @@ msgid "FOAF for %s" msgstr "ami d’un ami pour %s" #: actions/showstream.php:191 -#, fuzzy, php-format +#, php-format msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet." -msgstr "C’est le flux de %s mais %s n’a rien publié pour le moment." +msgstr "" +"Ceci est la chronologie de %1$s mais %2$s n’a rien publié pour le moment." #: actions/showstream.php:196 msgid "" @@ -3240,13 +3521,13 @@ msgstr "" "d’avis pour le moment, vous pourriez commencer maintenant :)" #: actions/showstream.php:198 -#, fuzzy, php-format +#, php-format msgid "" "You can try to nudge %1$s or [post something to his or her attention](%%%%" "action.newnotice%%%%?status_textarea=%2$s)." msgstr "" -"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 @@ -3295,21 +3576,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." @@ -3321,7 +3602,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" @@ -3381,7 +3662,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" @@ -3409,7 +3690,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" @@ -3482,7 +3763,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 @@ -3513,8 +3794,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" @@ -3606,9 +3887,9 @@ msgid "%s subscribers" msgstr "Abonnés à %s" #: actions/subscribers.php:52 -#, fuzzy, php-format +#, php-format msgid "%1$s subscribers, page %2$d" -msgstr "Abonnés à %s - page &d" +msgstr "Abonnés à %1$s - page %2$d" #: actions/subscribers.php:63 msgid "These are the people who listen to your notices." @@ -3647,9 +3928,9 @@ msgid "%s subscriptions" msgstr "Abonnements de %s" #: actions/subscriptions.php:54 -#, fuzzy, php-format +#, php-format msgid "%1$s subscriptions, page %2$d" -msgstr "Abonnements de %s - page %d" +msgstr "Abonnements de %1$s - page %2$d" #: actions/subscriptions.php:65 msgid "These are the people whose notices you listen to." @@ -3706,7 +3987,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 @@ -3759,35 +4040,31 @@ 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 -#, fuzzy, php-format +#, php-format 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:321 #: lib/personalgroupnav.php:115 @@ -3809,7 +4086,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 @@ -3822,7 +4099,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" @@ -3856,7 +4133,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" @@ -3868,7 +4145,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" @@ -3946,9 +4223,9 @@ msgstr "" "l’abonnement." #: actions/userauthorization.php:296 -#, fuzzy, php-format +#, php-format msgid "Listener URI ‘%s’ not found here." -msgstr "L’URI de l’auditeur ‘%s’ n’a pas été trouvée" +msgstr "L’URI de l’auditeur ‘%s’ n’a pas été trouvée ici." #: actions/userauthorization.php:301 #, php-format @@ -3981,10 +4258,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" @@ -4018,9 +4291,9 @@ msgstr "" "inscrire." #: actions/version.php:73 -#, fuzzy, php-format +#, php-format msgid "StatusNet %s" -msgstr "Statistiques" +msgstr "StatusNet %s" #: actions/version.php:153 #, php-format @@ -4028,15 +4301,16 @@ 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 -#, fuzzy msgid "StatusNet" -msgstr "Statut supprimé." +msgstr "StatusNet" #: actions/version.php:161 msgid "Contributors" -msgstr "" +msgstr "Contributeurs" #: actions/version.php:168 msgid "" @@ -4045,6 +4319,10 @@ msgid "" "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 "" @@ -4053,6 +4331,10 @@ msgid "" "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 @@ -4060,31 +4342,22 @@ 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 "" - -#: actions/version.php:195 -#, fuzzy -msgid "Name" -msgstr "Pseudo" +msgstr "Extensions" #: actions/version.php:196 lib/action.php:741 -#, fuzzy msgid "Version" -msgstr "Sessions" +msgstr "Version" #: actions/version.php:197 -#, fuzzy msgid "Author(s)" -msgstr "Auteur" +msgstr "Auteur(s)" -#: actions/version.php:198 lib/groupeditform.php:172 -msgid "Description" -msgstr "Description" - -#: classes/File.php:137 +#: classes/File.php:144 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " @@ -4093,19 +4366,36 @@ 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/Group_member.php:41 +msgid "Group join failed." +msgstr "L'inscription au groupe a échoué." + +#: classes/Group_member.php:53 +msgid "Not part of group." +msgstr "N'appartient pas au groupe." + +#: classes/Group_member.php:60 +msgid "Group leave failed." +msgstr "La désinscription du groupe a échoué." + +#: classes/Login_token.php:76 +#, 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." @@ -4115,27 +4405,27 @@ msgstr "Impossible d’insérer le message." msgid "Could not update message with new URI." msgstr "Impossible de mettre à jour le message avec un nouvel URI." -#: classes/Notice.php:172 +#: classes/Notice.php:171 #, php-format msgid "DB error inserting hashtag: %s" msgstr "Erreur de base de donnée en insérant la marque (hashtag) : %s" -#: classes/Notice.php:226 +#: classes/Notice.php:225 msgid "Problem saving notice. Too long." msgstr "Problème lors de l’enregistrement de l’avis ; trop long." -#: classes/Notice.php:230 +#: classes/Notice.php:229 msgid "Problem saving notice. Unknown user." msgstr "Erreur lors de l’enregistrement de l’avis. Utilisateur inconnu." -#: classes/Notice.php:235 +#: classes/Notice.php:234 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Trop d’avis, trop vite ! Faites une pause et publiez à nouveau dans quelques " "minutes." -#: classes/Notice.php:241 +#: classes/Notice.php:240 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4143,28 +4433,28 @@ msgstr "" "Trop de messages en double trop vite ! Prenez une pause et publiez à nouveau " "dans quelques minutes." -#: classes/Notice.php:247 +#: classes/Notice.php:246 msgid "You are banned from posting notices on this site." msgstr "Il vous est interdit de poster des avis sur ce site." -#: classes/Notice.php:309 classes/Notice.php:334 +#: classes/Notice.php:305 classes/Notice.php:330 msgid "Problem saving notice." msgstr "Problème lors de l’enregistrement de l’avis." -#: classes/Notice.php:1034 +#: classes/Notice.php:1052 #, php-format msgid "DB error inserting reply: %s" msgstr "Erreur de base de donnée en insérant la réponse :%s" -#: classes/Notice.php:1359 +#: classes/Notice.php:1423 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" -#: classes/User.php:368 +#: classes/User.php:382 #, 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." @@ -4202,6 +4492,11 @@ msgstr "Autres " msgid "Other options" msgstr "Autres options " +#: lib/action.php:144 +#, php-format +msgid "%1$s - %2$s" +msgstr "%1$s - %2$s" + #: lib/action.php:159 msgid "Untitled page" msgstr "Page sans nom" @@ -4218,10 +4513,6 @@ msgstr "Accueil" msgid "Personal profile and friends timeline" msgstr "Profil personnel et flux des amis" -#: lib/action.php:435 -msgid "Account" -msgstr "Compte" - #: lib/action.php:435 msgid "Change your email, avatar, password, profile" msgstr "Modifier votre courriel, avatar, mot de passe, profil" @@ -4376,18 +4667,13 @@ msgstr "Après" msgid "Before" msgstr "Avant" -#: lib/action.php:1167 -msgid "There was a problem with your session token." -msgstr "Un problème est survenu avec votre jeton de session." - #: lib/adminpanelaction.php:96 msgid "You cannot make changes to this site." msgstr "Vous ne pouvez pas faire de modifications sur ce site." #: lib/adminpanelaction.php:107 -#, fuzzy msgid "Changes to that panel are not allowed." -msgstr "Création de compte non autorisée." +msgstr "La modification de ce panneau n’est pas autorisée." #: lib/adminpanelaction.php:206 msgid "showForm() not implemented." @@ -4413,6 +4699,74 @@ msgstr "Configuration de la conception" msgid "Paths configuration" msgstr "Configuration des chemins" +#: lib/applicationeditform.php:186 +msgid "Icon for this application" +msgstr "" + +#: lib/applicationeditform.php:206 +#, fuzzy, php-format +msgid "Describe your application in %d characters" +msgstr "Description du groupe ou du sujet en %d caractères" + +#: lib/applicationeditform.php:209 +#, fuzzy +msgid "Describe your application" +msgstr "Description du groupe ou du sujet" + +#: lib/applicationeditform.php:218 +#, fuzzy +msgid "Source URL" +msgstr "Source" + +#: lib/applicationeditform.php:220 +#, fuzzy +msgid "URL of the homepage of this application" +msgstr "URL du site Web ou blogue du groupe ou sujet " + +#: lib/applicationeditform.php:226 +msgid "Organization responsible for this application" +msgstr "" + +#: lib/applicationeditform.php:232 +#, fuzzy +msgid "URL for the homepage of the organization" +msgstr "URL du site Web ou blogue du groupe ou sujet " + +#: lib/applicationeditform.php:238 +msgid "URL to redirect to after authentication" +msgstr "" + +#: lib/applicationeditform.php:260 +msgid "Browser" +msgstr "" + +#: lib/applicationeditform.php:276 +msgid "Desktop" +msgstr "" + +#: lib/applicationeditform.php:277 +msgid "Type of application, browser or desktop" +msgstr "" + +#: lib/applicationeditform.php:299 +msgid "Read-only" +msgstr "Lecture seule" + +#: lib/applicationeditform.php:317 +msgid "Read-write" +msgstr "" + +#: lib/applicationeditform.php:318 +msgid "Default access for this application: read-only, or read-write" +msgstr "" +"Accès par défaut pour cette application : en lecture seule ou en lecture-" +"écriture" + +#: lib/applicationlist.php:154 +#, fuzzy +msgid "Revoke" +msgstr "Retirer" + #: lib/attachmentlist.php:87 msgid "Attachments" msgstr "Pièces jointes" @@ -4433,13 +4787,13 @@ msgstr "Avis sur lesquels cette pièce jointe apparaît." msgid "Tags for this attachment" msgstr "Marques de cette pièce jointe" -#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 +#: lib/authenticationplugin.php:214 lib/authenticationplugin.php:219 msgid "Password changing failed" msgstr "La modification du mot de passe a échoué" -#: lib/authenticationplugin.php:197 +#: lib/authenticationplugin.php:229 msgid "Password changing is not allowed" -msgstr "La modification du mot de passe n'est pas autorisée" +msgstr "La modification du mot de passe n’est pas autorisée" #: lib/channel.php:138 lib/channel.php:158 msgid "Command results" @@ -4458,8 +4812,8 @@ 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 -#, fuzzy, php-format -msgid "Could not find a user with nickname %s." +#, php-format +msgid "Could not find a user with nickname %s" msgstr "Impossible de trouver un utilisateur avec le pseudo %s" #: lib/command.php:92 @@ -4467,8 +4821,8 @@ 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 -#, fuzzy, php-format -msgid "Nudge sent to %s." +#, php-format +msgid "Nudge sent to %s" msgstr "Coup de code envoyé à %s" #: lib/command.php:126 @@ -4482,175 +4836,192 @@ msgstr "" "Abonnés : %2$s\n" "Messages : %3$s" -#: lib/command.php:152 lib/command.php:399 lib/command.php:460 -#, fuzzy -msgid "Notice with that id does not exist." +#: lib/command.php:152 lib/command.php:390 lib/command.php:451 +msgid "Notice with that id does not exist" msgstr "Aucun avis avec cet identifiant n’existe" -#: lib/command.php:168 lib/command.php:415 lib/command.php:476 -#: lib/command.php:532 -#, fuzzy -msgid "User has no last notice." +#: lib/command.php:168 lib/command.php:406 lib/command.php:467 +#: lib/command.php:523 +msgid "User has no last notice" msgstr "Aucun avis récent pour cet utilisateur" #: lib/command.php:190 msgid "Notice marked as fave." msgstr "Avis ajouté aux favoris." -#: lib/command.php:284 -#, fuzzy, php-format -msgid "Could not remove user %1$s to group %2$s." +#: lib/command.php:217 +msgid "You are already a member of that group" +msgstr "Vous êtes déjà membre de ce groupe" + +#: lib/command.php:231 +#, php-format +msgid "Could not join user %s to group %s" +msgstr "Impossible d’inscrire l’utilisateur %s au groupe %s" + +#: lib/command.php:236 +#, php-format +msgid "%s joined group %s" +msgstr "%1$s a rejoint le groupe %2$s" + +#: lib/command.php:275 +#, php-format +msgid "Could not remove user %s to group %s" msgstr "Impossible de retirer l’utilisateur %s du groupe %s" -#: lib/command.php:318 +#: lib/command.php:280 +#, php-format +msgid "%s left group %s" +msgstr "%1$s a quitté le groupe %2$s" + +#: lib/command.php:309 #, php-format msgid "Fullname: %s" msgstr "Nom complet : %s" -#: lib/command.php:321 +#: lib/command.php:312 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "Emplacement : %s" -#: lib/command.php:324 +#: lib/command.php:315 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "Site Web : %s" -#: lib/command.php:327 +#: lib/command.php:318 #, php-format msgid "About: %s" msgstr "À propos : %s" -#: lib/command.php:358 -#, fuzzy, php-format -msgid "Message too long - maximum is %1$d characters, you sent %2$d." +#: lib/command.php:349 +#, 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." -#: lib/command.php:376 -#, fuzzy, php-format -msgid "Direct message to %s sent." -msgstr "Votre message a été envoyé à %s" +#: lib/command.php:367 +#, php-format +msgid "Direct message to %s sent" +msgstr "Message direct envoyé à %s." -#: lib/command.php:378 +#: lib/command.php:369 msgid "Error sending direct message." msgstr "Une erreur est survenue pendant l’envoi de votre message." -#: lib/command.php:435 -#, fuzzy, php-format -msgid "Notice from %s repeated." +#: lib/command.php:413 +msgid "Cannot repeat your own notice" +msgstr "Impossible de reprendre votre propre avis" + +#: lib/command.php:418 +msgid "Already repeated that notice" +msgstr "Avis déjà repris" + +#: lib/command.php:426 +#, php-format +msgid "Notice from %s repeated" msgstr "Avis de %s repris" -#: lib/command.php:437 +#: lib/command.php:428 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 -#, fuzzy, php-format -msgid "Notice too long - maximum is %1$d characters, you sent %2$d." +#: lib/command.php:482 +#, 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." -#: lib/command.php:500 -#, fuzzy, php-format -msgid "Reply to %s sent." +#: lib/command.php:491 +#, php-format +msgid "Reply to %s sent" msgstr "Réponse à %s envoyée" -#: lib/command.php:502 +#: lib/command.php:493 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." +#: lib/command.php:547 +msgid "Specify the name of the user to subscribe to" msgstr "Indiquez le nom de l’utilisateur auquel vous souhaitez vous abonner" -#: lib/command.php:563 +#: lib/command.php:554 #, php-format msgid "Subscribed to %s" msgstr "Abonné à %s" -#: lib/command.php:584 -#, fuzzy -msgid "Specify the name of the user to unsubscribe from." +#: lib/command.php:575 +msgid "Specify the name of the user to unsubscribe from" msgstr "Indiquez le nom de l’utilisateur duquel vous souhaitez vous désabonner" -#: lib/command.php:591 +#: lib/command.php:582 #, php-format msgid "Unsubscribed from %s" msgstr "Désabonné de %s" -#: lib/command.php:609 lib/command.php:632 +#: lib/command.php:600 lib/command.php:623 msgid "Command not yet implemented." msgstr "Cette commande n’a pas encore été implémentée." -#: lib/command.php:612 +#: lib/command.php:603 msgid "Notification off." msgstr "Avertissements désactivés." -#: lib/command.php:614 +#: lib/command.php:605 msgid "Can't turn off notification." msgstr "Impossible de désactiver les avertissements." -#: lib/command.php:635 +#: lib/command.php:626 msgid "Notification on." msgstr "Avertissements activés." -#: lib/command.php:637 +#: lib/command.php:628 msgid "Can't turn on notification." msgstr "Impossible d’activer les avertissements." -#: lib/command.php:650 -#, fuzzy -msgid "Login command is disabled." +#: lib/command.php:641 +msgid "Login command is disabled" msgstr "La commande d'ouverture de session est désactivée" -#: lib/command.php:664 -#, fuzzy, php-format -msgid "Could not create login token for %s." -msgstr "Impossible de créer le jeton d'ouverture de session pour %s" - -#: lib/command.php:669 -#, fuzzy, php-format -msgid "This link is useable only once, and is good for only 2 minutes: %s." +#: lib/command.php:652 +#, 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" -#: lib/command.php:685 +#: lib/command.php:668 msgid "You are not subscribed to anyone." msgstr "Vous n'êtes pas abonné(e) à personne." -#: lib/command.php:687 +#: lib/command.php:670 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:690 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:692 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:712 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:714 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:728 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4701,12 +5072,12 @@ msgstr "" "leave - se désabonner de l’utilisateur\n" "d - message direct à l’utilisateur\n" "get - obtenir le dernier avis de l’utilisateur\n" -"whois - obtenir le profil de l'utilisateur\n" +"whois - obtenir le profil de l’utilisateur\n" "fav - ajouter de dernier avis de l’utilisateur comme favori\n" "fav # - ajouter l’avis correspondant à l’identifiant comme " "favori\n" -"repeat # - reprendre l'avis correspondant à l'identifiant\n" -"repeat - reprendre le dernier avis de l'utilisateur\n" +"repeat # - reprendre l’avis correspondant à l’identifiant\n" +"repeat - reprendre le dernier avis de l’utilisateur\n" "reply # - répondre à l’avis correspondant à l’identifiant\n" "reply - répondre au dernier avis de l’utilisateur\n" "join - rejoindre le groupe\n" @@ -4720,7 +5091,7 @@ msgstr "" "last - même effet que 'get'\n" "on - pas encore implémenté.\n" "off - pas encore implémenté.\n" -"nudge - rappeler à un utilisateur de poster.\n" +"nudge - envoyer un clin d’œil à l’utilisateur.\n" "invite - pas encore implémenté.\n" "track - pas encore implémenté.\n" "untrack - pas encore implémenté.\n" @@ -4729,20 +5100,20 @@ msgstr "" "tracks - pas encore implémenté.\n" "tracking - pas encore implémenté.\n" -#: lib/common.php:199 +#: lib/common.php:131 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 +#: lib/common.php:132 msgid "I looked for configuration files in the following places: " msgstr "" "J’ai cherché des fichiers de configuration dans les emplacements suivants : " -#: lib/common.php:201 +#: lib/common.php:134 msgid "You may wish to run the installer to fix this." msgstr "Vous pouvez essayer de lancer l’installeur pour régler ce problème." -#: lib/common.php:202 +#: lib/common.php:135 msgid "Go to the installer." msgstr "Aller au programme d’installation" @@ -4758,6 +5129,15 @@ msgstr "Suivi des avis par messagerie instantanée" msgid "Updates by SMS" msgstr "Suivi des avis par SMS" +#: lib/connectsettingsaction.php:120 +#, fuzzy +msgid "Connections" +msgstr "Connecter" + +#: lib/connectsettingsaction.php:121 +msgid "Authorized connected applications" +msgstr "" + #: lib/dberroraction.php:60 msgid "Database error" msgstr "Erreur de la base de données" @@ -4947,11 +5327,16 @@ msgstr "Mo" msgid "kB" msgstr "Ko" -#: lib/jabber.php:191 +#: lib/jabber.php:202 #, php-format msgid "[%s]" msgstr "[%s]" +#: lib/jabber.php:385 +#, php-format +msgid "Unknown inbox source %d." +msgstr "Source %d inconnue pour la boîte de réception." + #: lib/joinform.php:114 msgid "Join" msgstr "Rejoindre" @@ -5032,24 +5417,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 @@ -5184,7 +5555,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" @@ -5263,9 +5634,9 @@ msgid "Sorry, no incoming email allowed." msgstr "Désolé, la réception de courriels n’est pas permise." #: lib/mailhandler.php:228 -#, fuzzy, php-format +#, php-format msgid "Unsupported message type: %s" -msgstr "Format de fichier d’image non supporté." +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." @@ -5302,7 +5673,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 @@ -5310,8 +5681,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 @@ -5320,7 +5691,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 @@ -5353,18 +5724,20 @@ msgid "Attach a file" msgstr "Attacher un fichier" #: lib/noticeform.php:212 -#, fuzzy -msgid "Share my location." -msgstr "Partager votre localisation" - -#: lib/noticeform.php:214 -#, fuzzy -msgid "Do not share my location." -msgstr "Partager votre localisation" +msgid "Share my location" +msgstr "Partager ma localisation." #: lib/noticeform.php:215 -msgid "Hide this info" +msgid "Do not share my location" +msgstr "Ne pas partager ma localisation" + +#: lib/noticeform.php:216 +msgid "" +"Sorry, retrieving your geo location is taking longer than expected, please " +"try again later" msgstr "" +"Désolé, l'obtention de votre localisation prend plus de temps que prévu. " +"Veuillez réessayer plus tard." #: lib/noticelist.php:428 #, php-format @@ -5481,9 +5854,8 @@ msgid "Tags in %s's notices" msgstr "Marques dans les avis de %s" #: lib/plugin.php:114 -#, fuzzy msgid "Unknown" -msgstr "Action inconnue" +msgstr "Inconnu" #: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82 msgid "Subscriptions" @@ -5519,7 +5891,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" @@ -5624,23 +5996,23 @@ msgstr "Déjà abonné !" msgid "User has blocked you." msgstr "Cet utilisateur vous a bloqué." -#: lib/subs.php:60 +#: lib/subs.php:63 msgid "Could not subscribe." msgstr "Impossible de s’abonner." -#: lib/subs.php:79 +#: lib/subs.php:82 msgid "Could not subscribe other to you." msgstr "Impossible d’abonner une autre personne à votre profil." -#: lib/subs.php:128 +#: lib/subs.php:137 msgid "Not subscribed!" msgstr "Pas abonné !" -#: lib/subs.php:133 +#: lib/subs.php:142 msgid "Couldn't delete self-subscription." msgstr "Impossible de supprimer l’abonnement à soi-même." -#: lib/subs.php:146 +#: lib/subs.php:158 msgid "Couldn't delete subscription." msgstr "Impossible de cesser l’abonnement" @@ -5654,10 +6026,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" @@ -5718,47 +6086,47 @@ msgstr "Message" msgid "Moderate" msgstr "Modérer" -#: lib/util.php:837 +#: lib/util.php:875 msgid "a few seconds ago" msgstr "il y a quelques secondes" -#: lib/util.php:839 +#: lib/util.php:877 msgid "about a minute ago" msgstr "il y a 1 minute" -#: lib/util.php:841 +#: lib/util.php:879 #, php-format msgid "about %d minutes ago" msgstr "il y a %d minutes" -#: lib/util.php:843 +#: lib/util.php:881 msgid "about an hour ago" msgstr "il y a 1 heure" -#: lib/util.php:845 +#: lib/util.php:883 #, php-format msgid "about %d hours ago" msgstr "il y a %d heures" -#: lib/util.php:847 +#: lib/util.php:885 msgid "about a day ago" msgstr "il y a 1 jour" -#: lib/util.php:849 +#: lib/util.php:887 #, php-format msgid "about %d days ago" msgstr "il y a %d jours" -#: lib/util.php:851 +#: lib/util.php:889 msgid "about a month ago" msgstr "il y a 1 mois" -#: lib/util.php:853 +#: lib/util.php:891 #, php-format msgid "about %d months ago" msgstr "il y a %d mois" -#: lib/util.php:855 +#: lib/util.php:893 msgid "about a year ago" msgstr "il y a environ 1 an" @@ -5775,7 +6143,7 @@ msgstr "" #: scripts/xmppdaemon.php:301 #, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" -"Message trop long ! La taille maximale est de %d caractères ; vous en avez " -"entré %d." +"Message trop long ! La taille maximale est de %1$d caractères ; vous en avez " +"entré %2$d." diff --git a/locale/ga/LC_MESSAGES/statusnet.po b/locale/ga/LC_MESSAGES/statusnet.po index 1b2a0f3305..9c98b889dd 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-10 00:46+0000\n" -"PO-Revision-Date: 2010-01-10 00:47:52+0000\n" +"POT-Creation-Date: 2010-01-15 19:15+0000\n" +"PO-Revision-Date: 2010-01-15 19:16:59+0000\n" "Language-Team: Irish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60878); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r61101); 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" @@ -35,25 +35,30 @@ msgstr "Non existe a etiqueta." #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 +#: actions/apistatusesupdate.php:149 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 #: 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 #: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 -#: lib/command.php:163 lib/command.php:311 lib/command.php:364 -#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/command.php:163 lib/command.php:302 lib/command.php:355 +#: lib/command.php:401 lib/command.php:462 lib/command.php:518 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/subs.php:34 lib/subs.php:125 msgid "No such user." msgstr "Ningún usuario." +#: actions/all.php:84 +#, fuzzy, php-format +msgid "%1$s and friends, page %2$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 +#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -106,7 +111,7 @@ msgstr "" msgid "You and friends" msgstr "%s e amigos" -#: actions/allrss.php:119 actions/apitimelinefriends.php:122 +#: actions/allrss.php:119 actions/apitimelinefriends.php:121 #: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" @@ -117,6 +122,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:155 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" @@ -131,7 +153,7 @@ msgstr "Método da API non atopado" #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:114 +#: actions/apistatusesupdate.php:119 msgid "This method requires a POST." msgstr "Este método require un POST." @@ -162,8 +184,9 @@ msgstr "Non se puido gardar o perfil." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257 -#: actions/designadminpanel.php:122 actions/newnotice.php:94 +#: actions/apistatusesupdate.php:132 actions/avatarsettings.php:257 +#: actions/designadminpanel.php:122 actions/editapplication.php:118 +#: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format msgid "" @@ -175,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 #, fuzzy msgid "Unable to save your design settings." msgstr "Non se puideron gardar os teus axustes de Twitter!" @@ -218,26 +244,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!" @@ -264,7 +270,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 @@ -273,7 +279,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 @@ -295,8 +301,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." @@ -332,7 +339,8 @@ msgstr "O alcume xa está sendo empregado por outro usuario. Tenta con outro." msgid "Not a valid nickname." msgstr "Non é un alcume válido." -#: actions/apigroupcreate.php:196 actions/editgroup.php:195 +#: actions/apigroupcreate.php:196 actions/editapplication.php:212 +#: actions/editgroup.php:195 actions/newapplication.php:200 #: actions/newgroup.php:139 actions/profilesettings.php:222 #: actions/register.php:217 msgid "Homepage is not a valid URL." @@ -344,7 +352,8 @@ msgstr "A páxina persoal semella que non é unha URL válida." msgid "Full name is too long (max 255 chars)." msgstr "O nome completo é demasiado longo (max 255 car)." -#: actions/apigroupcreate.php:213 +#: actions/apigroupcreate.php:213 actions/editapplication.php:187 +#: actions/newapplication.php:169 #, php-format msgid "Description is too long (max %d chars)." msgstr "O teu Bio é demasiado longo (max 140 car.)." @@ -385,7 +394,7 @@ msgstr "" msgid "Group not found!" msgstr "Método da API non atopado" -#: actions/apigroupjoin.php:110 lib/command.php:217 +#: actions/apigroupjoin.php:110 actions/joingroup.php:90 msgid "You are already a member of that group." msgstr "Xa estas suscrito a estes usuarios:" @@ -393,7 +402,7 @@ msgstr "Xa estas suscrito a estes usuarios:" msgid "You have been blocked from that group by the admin." msgstr "" -#: actions/apigroupjoin.php:138 lib/command.php:234 +#: actions/apigroupjoin.php:138 actions/joingroup.php:124 #, fuzzy, php-format msgid "Could not join user %1$s to group %2$s." msgstr "Non podes seguir a este usuario: o Usuario non se atopa." @@ -402,7 +411,7 @@ msgstr "Non podes seguir a este usuario: o Usuario non se atopa." msgid "You are not a member of this group." msgstr "Non estás suscrito a ese perfil" -#: actions/apigroupleave.php:124 actions/leavegroup.php:127 +#: actions/apigroupleave.php:124 actions/leavegroup.php:119 #, fuzzy, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "Non podes seguir a este usuario: o Usuario non se atopa." @@ -422,6 +431,102 @@ msgstr "" msgid "groups on %s" msgstr "Outras opcions" +#: actions/apioauthauthorize.php:108 actions/apioauthauthorize.php:114 +msgid "Bad request." +msgstr "" + +#: actions/apioauthauthorize.php:134 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:115 actions/makeadmin.php:66 +#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 +#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:139 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 +#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/subscribe.php:46 actions/tagother.php:166 +#: 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 "Houbo un problema co teu token de sesión. Tentao de novo, anda..." + +#: actions/apioauthauthorize.php:146 +#, fuzzy +msgid "Invalid nickname / password!" +msgstr "Usuario ou contrasinal inválidos." + +#: actions/apioauthauthorize.php:170 +#, fuzzy +msgid "DB error deleting OAuth app user." +msgstr "Acounteceu un erro configurando o usuario." + +#: actions/apioauthauthorize.php:196 +#, fuzzy +msgid "DB error inserting OAuth app user." +msgstr "Erro ó inserir o hashtag na BD: %s" + +#: actions/apioauthauthorize.php:231 +#, php-format +msgid "" +"The request token %s has been authorized. Please exchange it for an access " +"token." +msgstr "" + +#: actions/apioauthauthorize.php:241 +#, php-format +msgid "The request token %s has been denied." +msgstr "" + +#: actions/apioauthauthorize.php:246 actions/avatarsettings.php:281 +#: actions/designadminpanel.php:103 actions/editapplication.php:139 +#: actions/emailsettings.php:256 actions/grouplogo.php:319 +#: actions/imsettings.php:220 actions/newapplication.php:121 +#: actions/oauthconnectionssettings.php:151 actions/recoverpassword.php:44 +#: actions/smssettings.php:248 lib/designsettings.php:304 +msgid "Unexpected form submission." +msgstr "Envio de formulario non esperada." + +#: actions/apioauthauthorize.php:273 +msgid "An application would like to connect to your account" +msgstr "" + +#: actions/apioauthauthorize.php:290 +msgid "Allow or deny access" +msgstr "" + +#: actions/apioauthauthorize.php:320 lib/action.php:435 +#, fuzzy +msgid "Account" +msgstr "Sobre" + +#: actions/apioauthauthorize.php:323 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/apioauthauthorize.php:326 actions/login.php:233 +#: actions/register.php:429 lib/accountsettingsaction.php:116 +msgid "Password" +msgstr "Contrasinal" + +#: actions/apioauthauthorize.php:338 +msgid "Deny" +msgstr "" + +#: actions/apioauthauthorize.php:344 +#, fuzzy +msgid "Allow" +msgstr "Todos" + +#: actions/apioauthauthorize.php:361 +msgid "Allow or deny access to your account information." +msgstr "" + #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." msgstr "Este método require un POST ou DELETE." @@ -435,12 +540,12 @@ msgstr "Non deberías eliminar o estado de outro usuario" msgid "No such notice." msgstr "Ningún chío." -#: actions/apistatusesretweet.php:83 lib/command.php:422 +#: actions/apistatusesretweet.php:83 #, fuzzy msgid "Cannot repeat your own notice." msgstr "Non se pode activar a notificación." -#: actions/apistatusesretweet.php:91 lib/command.php:427 +#: actions/apistatusesretweet.php:91 #, fuzzy msgid "Already repeated that notice." msgstr "Eliminar chío" @@ -454,18 +559,18 @@ msgstr "Avatar actualizado." 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 +#: actions/apistatusesupdate.php:162 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" "Iso é demasiado longo. O tamaño máximo para un chío é de 140 caracteres." -#: actions/apistatusesupdate.php:198 +#: actions/apistatusesupdate.php:203 msgid "Not found" msgstr "Non atopado" -#: actions/apistatusesupdate.php:221 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:226 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -551,8 +656,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." @@ -575,8 +683,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." @@ -610,29 +718,6 @@ 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/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 -#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 -#: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 -#: actions/subscribe.php:46 actions/tagother.php:166 -#: 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 "Houbo un problema co teu token de sesión. Tentao de novo, anda..." - -#: actions/avatarsettings.php:281 actions/designadminpanel.php:103 -#: actions/emailsettings.php:256 actions/grouplogo.php:319 -#: actions/imsettings.php:220 actions/recoverpassword.php:44 -#: actions/smssettings.php:248 lib/designsettings.php:304 -msgid "Unexpected form submission." -msgstr "Envio de formulario non esperada." - #: actions/avatarsettings.php:328 msgid "Pick a square area of the image to be your avatar" msgstr "" @@ -698,21 +783,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:260 #, fuzzy -msgid "No such group" -msgstr "Non é o usuario" +msgid "No such group." +msgstr "Non existe a etiqueta." #: actions/blockedfromgroup.php:90 #, php-format @@ -782,7 +862,8 @@ msgid "Couldn't delete email confirmation." msgstr "Non se pode eliminar a confirmación de email." #: actions/confirmaddress.php:144 -msgid "Confirm Address" +#, fuzzy +msgid "Confirm address" msgstr "Confirmar enderezo" #: actions/confirmaddress.php:159 @@ -841,11 +922,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." @@ -988,7 +1064,8 @@ msgstr "" #: actions/pathsadminpanel.php:324 actions/profilesettings.php:174 #: actions/siteadminpanel.php:388 actions/smssettings.php:181 #: actions/subscriptions.php:203 actions/tagother.php:154 -#: actions/useradminpanel.php:313 lib/designsettings.php:256 +#: actions/useradminpanel.php:313 lib/applicationeditform.php:335 +#: lib/applicationeditform.php:336 lib/designsettings.php:256 #: lib/groupeditform.php:202 msgid "Save" msgstr "Gardar" @@ -1009,6 +1086,89 @@ msgstr "Engadir a favoritos" msgid "No such document." msgstr "Ningún documento." +#: actions/editapplication.php:54 lib/applicationeditform.php:136 +msgid "Edit application" +msgstr "" + +#: actions/editapplication.php:66 +#, fuzzy +msgid "You must be logged in to edit an application." +msgstr "Debes estar logueado para invitar a outros usuarios a empregar %s" + +#: actions/editapplication.php:77 actions/showapplication.php:94 +#, fuzzy +msgid "You are not the owner of this application." +msgstr "Non estás suscrito a ese perfil" + +#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:163 +#: actions/showapplication.php:87 +#, fuzzy +msgid "No such application." +msgstr "Ningún chío." + +#: actions/editapplication.php:127 actions/newapplication.php:110 +#: actions/showapplication.php:118 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..." + +#: actions/editapplication.php:161 +#, fuzzy +msgid "Use this form to edit your application." +msgstr "" +"Usa este formulario para engadir etiquetas aos teus seguidores ou aos que " +"sigues." + +#: actions/editapplication.php:177 actions/newapplication.php:159 +#, fuzzy +msgid "Name is required." +msgstr "A mesma contrasinal que arriba. Requerido." + +#: actions/editapplication.php:180 actions/newapplication.php:162 +#, fuzzy +msgid "Name is too long (max 255 chars)." +msgstr "O nome completo é demasiado longo (max 255 car)." + +#: actions/editapplication.php:183 actions/newapplication.php:165 +#, fuzzy +msgid "Description is required." +msgstr "Subscricións" + +#: actions/editapplication.php:191 +msgid "Source URL is too long." +msgstr "" + +#: actions/editapplication.php:197 actions/newapplication.php:182 +#, fuzzy +msgid "Source URL is not valid." +msgstr "A páxina persoal semella que non é unha URL válida." + +#: actions/editapplication.php:200 actions/newapplication.php:185 +msgid "Organization is required." +msgstr "" + +#: actions/editapplication.php:203 actions/newapplication.php:188 +#, fuzzy +msgid "Organization is too long (max 255 chars)." +msgstr "A localización é demasiado longa (max 255 car.)." + +#: actions/editapplication.php:206 actions/newapplication.php:191 +msgid "Organization homepage is required." +msgstr "" + +#: actions/editapplication.php:215 actions/newapplication.php:203 +msgid "Callback is too long." +msgstr "" + +#: actions/editapplication.php:222 actions/newapplication.php:212 +msgid "Callback URL is not valid." +msgstr "" + +#: actions/editapplication.php:255 +#, fuzzy +msgid "Could not update application." +msgstr "Non se puido actualizar o usuario." + #: actions/editgroup.php:56 #, php-format msgid "Edit %s group" @@ -1022,7 +1182,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 @@ -1050,7 +1210,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 @@ -1083,13 +1244,15 @@ msgstr "" "a %s á túa lista de contactos?)" #: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 +#: actions/smssettings.php:126 lib/applicationeditform.php:333 +#: lib/applicationeditform.php:334 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\"" @@ -1163,9 +1326,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." @@ -1351,14 +1515,6 @@ 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:79 msgid "No such file." msgstr "Ningún chío." @@ -1375,7 +1531,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." @@ -1427,9 +1583,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 @@ -1452,13 +1609,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." @@ -1474,6 +1624,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 "" @@ -1600,7 +1755,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 @@ -1630,7 +1786,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 @@ -1729,7 +1886,7 @@ 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 lib/command.php:315 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -1774,7 +1931,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:234 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236 msgid "Send" msgstr "Enviar" @@ -1843,17 +2000,7 @@ 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 -#, fuzzy -msgid "You are already a member of that group" -msgstr "Xa estas suscrito a estes usuarios:" - -#: actions/joingroup.php:128 -#, fuzzy, php-format -msgid "Could not join user %1$s to group %2$s" -msgstr "Non podes seguir a este usuario: o Usuario non se atopa." - -#: actions/joingroup.php:135 lib/command.php:239 +#: actions/joingroup.php:131 #, fuzzy, php-format msgid "%1$s joined group %2$s" msgstr "%s / Favoritos dende %s" @@ -1863,72 +2010,51 @@ msgstr "%s / Favoritos dende %s" msgid "You must be logged in to leave a group." msgstr "Debes estar logueado para invitar a outros usuarios a empregar %s" -#: actions/leavegroup.php:90 lib/command.php:268 +#: actions/leavegroup.php:90 lib/command.php:265 #, fuzzy msgid "You are not a member of that group." msgstr "Non estás suscrito a ese perfil" -#: actions/leavegroup.php:119 lib/command.php:278 -#, fuzzy -msgid "Could not find membership record." -msgstr "Non se puido actualizar o rexistro de usuario." - -#: actions/leavegroup.php:134 lib/command.php:289 +#: actions/leavegroup.php:127 #, fuzzy, php-format 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:460 +#: 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 -#: lib/groupeditform.php:152 lib/userprofile.php:131 -msgid "Nickname" -msgstr "Alcume" - -#: actions/login.php:253 actions/register.php:428 -#: 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." @@ -1936,7 +2062,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]" @@ -1956,19 +2082,41 @@ 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 %1$s in group %2$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 %1$s an admin for group %2$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" msgstr "Sen estado actual" +#: actions/newapplication.php:52 +msgid "New application" +msgstr "" + +#: actions/newapplication.php:64 +#, fuzzy +msgid "You must be logged in to register an application." +msgstr "Debes estar logueado para invitar a outros usuarios a empregar %s" + +#: actions/newapplication.php:143 +msgid "Use this form to register a new application." +msgstr "" + +#: actions/newapplication.php:173 +msgid "Source URL is required." +msgstr "" + +#: actions/newapplication.php:255 actions/newapplication.php:264 +#, fuzzy +msgid "Could not create application." +msgstr "Non se puido crear o favorito." + #: actions/newgroup.php:53 msgid "New group" msgstr "" @@ -1981,12 +2129,12 @@ msgstr "" msgid "New message" msgstr "Nova mensaxe" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 msgid "You can't send a message to this user." msgstr "Non podes enviar mensaxes a este usurio." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:484 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 +#: lib/command.php:475 msgid "No content!" msgstr "Sen contido!" @@ -1994,7 +2142,7 @@ msgstr "Sen contido!" msgid "No recipient specified." msgstr "Non se especificou ningún destinatario" -#: actions/newmessage.php:164 lib/command.php:370 +#: actions/newmessage.php:164 lib/command.php:361 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -2007,8 +2155,8 @@ msgid "Message sent" msgstr "Non hai mensaxes de texto!" #: actions/newmessage.php:185 -#, php-format -msgid "Direct message to %s sent" +#, fuzzy, php-format +msgid "Direct message to %s sent." msgstr "Mensaxe directo a %s enviado" #: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 @@ -2080,6 +2228,51 @@ msgstr "Toque enviado" msgid "Nudge sent!" msgstr "Toque enviado!" +#: actions/oauthappssettings.php:59 +#, fuzzy +msgid "You must be logged in to list your applications." +msgstr "Debes estar logueado para invitar a outros usuarios a empregar %s" + +#: actions/oauthappssettings.php:74 +#, fuzzy +msgid "OAuth applications" +msgstr "Outras opcions" + +#: actions/oauthappssettings.php:85 +msgid "Applications you have registered" +msgstr "" + +#: actions/oauthappssettings.php:135 +#, php-format +msgid "You have not registered any applications yet." +msgstr "" + +#: actions/oauthconnectionssettings.php:71 +msgid "Connected applications" +msgstr "" + +#: actions/oauthconnectionssettings.php:87 +msgid "You have allowed the following applications to access you account." +msgstr "" + +#: actions/oauthconnectionssettings.php:170 +#, fuzzy +msgid "You are not a user of that application." +msgstr "Non estás suscrito a ese perfil" + +#: actions/oauthconnectionssettings.php:180 +msgid "Unable to revoke access for app: " +msgstr "" + +#: actions/oauthconnectionssettings.php:192 +#, php-format +msgid "You have not authorized any applications to use your account." +msgstr "" + +#: actions/oauthconnectionssettings.php:205 +msgid "Developers can edit the registration settings for their applications " +msgstr "" + #: actions/oembed.php:79 actions/shownotice.php:100 msgid "Notice has no profile" msgstr "O chío non ten perfil" @@ -2098,8 +2291,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:1038 +#: lib/api.php:1066 lib/api.php:1176 msgid "Not a supported data format." msgstr "Non é un formato de datos soportado." @@ -2112,7 +2305,8 @@ msgid "Notice Search" msgstr "Procura de Chíos" #: actions/othersettings.php:60 -msgid "Other Settings" +#, fuzzy +msgid "Other settings" msgstr "Outros axustes" #: actions/othersettings.php:71 @@ -2144,6 +2338,30 @@ msgstr "" msgid "URL shortening service is too long (max 50 chars)." msgstr "Sistema de acortamento de URLs demasiado longo (max 50 car.)." +#: 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 msgid "Outbox for %s" @@ -2181,7 +2399,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" @@ -2352,8 +2570,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" @@ -2417,43 +2636,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 -#: lib/groupeditform.php:161 +#: actions/profilesettings.php:115 actions/register.php:453 +#: lib/applicationeditform.php:230 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\"" @@ -2763,7 +2982,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." @@ -2776,7 +2995,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:457 +#: actions/register.php:114 actions/register.php:503 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Rexistrar" @@ -2789,19 +3008,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 " @@ -2811,43 +3026,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 " @@ -2856,7 +3071,7 @@ 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 +#: actions/register.php:538 #, fuzzy, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -2888,7 +3103,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.)" @@ -3044,6 +3259,85 @@ msgstr "Non podes enviar mensaxes a este usurio." msgid "User is already sandboxed." msgstr "O usuario bloqueoute." +#: actions/showapplication.php:82 +#, fuzzy +msgid "You must be logged in to view an application." +msgstr "Debes estar logueado para invitar a outros usuarios a empregar %s" + +#: actions/showapplication.php:158 +#, fuzzy +msgid "Application profile" +msgstr "O chío non ten perfil" + +#: actions/showapplication.php:160 lib/applicationeditform.php:182 +msgid "Icon" +msgstr "" + +#: actions/showapplication.php:170 actions/version.php:195 +#: lib/applicationeditform.php:197 +#, fuzzy +msgid "Name" +msgstr "Alcume" + +#: actions/showapplication.php:179 lib/applicationeditform.php:224 +#, fuzzy +msgid "Organization" +msgstr "Invitación(s) enviada(s)." + +#: actions/showapplication.php:188 actions/version.php:198 +#: lib/applicationeditform.php:211 lib/groupeditform.php:172 +#, fuzzy +msgid "Description" +msgstr "Subscricións" + +#: actions/showapplication.php:193 actions/showgroup.php:429 +#: lib/profileaction.php:174 +msgid "Statistics" +msgstr "Estatísticas" + +#: actions/showapplication.php:204 +#, php-format +msgid "created by %1$s - %2$s access by default - %3$d users" +msgstr "" + +#: actions/showapplication.php:214 +msgid "Application actions" +msgstr "" + +#: actions/showapplication.php:233 +msgid "Reset key & secret" +msgstr "" + +#: actions/showapplication.php:241 +msgid "Application info" +msgstr "" + +#: actions/showapplication.php:243 +msgid "Consumer key" +msgstr "" + +#: actions/showapplication.php:248 +msgid "Consumer secret" +msgstr "" + +#: actions/showapplication.php:253 +msgid "Request token URL" +msgstr "" + +#: actions/showapplication.php:258 +msgid "Access token URL" +msgstr "" + +#: actions/showapplication.php:263 +msgid "Authorize URL" +msgstr "" + +#: actions/showapplication.php:268 +msgid "" +"Note: We support HMAC-SHA1 signatures. We do not support the plaintext " +"signature method." +msgstr "" + #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "Non se pode " @@ -3145,7 +3439,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)" @@ -3154,10 +3448,6 @@ msgstr "(nada)" msgid "All members" msgstr "" -#: actions/showgroup.php:429 lib/profileaction.php:174 -msgid "Statistics" -msgstr "Estatísticas" - #: actions/showgroup.php:432 #, fuzzy msgid "Created" @@ -3315,12 +3605,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 @@ -3510,7 +3800,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 @@ -3539,7 +3830,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 @@ -3796,10 +4088,6 @@ 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" @@ -4011,11 +4299,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" @@ -4093,11 +4376,6 @@ msgstr "" msgid "Plugins" msgstr "" -#: actions/version.php:195 -#, fuzzy -msgid "Name" -msgstr "Alcume" - #: actions/version.php:196 lib/action.php:741 #, fuzzy msgid "Version" @@ -4107,28 +4385,43 @@ msgstr "Persoal" msgid "Author(s)" msgstr "" -#: actions/version.php:198 lib/groupeditform.php:172 -#, fuzzy -msgid "Description" -msgstr "Subscricións" - -#: classes/File.php:137 +#: 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/Group_member.php:41 +#, fuzzy +msgid "Group join failed." +msgstr "Non existe o perfil." + +#: classes/Group_member.php:53 +#, fuzzy +msgid "Not part of group." +msgstr "Non se puido actualizar o usuario." + +#: classes/Group_member.php:60 +#, fuzzy +msgid "Group leave failed." +msgstr "Non existe o perfil." + +#: 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." @@ -4142,28 +4435,28 @@ msgstr "Non se pode inserir unha mensaxe." msgid "Could not update message with new URI." msgstr "Non se puido actualizar a mensaxe coa nova URI." -#: classes/Notice.php:172 +#: classes/Notice.php:171 #, php-format msgid "DB error inserting hashtag: %s" msgstr "Erro ó inserir o hashtag na BD: %s" -#: classes/Notice.php:226 +#: classes/Notice.php:225 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Aconteceu un erro ó gardar o chío." -#: classes/Notice.php:230 +#: classes/Notice.php:229 msgid "Problem saving notice. Unknown user." msgstr "Aconteceu un erro ó gardar o chío. Usuario descoñecido." -#: classes/Notice.php:235 +#: classes/Notice.php:234 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Demasiados chíos en pouco tempo; tomate un respiro e envíao de novo dentro " "duns minutos." -#: classes/Notice.php:241 +#: classes/Notice.php:240 #, fuzzy msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " @@ -4172,25 +4465,25 @@ msgstr "" "Demasiados chíos en pouco tempo; tomate un respiro e envíao de novo dentro " "duns minutos." -#: classes/Notice.php:247 +#: classes/Notice.php:246 msgid "You are banned from posting notices on this site." msgstr "Tes restrinxido o envio de chíos neste sitio." -#: classes/Notice.php:309 classes/Notice.php:334 +#: classes/Notice.php:305 classes/Notice.php:330 msgid "Problem saving notice." msgstr "Aconteceu un erro ó gardar o chío." -#: classes/Notice.php:1034 +#: classes/Notice.php:1052 #, php-format msgid "DB error inserting reply: %s" msgstr "Erro ó inserir a contestación na BD: %s" -#: classes/Notice.php:1359 +#: classes/Notice.php:1423 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" -#: classes/User.php:368 +#: classes/User.php:382 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Mensaxe de %1$s en %2$s" @@ -4235,6 +4528,11 @@ msgstr "Outros" msgid "Other options" msgstr "Outras opcions" +#: lib/action.php:144 +#, fuzzy, php-format +msgid "%1$s - %2$s" +msgstr "%1$s (%2$s)" + #: lib/action.php:159 msgid "Untitled page" msgstr "" @@ -4251,11 +4549,6 @@ msgstr "Persoal" msgid "Personal profile and friends timeline" msgstr "" -#: lib/action.php:435 -#, fuzzy -msgid "Account" -msgstr "Sobre" - #: lib/action.php:435 #, fuzzy msgid "Change your email, avatar, password, profile" @@ -4424,11 +4717,6 @@ msgstr "« Despois" msgid "Before" msgstr "Antes »" -#: 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..." - #: lib/adminpanelaction.php:96 #, fuzzy msgid "You cannot make changes to this site." @@ -4469,6 +4757,72 @@ msgstr "Confirmación de SMS" msgid "Paths configuration" msgstr "Confirmación de SMS" +#: lib/applicationeditform.php:186 +msgid "Icon for this application" +msgstr "" + +#: lib/applicationeditform.php:206 +#, fuzzy, php-format +msgid "Describe your application in %d characters" +msgstr "Contanos un pouco de ti e dos teus intereses en 140 caractéres." + +#: lib/applicationeditform.php:209 +#, fuzzy +msgid "Describe your application" +msgstr "Contanos un pouco de ti e dos teus intereses en 140 caractéres." + +#: lib/applicationeditform.php:218 +#, fuzzy +msgid "Source URL" +msgstr "Fonte" + +#: lib/applicationeditform.php:220 +#, fuzzy +msgid "URL of the homepage of this application" +msgstr "Enderezo da túa páxina persoal, blogue, ou perfil noutro sitio" + +#: lib/applicationeditform.php:226 +msgid "Organization responsible for this application" +msgstr "" + +#: lib/applicationeditform.php:232 +#, fuzzy +msgid "URL for the homepage of the organization" +msgstr "Enderezo da túa páxina persoal, blogue, ou perfil noutro sitio" + +#: lib/applicationeditform.php:238 +msgid "URL to redirect to after authentication" +msgstr "" + +#: lib/applicationeditform.php:260 +msgid "Browser" +msgstr "" + +#: lib/applicationeditform.php:276 +msgid "Desktop" +msgstr "" + +#: lib/applicationeditform.php:277 +msgid "Type of application, browser or desktop" +msgstr "" + +#: lib/applicationeditform.php:299 +msgid "Read-only" +msgstr "" + +#: lib/applicationeditform.php:317 +msgid "Read-write" +msgstr "" + +#: lib/applicationeditform.php:318 +msgid "Default access for this application: read-only, or read-write" +msgstr "" + +#: lib/applicationlist.php:154 +#, fuzzy +msgid "Revoke" +msgstr "Eliminar" + #: lib/attachmentlist.php:87 msgid "Attachments" msgstr "" @@ -4490,12 +4844,12 @@ msgstr "" msgid "Tags for this attachment" msgstr "" -#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 +#: lib/authenticationplugin.php:214 lib/authenticationplugin.php:219 #, fuzzy msgid "Password changing failed" msgstr "Contrasinal gardada." -#: lib/authenticationplugin.php:197 +#: lib/authenticationplugin.php:229 #, fuzzy msgid "Password changing is not allowed" msgstr "Contrasinal gardada." @@ -4518,7 +4872,7 @@ msgstr "Desculpa, este comando todavía non está implementado." #: lib/command.php:88 #, fuzzy, php-format -msgid "Could not find a user with nickname %s." +msgid "Could not find a user with nickname %s" msgstr "Non se puido actualizar o usuario coa dirección de correo electrónico." #: lib/command.php:92 @@ -4527,7 +4881,7 @@ msgstr "" #: lib/command.php:99 #, fuzzy, php-format -msgid "Nudge sent to %s." +msgid "Nudge sent to %s" msgstr "Toque enviado" #: lib/command.php:126 @@ -4541,145 +4895,167 @@ msgstr "" "Suscriptores: %2$s\n" "Chíos: %3$s" -#: lib/command.php:152 lib/command.php:399 lib/command.php:460 +#: lib/command.php:152 lib/command.php:390 lib/command.php:451 #, fuzzy -msgid "Notice with that id does not exist." +msgid "Notice with that id does not exist" msgstr "Non se atopou un perfil con ese ID." -#: lib/command.php:168 lib/command.php:415 lib/command.php:476 -#: lib/command.php:532 -#, fuzzy -msgid "User has no last notice." +#: lib/command.php:168 lib/command.php:406 lib/command.php:467 +#: lib/command.php:523 +msgid "User has no last notice" msgstr "O usuario non ten último chio." #: lib/command.php:190 msgid "Notice marked as fave." msgstr "Chío marcado coma favorito." -#: lib/command.php:284 +#: lib/command.php:217 +#, fuzzy +msgid "You are already a member of that group" +msgstr "Xa estas suscrito a estes usuarios:" + +#: lib/command.php:231 #, fuzzy, php-format -msgid "Could not remove user %1$s to group %2$s." +msgid "Could not join user %s to group %s" msgstr "Non podes seguir a este usuario: o Usuario non se atopa." -#: lib/command.php:318 +#: lib/command.php:236 +#, fuzzy, php-format +msgid "%s joined group %s" +msgstr "%s / Favoritos dende %s" + +#: lib/command.php:275 +#, 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:280 +#, fuzzy, php-format +msgid "%s left group %s" +msgstr "%s / Favoritos dende %s" + +#: lib/command.php:309 #, php-format msgid "Fullname: %s" msgstr "Nome completo: %s" -#: lib/command.php:321 +#: lib/command.php:312 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "Ubicación: %s" -#: lib/command.php:324 +#: lib/command.php:315 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "Páxina persoal: %s" -#: lib/command.php:327 +#: lib/command.php:318 #, php-format msgid "About: %s" msgstr "Sobre: %s" -#: lib/command.php:358 +#: lib/command.php:349 #, fuzzy, php-format -msgid "Message too long - maximum is %1$d characters, you sent %2$d." +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." +#: lib/command.php:367 +#, php-format +msgid "Direct message to %s sent" msgstr "Mensaxe directo a %s enviado" -#: lib/command.php:378 +#: lib/command.php:369 msgid "Error sending direct message." msgstr "Erro ó enviar a mensaxe directa." -#: lib/command.php:435 +#: lib/command.php:413 +#, fuzzy +msgid "Cannot repeat your own notice" +msgstr "Non se pode activar a notificación." + +#: lib/command.php:418 +#, fuzzy +msgid "Already repeated that notice" +msgstr "Eliminar chío" + +#: lib/command.php:426 #, fuzzy, php-format -msgid "Notice from %s repeated." +msgid "Notice from %s repeated" msgstr "Chío publicado" -#: lib/command.php:437 +#: lib/command.php:428 #, fuzzy msgid "Error repeating notice." msgstr "Aconteceu un erro ó gardar o chío." -#: lib/command.php:491 +#: lib/command.php:482 #, fuzzy, php-format -msgid "Notice too long - maximum is %1$d characters, you sent %2$d." +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 -#, fuzzy, php-format -msgid "Reply to %s sent." +#: lib/command.php:491 +#, php-format +msgid "Reply to %s sent" msgstr "Non se pode eliminar este chíos." -#: lib/command.php:502 +#: lib/command.php:493 #, fuzzy 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." +#: lib/command.php:547 +msgid "Specify the name of the user to subscribe to" msgstr "Especifica o nome do usuario ó que queres suscribirte" -#: lib/command.php:563 +#: lib/command.php:554 #, php-format msgid "Subscribed to %s" msgstr "Suscrito a %s" -#: lib/command.php:584 -#, fuzzy -msgid "Specify the name of the user to unsubscribe from." +#: lib/command.php:575 +msgid "Specify the name of the user to unsubscribe from" msgstr "Especifica o nome de usuario ó que queres deixar de seguir" -#: lib/command.php:591 +#: lib/command.php:582 #, php-format msgid "Unsubscribed from %s" msgstr "Desuscribir de %s" -#: lib/command.php:609 lib/command.php:632 +#: lib/command.php:600 lib/command.php:623 msgid "Command not yet implemented." msgstr "Comando non implementado." -#: lib/command.php:612 +#: lib/command.php:603 msgid "Notification off." msgstr "Notificación desactivada." -#: lib/command.php:614 +#: lib/command.php:605 msgid "Can't turn off notification." msgstr "No se pode desactivar a notificación." -#: lib/command.php:635 +#: lib/command.php:626 msgid "Notification on." msgstr "Notificación habilitada." -#: lib/command.php:637 +#: lib/command.php:628 msgid "Can't turn on notification." msgstr "Non se pode activar a notificación." -#: lib/command.php:650 -msgid "Login command is disabled." +#: lib/command.php:641 +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:652 #, php-format -msgid "This link is useable only once, and is good for only 2 minutes: %s." +msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:685 +#: lib/command.php:668 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Non estás suscrito a ese perfil" -#: lib/command.php:687 +#: lib/command.php:670 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Xa estas suscrito a estes usuarios:" @@ -4688,12 +5064,12 @@ msgstr[2] "" msgstr[3] "" msgstr[4] "" -#: lib/command.php:707 +#: lib/command.php:690 #, fuzzy msgid "No one is subscribed to you." msgstr "Outro usuario non se puido suscribir a ti." -#: lib/command.php:709 +#: lib/command.php:692 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." @@ -4702,12 +5078,12 @@ msgstr[2] "" msgstr[3] "" msgstr[4] "" -#: lib/command.php:729 +#: lib/command.php:712 #, 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:714 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" @@ -4716,7 +5092,7 @@ msgstr[2] "" msgstr[3] "" msgstr[4] "" -#: lib/command.php:745 +#: lib/command.php:728 #, fuzzy msgid "" "Commands:\n" @@ -4784,20 +5160,20 @@ msgstr "" "tracks - non implementado por agora.\n" "tracking - non implementado por agora.\n" -#: lib/common.php:199 +#: lib/common.php:131 #, fuzzy msgid "No configuration file found. " msgstr "Sen código de confirmación." -#: lib/common.php:200 +#: lib/common.php:132 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:201 +#: lib/common.php:134 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:202 +#: lib/common.php:135 msgid "Go to the installer." msgstr "" @@ -4813,6 +5189,15 @@ msgstr "Chíos dende mensaxería instantánea (IM)" msgid "Updates by SMS" msgstr "Chíos dende SMS" +#: lib/connectsettingsaction.php:120 +#, fuzzy +msgid "Connections" +msgstr "Conectar" + +#: lib/connectsettingsaction.php:121 +msgid "Authorized connected applications" +msgstr "" + #: lib/dberroraction.php:60 msgid "Database error" msgstr "" @@ -5007,11 +5392,16 @@ msgstr "" msgid "kB" msgstr "" -#: lib/jabber.php:191 +#: lib/jabber.php:202 #, php-format msgid "[%s]" msgstr "" +#: lib/jabber.php:385 +#, php-format +msgid "Unknown inbox source %d." +msgstr "" + #: lib/joinform.php:114 #, fuzzy msgid "Join" @@ -5091,22 +5481,10 @@ msgstr "" "Atentamente todo seu,\n" "%4$s.\n" -#: lib/mail.php:254 -#, fuzzy, php-format -msgid "Location: %s\n" -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 "" +#, fuzzy, php-format +msgid "Bio: %s" +msgstr "Ubicación: %s" #: lib/mail.php:286 #, php-format @@ -5337,7 +5715,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 @@ -5345,7 +5723,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 @@ -5355,7 +5734,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 @@ -5392,16 +5771,18 @@ msgstr "" #: lib/noticeform.php:212 #, fuzzy -msgid "Share my location." -msgstr "Non se puideron gardar as etiquetas." - -#: lib/noticeform.php:214 -#, fuzzy -msgid "Do not share my location." +msgid "Share my location" msgstr "Non se puideron gardar as etiquetas." #: lib/noticeform.php:215 -msgid "Hide this info" +#, fuzzy +msgid "Do not share my location" +msgstr "Non se puideron gardar as etiquetas." + +#: lib/noticeform.php:216 +msgid "" +"Sorry, retrieving your geo location is taking longer than expected, please " +"try again later" msgstr "" #: lib/noticelist.php:428 @@ -5687,25 +6068,25 @@ msgstr "" msgid "User has blocked you." msgstr "O usuario bloqueoute." -#: lib/subs.php:60 +#: lib/subs.php:63 msgid "Could not subscribe." msgstr "No se pode suscribir." -#: lib/subs.php:79 +#: lib/subs.php:82 msgid "Could not subscribe other to you." msgstr "Outro usuario non se puido suscribir a ti." -#: lib/subs.php:128 +#: lib/subs.php:137 #, fuzzy msgid "Not subscribed!" msgstr "Non está suscrito!" -#: lib/subs.php:133 +#: lib/subs.php:142 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "Non se pode eliminar a subscrición." -#: lib/subs.php:146 +#: lib/subs.php:158 msgid "Couldn't delete subscription." msgstr "Non se pode eliminar a subscrición." @@ -5719,10 +6100,6 @@ msgstr "" msgid "People Tagcloud as tagged" msgstr "" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(nada)" - #: lib/tagcloudsection.php:56 #, fuzzy msgid "None" @@ -5792,47 +6169,47 @@ msgstr "Nova mensaxe" msgid "Moderate" msgstr "" -#: lib/util.php:837 +#: lib/util.php:875 msgid "a few seconds ago" msgstr "fai uns segundos" -#: lib/util.php:839 +#: lib/util.php:877 msgid "about a minute ago" msgstr "fai un minuto" -#: lib/util.php:841 +#: lib/util.php:879 #, php-format msgid "about %d minutes ago" msgstr "fai %d minutos" -#: lib/util.php:843 +#: lib/util.php:881 msgid "about an hour ago" msgstr "fai unha hora" -#: lib/util.php:845 +#: lib/util.php:883 #, php-format msgid "about %d hours ago" msgstr "fai %d horas" -#: lib/util.php:847 +#: lib/util.php:885 msgid "about a day ago" msgstr "fai un día" -#: lib/util.php:849 +#: lib/util.php:887 #, php-format msgid "about %d days ago" msgstr "fai %d días" -#: lib/util.php:851 +#: lib/util.php:889 msgid "about a month ago" msgstr "fai un mes" -#: lib/util.php:853 +#: lib/util.php:891 #, php-format msgid "about %d months ago" msgstr "fai %d meses" -#: lib/util.php:855 +#: lib/util.php:893 msgid "about a year ago" msgstr "fai un ano" @@ -5848,5 +6225,5 @@ msgstr "" #: scripts/xmppdaemon.php:301 #, fuzzy, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "Mensaxe demasiado longa - o máximo é 140 caracteres, ti enviaches %d " diff --git a/locale/he/LC_MESSAGES/statusnet.po b/locale/he/LC_MESSAGES/statusnet.po index 177963433f..0d4564da33 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-10 00:46+0000\n" -"PO-Revision-Date: 2010-01-10 00:47:57+0000\n" +"POT-Creation-Date: 2010-01-15 19:15+0000\n" +"PO-Revision-Date: 2010-01-15 19:17: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 (r60878); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r61101); 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" @@ -33,25 +33,30 @@ msgstr "×ין הודעה כזו." #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 +#: actions/apistatusesupdate.php:149 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 #: 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 #: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 -#: lib/command.php:163 lib/command.php:311 lib/command.php:364 -#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/command.php:163 lib/command.php:302 lib/command.php:355 +#: lib/command.php:401 lib/command.php:462 lib/command.php:518 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/subs.php:34 lib/subs.php:125 msgid "No such user." msgstr "×ין משתמש ×›×–×”." +#: actions/all.php:84 +#, fuzzy, php-format +msgid "%1$s and friends, page %2$d" +msgstr "%s וחברי×" + #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 +#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -104,7 +109,7 @@ msgstr "" msgid "You and friends" msgstr "%s וחברי×" -#: actions/allrss.php:119 actions/apitimelinefriends.php:122 +#: actions/allrss.php:119 actions/apitimelinefriends.php:121 #: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" @@ -115,6 +120,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:155 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 "קוד ×”×ישור ×œ× × ×ž×¦×." @@ -129,7 +151,7 @@ msgstr "קוד ×”×ישור ×œ× × ×ž×¦×." #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:114 +#: actions/apistatusesupdate.php:119 msgid "This method requires a POST." msgstr "" @@ -160,8 +182,9 @@ msgstr "שמירת הפרופיל נכשלה." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257 -#: actions/designadminpanel.php:122 actions/newnotice.php:94 +#: actions/apistatusesupdate.php:132 actions/avatarsettings.php:257 +#: actions/designadminpanel.php:122 actions/editapplication.php:118 +#: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format msgid "" @@ -173,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 "" @@ -215,26 +241,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 "" @@ -258,15 +264,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 @@ -288,8 +295,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." @@ -323,7 +331,8 @@ msgstr "כינוי ×–×” כבר תפוס. נסה כינוי ×חר." msgid "Not a valid nickname." msgstr "×©× ×ž×©×ª×ž×© ×œ× ×—×•×§×™." -#: actions/apigroupcreate.php:196 actions/editgroup.php:195 +#: actions/apigroupcreate.php:196 actions/editapplication.php:212 +#: actions/editgroup.php:195 actions/newapplication.php:200 #: actions/newgroup.php:139 actions/profilesettings.php:222 #: actions/register.php:217 msgid "Homepage is not a valid URL." @@ -335,7 +344,8 @@ msgstr "ל×תר הבית יש כתובת ×œ× ×—×•×§×™×ª." msgid "Full name is too long (max 255 chars)." msgstr "×”×©× ×”×ž×œ× ×רוך מידי (מותרות 255 ×ותיות בלבד)" -#: actions/apigroupcreate.php:213 +#: actions/apigroupcreate.php:213 actions/editapplication.php:187 +#: actions/newapplication.php:169 #, fuzzy, php-format msgid "Description is too long (max %d chars)." msgstr "הביוגרפיה ×רוכה מידי (לכל היותר 140 ×ותיות)" @@ -376,7 +386,7 @@ msgstr "" msgid "Group not found!" msgstr "×œ× × ×ž×¦×" -#: actions/apigroupjoin.php:110 lib/command.php:217 +#: actions/apigroupjoin.php:110 actions/joingroup.php:90 #, fuzzy msgid "You are already a member of that group." msgstr "כבר נכנסת למערכת!" @@ -385,7 +395,7 @@ msgstr "כבר נכנסת למערכת!" msgid "You have been blocked from that group by the admin." msgstr "" -#: actions/apigroupjoin.php:138 lib/command.php:234 +#: actions/apigroupjoin.php:138 actions/joingroup.php:124 #, fuzzy, php-format msgid "Could not join user %1$s to group %2$s." msgstr "נכשלה ההפניה לשרת: %s" @@ -395,7 +405,7 @@ msgstr "נכשלה ההפניה לשרת: %s" msgid "You are not a member of this group." msgstr "×œ× ×©×œ×—× ×• ×לינו ×ת הפרופיל ×”×–×”" -#: actions/apigroupleave.php:124 actions/leavegroup.php:127 +#: actions/apigroupleave.php:124 actions/leavegroup.php:119 #, fuzzy, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "נכשלה יצירת OpenID מתוך: %s" @@ -415,6 +425,101 @@ msgstr "" msgid "groups on %s" msgstr "" +#: actions/apioauthauthorize.php:108 actions/apioauthauthorize.php:114 +msgid "Bad request." +msgstr "" + +#: actions/apioauthauthorize.php:134 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:115 actions/makeadmin.php:66 +#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 +#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:139 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 +#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/subscribe.php:46 actions/tagother.php:166 +#: 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 "" + +#: actions/apioauthauthorize.php:146 +#, fuzzy +msgid "Invalid nickname / password!" +msgstr "×©× ×”×ž×©×ª×ž×© ×ו הסיסמה ×œ× ×—×•×§×™×™×" + +#: actions/apioauthauthorize.php:170 +#, fuzzy +msgid "DB error deleting OAuth app user." +msgstr "שגי××” ביצירת ×©× ×”×ž×©×ª×ž×©." + +#: actions/apioauthauthorize.php:196 +#, fuzzy +msgid "DB error inserting OAuth app user." +msgstr "שגי×ת מסד × ×ª×•× ×™× ×‘×”×›× ×¡×ª התגובה: %s" + +#: actions/apioauthauthorize.php:231 +#, php-format +msgid "" +"The request token %s has been authorized. Please exchange it for an access " +"token." +msgstr "" + +#: actions/apioauthauthorize.php:241 +#, php-format +msgid "The request token %s has been denied." +msgstr "" + +#: actions/apioauthauthorize.php:246 actions/avatarsettings.php:281 +#: actions/designadminpanel.php:103 actions/editapplication.php:139 +#: actions/emailsettings.php:256 actions/grouplogo.php:319 +#: actions/imsettings.php:220 actions/newapplication.php:121 +#: actions/oauthconnectionssettings.php:151 actions/recoverpassword.php:44 +#: actions/smssettings.php:248 lib/designsettings.php:304 +msgid "Unexpected form submission." +msgstr "הגשת טופס ×œ× ×¦×¤×•×™×”." + +#: actions/apioauthauthorize.php:273 +msgid "An application would like to connect to your account" +msgstr "" + +#: actions/apioauthauthorize.php:290 +msgid "Allow or deny access" +msgstr "" + +#: actions/apioauthauthorize.php:320 lib/action.php:435 +#, fuzzy +msgid "Account" +msgstr "×ודות" + +#: actions/apioauthauthorize.php:323 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/apioauthauthorize.php:326 actions/login.php:233 +#: actions/register.php:429 lib/accountsettingsaction.php:116 +msgid "Password" +msgstr "סיסמה" + +#: actions/apioauthauthorize.php:338 +msgid "Deny" +msgstr "" + +#: actions/apioauthauthorize.php:344 +msgid "Allow" +msgstr "" + +#: actions/apioauthauthorize.php:361 +msgid "Allow or deny access to your account information." +msgstr "" + #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." msgstr "" @@ -428,12 +533,12 @@ msgstr "" msgid "No such notice." msgstr "×ין הודעה כזו." -#: actions/apistatusesretweet.php:83 lib/command.php:422 +#: actions/apistatusesretweet.php:83 #, fuzzy msgid "Cannot repeat your own notice." msgstr "×œ× × ×™×ª×Ÿ ×œ×”×™×¨×©× ×œ×œ× ×”×¡×›×ž×” לרשיון" -#: actions/apistatusesretweet.php:91 lib/command.php:427 +#: actions/apistatusesretweet.php:91 #, fuzzy msgid "Already repeated that notice." msgstr "כבר נכנסת למערכת!" @@ -447,17 +552,17 @@ msgstr "התמונה עודכנה." msgid "No status with that ID found." msgstr "" -#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:162 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "×–×” ×רוך מידי. ×ורך מירבי להודעה ×”×•× 140 ×ותיות." -#: actions/apistatusesupdate.php:198 +#: actions/apistatusesupdate.php:203 msgid "Not found" msgstr "×œ× × ×ž×¦×" -#: actions/apistatusesupdate.php:221 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:226 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -544,8 +649,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 "×ין כינוי" @@ -568,8 +676,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 "" @@ -603,29 +711,6 @@ 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/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 -#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 -#: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 -#: actions/subscribe.php:46 actions/tagother.php:166 -#: 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 "" - -#: actions/avatarsettings.php:281 actions/designadminpanel.php:103 -#: actions/emailsettings.php:256 actions/grouplogo.php:319 -#: actions/imsettings.php:220 actions/recoverpassword.php:44 -#: actions/smssettings.php:248 lib/designsettings.php:304 -msgid "Unexpected form submission." -msgstr "הגשת טופס ×œ× ×¦×¤×•×™×”." - #: actions/avatarsettings.php:328 msgid "Pick a square area of the image to be your avatar" msgstr "" @@ -689,20 +774,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:260 #, fuzzy -msgid "No such group" +msgid "No such group." msgstr "×ין הודעה כזו." #: actions/blockedfromgroup.php:90 @@ -772,7 +852,8 @@ msgid "Couldn't delete email confirmation." msgstr "" #: actions/confirmaddress.php:144 -msgid "Confirm Address" +#, fuzzy +msgid "Confirm address" msgstr "×שר כתובת" #: actions/confirmaddress.php:159 @@ -827,10 +908,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." @@ -973,7 +1050,8 @@ msgstr "" #: actions/pathsadminpanel.php:324 actions/profilesettings.php:174 #: actions/siteadminpanel.php:388 actions/smssettings.php:181 #: actions/subscriptions.php:203 actions/tagother.php:154 -#: actions/useradminpanel.php:313 lib/designsettings.php:256 +#: actions/useradminpanel.php:313 lib/applicationeditform.php:335 +#: lib/applicationeditform.php:336 lib/designsettings.php:256 #: lib/groupeditform.php:202 msgid "Save" msgstr "שמור" @@ -995,6 +1073,83 @@ msgstr "מועדפי×" msgid "No such document." msgstr "×ין מסמך ×›×–×”." +#: actions/editapplication.php:54 lib/applicationeditform.php:136 +msgid "Edit application" +msgstr "" + +#: actions/editapplication.php:66 +msgid "You must be logged in to edit an application." +msgstr "" + +#: actions/editapplication.php:77 actions/showapplication.php:94 +#, fuzzy +msgid "You are not the owner of this application." +msgstr "×œ× ×©×œ×—× ×• ×לינו ×ת הפרופיל ×”×–×”" + +#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:163 +#: actions/showapplication.php:87 +#, fuzzy +msgid "No such application." +msgstr "×ין הודעה כזו." + +#: actions/editapplication.php:127 actions/newapplication.php:110 +#: actions/showapplication.php:118 lib/action.php:1167 +msgid "There was a problem with your session token." +msgstr "" + +#: actions/editapplication.php:161 +msgid "Use this form to edit your application." +msgstr "" + +#: actions/editapplication.php:177 actions/newapplication.php:159 +msgid "Name is required." +msgstr "" + +#: actions/editapplication.php:180 actions/newapplication.php:162 +#, fuzzy +msgid "Name is too long (max 255 chars)." +msgstr "×”×©× ×”×ž×œ× ×רוך מידי (מותרות 255 ×ותיות בלבד)" + +#: actions/editapplication.php:183 actions/newapplication.php:165 +#, fuzzy +msgid "Description is required." +msgstr "הרשמות" + +#: actions/editapplication.php:191 +msgid "Source URL is too long." +msgstr "" + +#: actions/editapplication.php:197 actions/newapplication.php:182 +#, fuzzy +msgid "Source URL is not valid." +msgstr "ל×תר הבית יש כתובת ×œ× ×—×•×§×™×ª." + +#: actions/editapplication.php:200 actions/newapplication.php:185 +msgid "Organization is required." +msgstr "" + +#: actions/editapplication.php:203 actions/newapplication.php:188 +#, fuzzy +msgid "Organization is too long (max 255 chars)." +msgstr "×©× ×”×ž×™×§×•× ×רוך מידי (מותר עד 255 ×ותיות)." + +#: actions/editapplication.php:206 actions/newapplication.php:191 +msgid "Organization homepage is required." +msgstr "" + +#: actions/editapplication.php:215 actions/newapplication.php:203 +msgid "Callback is too long." +msgstr "" + +#: actions/editapplication.php:222 actions/newapplication.php:212 +msgid "Callback URL is not valid." +msgstr "" + +#: actions/editapplication.php:255 +#, fuzzy +msgid "Could not update application." +msgstr "עידכון המשתמש נכשל." + #: actions/editgroup.php:56 #, php-format msgid "Edit %s group" @@ -1006,7 +1161,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,8 +1189,9 @@ msgid "Options saved." msgstr "ההגדרות נשמרו." #: actions/emailsettings.php:60 -msgid "Email Settings" -msgstr "" +#, fuzzy +msgid "Email settings" +msgstr "הגדרות הפרופיל" #: actions/emailsettings.php:71 #, php-format @@ -1064,13 +1220,15 @@ msgid "" msgstr "" #: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 +#: actions/smssettings.php:126 lib/applicationeditform.php:333 +#: lib/applicationeditform.php:334 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\"" @@ -1143,8 +1301,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 @@ -1328,14 +1487,6 @@ 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:79 #, fuzzy msgid "No such file." @@ -1354,7 +1505,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 "" @@ -1404,9 +1555,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." @@ -1429,12 +1581,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." @@ -1450,6 +1596,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 "" @@ -1577,7 +1728,8 @@ msgid "Error removing the block." msgstr "שגי××” בשמירת המשתמש." #: actions/imsettings.php:59 -msgid "IM Settings" +#, fuzzy +msgid "IM settings" msgstr "הגדרות ×ž×¡×¨×™× ×ž×™×“×™×™×" #: actions/imsettings.php:70 @@ -1608,7 +1760,8 @@ msgstr "" "נוספותץ (×”×× ×”×•×¡×¤×ª ×ת %s לרשימת ×”×—×‘×¨×™× ×©×œ×š?)" #: actions/imsettings.php:124 -msgid "IM Address" +#, fuzzy +msgid "IM address" msgstr "כתובת ×ž×¡×¨×™× ×ž×™×“×™×™×" #: actions/imsettings.php:126 @@ -1704,7 +1857,7 @@ msgstr "" msgid "You are already subscribed to these users:" msgstr "" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:315 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 #, php-format msgid "%1$s (%2$s)" msgstr "" @@ -1745,7 +1898,7 @@ msgstr "" msgid "Optionally add a personal message to the invitation." msgstr "" -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236 msgid "Send" msgstr "שלח" @@ -1789,17 +1942,7 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "" -#: actions/joingroup.php:90 -#, fuzzy -msgid "You are already a member of that group" -msgstr "כבר נכנסת למערכת!" - -#: actions/joingroup.php:128 -#, fuzzy, php-format -msgid "Could not join user %1$s to group %2$s" -msgstr "נכשלה ההפניה לשרת: %s" - -#: actions/joingroup.php:135 lib/command.php:239 +#: actions/joingroup.php:131 #, php-format msgid "%1$s joined group %2$s" msgstr "" @@ -1808,77 +1951,57 @@ msgstr "" msgid "You must be logged in to leave a group." msgstr "" -#: actions/leavegroup.php:90 lib/command.php:268 +#: actions/leavegroup.php:90 lib/command.php:265 #, fuzzy msgid "You are not a member of that group." msgstr "×œ× ×©×œ×—× ×• ×לינו ×ת הפרופיל ×”×–×”" -#: actions/leavegroup.php:119 lib/command.php:278 -msgid "Could not find membership record." -msgstr "" - -#: actions/leavegroup.php:134 lib/command.php:289 +#: actions/leavegroup.php:127 #, fuzzy, php-format 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:460 +#: 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 -#: lib/groupeditform.php:152 lib/userprofile.php:131 -msgid "Nickname" -msgstr "כינוי" - -#: actions/login.php:253 actions/register.php:428 -#: 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]" @@ -1897,19 +2020,40 @@ 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 %1$s in group %2$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 %1$s an admin for group %2$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" msgstr "" +#: actions/newapplication.php:52 +msgid "New application" +msgstr "" + +#: actions/newapplication.php:64 +msgid "You must be logged in to register an application." +msgstr "" + +#: actions/newapplication.php:143 +msgid "Use this form to register a new application." +msgstr "" + +#: actions/newapplication.php:173 +msgid "Source URL is required." +msgstr "" + +#: actions/newapplication.php:255 actions/newapplication.php:264 +#, fuzzy +msgid "Could not create application." +msgstr "שמירת מידע התמונה נכשל" + #: actions/newgroup.php:53 msgid "New group" msgstr "" @@ -1922,12 +2066,12 @@ msgstr "" msgid "New message" msgstr "הודעה חדשה" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 msgid "You can't send a message to this user." msgstr "" -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:484 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 +#: lib/command.php:475 msgid "No content!" msgstr "×ין תוכן!" @@ -1935,7 +2079,7 @@ msgstr "×ין תוכן!" msgid "No recipient specified." msgstr "" -#: actions/newmessage.php:164 lib/command.php:370 +#: actions/newmessage.php:164 lib/command.php:361 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -1947,7 +2091,7 @@ msgstr "הודעה חדשה" #: 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 @@ -2018,6 +2162,49 @@ msgstr "" msgid "Nudge sent!" msgstr "" +#: actions/oauthappssettings.php:59 +msgid "You must be logged in to list your applications." +msgstr "" + +#: actions/oauthappssettings.php:74 +msgid "OAuth applications" +msgstr "" + +#: actions/oauthappssettings.php:85 +msgid "Applications you have registered" +msgstr "" + +#: actions/oauthappssettings.php:135 +#, php-format +msgid "You have not registered any applications yet." +msgstr "" + +#: actions/oauthconnectionssettings.php:71 +msgid "Connected applications" +msgstr "" + +#: actions/oauthconnectionssettings.php:87 +msgid "You have allowed the following applications to access you account." +msgstr "" + +#: actions/oauthconnectionssettings.php:170 +#, fuzzy +msgid "You are not a user of that application." +msgstr "×œ× ×©×œ×—× ×• ×לינו ×ת הפרופיל ×”×–×”" + +#: actions/oauthconnectionssettings.php:180 +msgid "Unable to revoke access for app: " +msgstr "" + +#: actions/oauthconnectionssettings.php:192 +#, php-format +msgid "You have not authorized any applications to use your account." +msgstr "" + +#: actions/oauthconnectionssettings.php:205 +msgid "Developers can edit the registration settings for their applications " +msgstr "" + #: actions/oembed.php:79 actions/shownotice.php:100 msgid "Notice has no profile" msgstr "להודעה ×ין פרופיל" @@ -2036,8 +2223,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:1038 +#: lib/api.php:1066 lib/api.php:1176 msgid "Not a supported data format." msgstr "" @@ -2051,7 +2238,7 @@ msgstr "" #: actions/othersettings.php:60 #, fuzzy -msgid "Other Settings" +msgid "Other settings" msgstr "הגדרות" #: actions/othersettings.php:71 @@ -2084,6 +2271,30 @@ msgstr "" msgid "URL shortening service is too long (max 50 chars)." msgstr "×©× ×”×ž×™×§×•× ×רוך מידי (מותר עד 255 ×ותיות)." +#: 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 #, php-format msgid "Outbox for %s" @@ -2120,7 +2331,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 "×שר" @@ -2290,8 +2501,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" @@ -2352,43 +2564,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 -#: lib/groupeditform.php:161 +#: actions/profilesettings.php:115 actions/register.php:453 +#: lib/applicationeditform.php:230 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 "מיקומך, למשל \"עיר, מדינה ×ו מחוז, ×רץ\"" @@ -2685,7 +2897,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 "" @@ -2698,7 +2910,7 @@ msgstr "שגי××” ב×ישור הקוד." msgid "Registration successful" msgstr "" -#: actions/register.php:114 actions/register.php:502 lib/action.php:457 +#: actions/register.php:114 actions/register.php:503 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "הירש×" @@ -2711,64 +2923,60 @@ 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, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -2787,7 +2995,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.)" @@ -2938,6 +3146,84 @@ msgstr "×œ× ×©×œ×—× ×• ×לינו ×ת הפרופיל ×”×–×”" msgid "User is already sandboxed." msgstr "למשתמש ×ין פרופיל." +#: actions/showapplication.php:82 +msgid "You must be logged in to view an application." +msgstr "" + +#: actions/showapplication.php:158 +#, fuzzy +msgid "Application profile" +msgstr "להודעה ×ין פרופיל" + +#: actions/showapplication.php:160 lib/applicationeditform.php:182 +msgid "Icon" +msgstr "" + +#: actions/showapplication.php:170 actions/version.php:195 +#: lib/applicationeditform.php:197 +#, fuzzy +msgid "Name" +msgstr "כינוי" + +#: actions/showapplication.php:179 lib/applicationeditform.php:224 +#, fuzzy +msgid "Organization" +msgstr "מיקו×" + +#: actions/showapplication.php:188 actions/version.php:198 +#: lib/applicationeditform.php:211 lib/groupeditform.php:172 +#, fuzzy +msgid "Description" +msgstr "הרשמות" + +#: actions/showapplication.php:193 actions/showgroup.php:429 +#: lib/profileaction.php:174 +msgid "Statistics" +msgstr "סטטיסטיקה" + +#: actions/showapplication.php:204 +#, php-format +msgid "created by %1$s - %2$s access by default - %3$d users" +msgstr "" + +#: actions/showapplication.php:214 +msgid "Application actions" +msgstr "" + +#: actions/showapplication.php:233 +msgid "Reset key & secret" +msgstr "" + +#: actions/showapplication.php:241 +msgid "Application info" +msgstr "" + +#: actions/showapplication.php:243 +msgid "Consumer key" +msgstr "" + +#: actions/showapplication.php:248 +msgid "Consumer secret" +msgstr "" + +#: actions/showapplication.php:253 +msgid "Request token URL" +msgstr "" + +#: actions/showapplication.php:258 +msgid "Access token URL" +msgstr "" + +#: actions/showapplication.php:263 +msgid "Authorize URL" +msgstr "" + +#: actions/showapplication.php:268 +msgid "" +"Note: We support HMAC-SHA1 signatures. We do not support the plaintext " +"signature method." +msgstr "" + #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "" @@ -3038,7 +3324,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 "" @@ -3046,10 +3332,6 @@ msgstr "" msgid "All members" msgstr "" -#: actions/showgroup.php:429 lib/profileaction.php:174 -msgid "Statistics" -msgstr "סטטיסטיקה" - #: actions/showgroup.php:432 #, fuzzy msgid "Created" @@ -3189,12 +3471,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 @@ -3381,8 +3663,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 @@ -3411,7 +3694,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 @@ -3661,11 +3944,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" @@ -3872,11 +4150,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" @@ -3954,11 +4227,6 @@ msgstr "" msgid "Plugins" msgstr "" -#: actions/version.php:195 -#, fuzzy -msgid "Name" -msgstr "כינוי" - #: actions/version.php:196 lib/action.php:741 #, fuzzy msgid "Version" @@ -3968,28 +4236,43 @@ msgstr "×ישי" msgid "Author(s)" msgstr "" -#: actions/version.php:198 lib/groupeditform.php:172 -#, fuzzy -msgid "Description" -msgstr "הרשמות" - -#: classes/File.php:137 +#: 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/Group_member.php:41 +#, fuzzy +msgid "Group join failed." +msgstr "×ין הודעה כזו." + +#: classes/Group_member.php:53 +#, fuzzy +msgid "Not part of group." +msgstr "עידכון המשתמש נכשל." + +#: classes/Group_member.php:60 +#, fuzzy +msgid "Group leave failed." +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 "" @@ -4002,51 +4285,51 @@ msgstr "" msgid "Could not update message with new URI." msgstr "" -#: classes/Notice.php:172 +#: classes/Notice.php:171 #, php-format msgid "DB error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:226 +#: classes/Notice.php:225 #, fuzzy msgid "Problem saving notice. Too long." msgstr "בעיה בשמירת ההודעה." -#: classes/Notice.php:230 +#: classes/Notice.php:229 #, fuzzy msgid "Problem saving notice. Unknown user." msgstr "בעיה בשמירת ההודעה." -#: classes/Notice.php:235 +#: classes/Notice.php:234 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:241 +#: classes/Notice.php:240 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:247 +#: classes/Notice.php:246 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:309 classes/Notice.php:334 +#: classes/Notice.php:305 classes/Notice.php:330 msgid "Problem saving notice." msgstr "בעיה בשמירת ההודעה." -#: classes/Notice.php:1034 +#: classes/Notice.php:1052 #, php-format msgid "DB error inserting reply: %s" msgstr "שגי×ת מסד × ×ª×•× ×™× ×‘×”×›× ×¡×ª התגובה: %s" -#: classes/Notice.php:1359 +#: classes/Notice.php:1423 #, php-format msgid "RT @%1$s %2$s" msgstr "" -#: classes/User.php:368 +#: classes/User.php:382 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" @@ -4091,6 +4374,11 @@ msgstr "" msgid "Other options" msgstr "" +#: lib/action.php:144 +#, fuzzy, php-format +msgid "%1$s - %2$s" +msgstr "הסטטוס של %1$s ב-%2$s " + #: lib/action.php:159 msgid "Untitled page" msgstr "" @@ -4107,11 +4395,6 @@ msgstr "בית" msgid "Personal profile and friends timeline" msgstr "" -#: lib/action.php:435 -#, fuzzy -msgid "Account" -msgstr "×ודות" - #: lib/action.php:435 msgid "Change your email, avatar, password, profile" msgstr "" @@ -4276,10 +4559,6 @@ msgstr "<< ×חרי" msgid "Before" msgstr "לפני >>" -#: lib/action.php:1167 -msgid "There was a problem with your session token." -msgstr "" - #: lib/adminpanelaction.php:96 msgid "You cannot make changes to this site." msgstr "" @@ -4314,6 +4593,72 @@ msgstr "" msgid "Paths configuration" msgstr "הרשמות" +#: lib/applicationeditform.php:186 +msgid "Icon for this application" +msgstr "" + +#: lib/applicationeditform.php:206 +#, fuzzy, php-format +msgid "Describe your application in %d characters" +msgstr "ת×ר ×ת עצמך ו×ת נוש××™ העניין שלך ב-140 ×ותיות" + +#: lib/applicationeditform.php:209 +#, fuzzy +msgid "Describe your application" +msgstr "ת×ר ×ת עצמך ו×ת נוש××™ העניין שלך ב-140 ×ותיות" + +#: lib/applicationeditform.php:218 +#, fuzzy +msgid "Source URL" +msgstr "מקור" + +#: lib/applicationeditform.php:220 +#, fuzzy +msgid "URL of the homepage of this application" +msgstr "הכתובת של ×תר הבית שלך, בלוג, ×ו פרופיל ב×תר ×חר " + +#: lib/applicationeditform.php:226 +msgid "Organization responsible for this application" +msgstr "" + +#: lib/applicationeditform.php:232 +#, fuzzy +msgid "URL for the homepage of the organization" +msgstr "הכתובת של ×תר הבית שלך, בלוג, ×ו פרופיל ב×תר ×חר " + +#: lib/applicationeditform.php:238 +msgid "URL to redirect to after authentication" +msgstr "" + +#: lib/applicationeditform.php:260 +msgid "Browser" +msgstr "" + +#: lib/applicationeditform.php:276 +msgid "Desktop" +msgstr "" + +#: lib/applicationeditform.php:277 +msgid "Type of application, browser or desktop" +msgstr "" + +#: lib/applicationeditform.php:299 +msgid "Read-only" +msgstr "" + +#: lib/applicationeditform.php:317 +msgid "Read-write" +msgstr "" + +#: lib/applicationeditform.php:318 +msgid "Default access for this application: read-only, or read-write" +msgstr "" + +#: lib/applicationlist.php:154 +#, fuzzy +msgid "Revoke" +msgstr "הסר" + #: lib/attachmentlist.php:87 msgid "Attachments" msgstr "" @@ -4335,12 +4680,12 @@ msgstr "" msgid "Tags for this attachment" msgstr "" -#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 +#: lib/authenticationplugin.php:214 lib/authenticationplugin.php:219 #, fuzzy msgid "Password changing failed" msgstr "הסיסמה נשמרה." -#: lib/authenticationplugin.php:197 +#: lib/authenticationplugin.php:229 #, fuzzy msgid "Password changing is not allowed" msgstr "הסיסמה נשמרה." @@ -4362,8 +4707,8 @@ msgid "Sorry, this command is not yet implemented." msgstr "" #: lib/command.php:88 -#, fuzzy, php-format -msgid "Could not find a user with nickname %s." +#, php-format +msgid "Could not find a user with nickname %s" msgstr "עידכון המשתמש נכשל." #: lib/command.php:92 @@ -4371,9 +4716,9 @@ msgid "It does not make a lot of sense to nudge yourself!" msgstr "" #: lib/command.php:99 -#, php-format -msgid "Nudge sent to %s." -msgstr "" +#, fuzzy, php-format +msgid "Nudge sent to %s" +msgstr "תגובת עבור %s" #: lib/command.php:126 #, php-format @@ -4383,171 +4728,196 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:399 lib/command.php:460 +#: lib/command.php:152 lib/command.php:390 lib/command.php:451 #, fuzzy -msgid "Notice with that id does not exist." +msgid "Notice with that id does not exist" msgstr "×ין פרופיל תו×× ×œ×¤×¨×•×¤×™×œ המרוחק " -#: lib/command.php:168 lib/command.php:415 lib/command.php:476 -#: lib/command.php:532 +#: lib/command.php:168 lib/command.php:406 lib/command.php:467 +#: lib/command.php:523 #, fuzzy -msgid "User has no last notice." +msgid "User has no last notice" msgstr "למשתמש ×ין פרופיל." #: lib/command.php:190 msgid "Notice marked as fave." msgstr "" -#: lib/command.php:284 +#: lib/command.php:217 +#, fuzzy +msgid "You are already a member of that group" +msgstr "כבר נכנסת למערכת!" + +#: lib/command.php:231 #, fuzzy, php-format -msgid "Could not remove user %1$s to group %2$s." +msgid "Could not join user %s to group %s" +msgstr "נכשלה ההפניה לשרת: %s" + +#: lib/command.php:236 +#, fuzzy, php-format +msgid "%s joined group %s" +msgstr "הסטטוס של %1$s ב-%2$s " + +#: lib/command.php:275 +#, fuzzy, php-format +msgid "Could not remove user %s to group %s" msgstr "נכשלה יצירת OpenID מתוך: %s" -#: lib/command.php:318 -#, php-format -msgid "Fullname: %s" -msgstr "" +#: lib/command.php:280 +#, fuzzy, php-format +msgid "%s left group %s" +msgstr "הסטטוס של %1$s ב-%2$s " -#: lib/command.php:321 +#: lib/command.php:309 +#, fuzzy, php-format +msgid "Fullname: %s" +msgstr "×©× ×ž×œ×" + +#: lib/command.php:312 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "" -#: lib/command.php:324 +#: lib/command.php:315 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "" -#: lib/command.php:327 +#: lib/command.php:318 #, php-format msgid "About: %s" msgstr "×ודות: %s" -#: lib/command.php:358 +#: lib/command.php:349 #, php-format -msgid "Message too long - maximum is %1$d characters, you sent %2$d." +msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:376 +#: lib/command.php:367 #, php-format -msgid "Direct message to %s sent." +msgid "Direct message to %s sent" msgstr "" -#: lib/command.php:378 +#: lib/command.php:369 msgid "Error sending direct message." msgstr "" -#: lib/command.php:435 +#: lib/command.php:413 +#, fuzzy +msgid "Cannot repeat your own notice" +msgstr "×œ× × ×™×ª×Ÿ ×œ×”×™×¨×©× ×œ×œ× ×”×¡×›×ž×” לרשיון" + +#: lib/command.php:418 +#, fuzzy +msgid "Already repeated that notice" +msgstr "כבר נכנסת למערכת!" + +#: lib/command.php:426 #, fuzzy, php-format -msgid "Notice from %s repeated." +msgid "Notice from %s repeated" msgstr "הודעות" -#: lib/command.php:437 +#: lib/command.php:428 #, fuzzy msgid "Error repeating notice." msgstr "בעיה בשמירת ההודעה." -#: lib/command.php:491 +#: lib/command.php:482 #, php-format -msgid "Notice too long - maximum is %1$d characters, you sent %2$d." +msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:500 +#: lib/command.php:491 #, fuzzy, php-format -msgid "Reply to %s sent." +msgid "Reply to %s sent" msgstr "תגובת עבור %s" -#: lib/command.php:502 +#: lib/command.php:493 #, fuzzy msgid "Error saving notice." msgstr "בעיה בשמירת ההודעה." -#: lib/command.php:556 -msgid "Specify the name of the user to subscribe to." +#: lib/command.php:547 +msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:563 +#: lib/command.php:554 #, php-format msgid "Subscribed to %s" msgstr "" -#: lib/command.php:584 -msgid "Specify the name of the user to unsubscribe from." +#: lib/command.php:575 +msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:591 +#: lib/command.php:582 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:609 lib/command.php:632 +#: lib/command.php:600 lib/command.php:623 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:612 +#: lib/command.php:603 msgid "Notification off." msgstr "" -#: lib/command.php:614 +#: lib/command.php:605 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:635 +#: lib/command.php:626 msgid "Notification on." msgstr "" -#: lib/command.php:637 +#: lib/command.php:628 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:650 -msgid "Login command is disabled." +#: lib/command.php:641 +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:652 #, php-format -msgid "This link is useable only once, and is good for only 2 minutes: %s." +msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:685 +#: lib/command.php:668 #, fuzzy msgid "You are not subscribed to anyone." msgstr "×œ× ×©×œ×—× ×• ×לינו ×ת הפרופיל ×”×–×”" -#: lib/command.php:687 +#: lib/command.php:670 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:690 #, fuzzy msgid "No one is subscribed to you." msgstr "הרשמה מרוחקת" -#: lib/command.php:709 +#: lib/command.php:692 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:712 #, fuzzy msgid "You are not a member of any groups." msgstr "×œ× ×©×œ×—× ×• ×לינו ×ת הפרופיל ×”×–×”" -#: lib/command.php:731 +#: lib/command.php:714 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:728 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4588,20 +4958,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:199 +#: lib/common.php:131 #, fuzzy msgid "No configuration file found. " msgstr "×ין קוד ×ישור." -#: lib/common.php:200 +#: lib/common.php:132 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:201 +#: lib/common.php:134 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:202 +#: lib/common.php:135 msgid "Go to the installer." msgstr "" @@ -4617,6 +4987,15 @@ msgstr "" msgid "Updates by SMS" msgstr "" +#: lib/connectsettingsaction.php:120 +#, fuzzy +msgid "Connections" +msgstr "התחבר" + +#: lib/connectsettingsaction.php:121 +msgid "Authorized connected applications" +msgstr "" + #: lib/dberroraction.php:60 msgid "Database error" msgstr "" @@ -4808,11 +5187,16 @@ msgstr "" msgid "kB" msgstr "" -#: lib/jabber.php:191 +#: lib/jabber.php:202 #, php-format msgid "[%s]" msgstr "" +#: lib/jabber.php:385 +#, php-format +msgid "Unknown inbox source %d." +msgstr "" + #: lib/joinform.php:114 #, fuzzy msgid "Join" @@ -4879,22 +5263,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 @@ -5080,7 +5452,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 @@ -5089,7 +5461,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 @@ -5099,7 +5471,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 @@ -5135,16 +5507,18 @@ msgstr "" #: lib/noticeform.php:212 #, fuzzy -msgid "Share my location." -msgstr "שמירת הפרופיל נכשלה." - -#: lib/noticeform.php:214 -#, fuzzy -msgid "Do not share my location." +msgid "Share my location" msgstr "שמירת הפרופיל נכשלה." #: lib/noticeform.php:215 -msgid "Hide this info" +#, fuzzy +msgid "Do not share my location" +msgstr "שמירת הפרופיל נכשלה." + +#: lib/noticeform.php:216 +msgid "" +"Sorry, retrieving your geo location is taking longer than expected, please " +"try again later" msgstr "" #: lib/noticelist.php:428 @@ -5422,25 +5796,25 @@ msgstr "" msgid "User has blocked you." msgstr "למשתמש ×ין פרופיל." -#: lib/subs.php:60 +#: lib/subs.php:63 msgid "Could not subscribe." msgstr "" -#: lib/subs.php:79 +#: lib/subs.php:82 msgid "Could not subscribe other to you." msgstr "" -#: lib/subs.php:128 +#: lib/subs.php:137 #, fuzzy msgid "Not subscribed!" msgstr "×œ× ×ž× ×•×™!" -#: lib/subs.php:133 +#: lib/subs.php:142 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "מחיקת המנוי ×œ× ×”×¦×œ×™×—×”." -#: lib/subs.php:146 +#: lib/subs.php:158 msgid "Couldn't delete subscription." msgstr "מחיקת המנוי ×œ× ×”×¦×œ×™×—×”." @@ -5454,10 +5828,6 @@ msgstr "" msgid "People Tagcloud as tagged" msgstr "" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "" - #: lib/tagcloudsection.php:56 #, fuzzy msgid "None" @@ -5524,47 +5894,47 @@ msgstr "הודעה חדשה" msgid "Moderate" msgstr "" -#: lib/util.php:837 +#: lib/util.php:875 msgid "a few seconds ago" msgstr "לפני מספר שניות" -#: lib/util.php:839 +#: lib/util.php:877 msgid "about a minute ago" msgstr "לפני כדקה" -#: lib/util.php:841 +#: lib/util.php:879 #, php-format msgid "about %d minutes ago" msgstr "לפני ×›-%d דקות" -#: lib/util.php:843 +#: lib/util.php:881 msgid "about an hour ago" msgstr "לפני כשעה" -#: lib/util.php:845 +#: lib/util.php:883 #, php-format msgid "about %d hours ago" msgstr "לפני ×›-%d שעות" -#: lib/util.php:847 +#: lib/util.php:885 msgid "about a day ago" msgstr "לפני כיו×" -#: lib/util.php:849 +#: lib/util.php:887 #, php-format msgid "about %d days ago" msgstr "לפני ×›-%d ימי×" -#: lib/util.php:851 +#: lib/util.php:889 msgid "about a month ago" msgstr "לפני כחודש" -#: lib/util.php:853 +#: lib/util.php:891 #, php-format msgid "about %d months ago" msgstr "לפני ×›-%d חודשי×" -#: lib/util.php:855 +#: lib/util.php:893 msgid "about a year ago" msgstr "לפני כשנה" @@ -5580,5 +5950,5 @@ msgstr "" #: scripts/xmppdaemon.php:301 #, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" diff --git a/locale/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po index 4d1c45e573..0a2f05cb3a 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-10 00:46+0000\n" -"PO-Revision-Date: 2010-01-10 00:48:04+0000\n" +"POT-Creation-Date: 2010-01-15 19:15+0000\n" +"PO-Revision-Date: 2010-01-16 17:52:17+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60878); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r61138); 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" @@ -35,25 +35,30 @@ msgstr "Strona njeeksistuje" #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 +#: actions/apistatusesupdate.php:149 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 #: 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 #: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 -#: lib/command.php:163 lib/command.php:311 lib/command.php:364 -#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/command.php:163 lib/command.php:302 lib/command.php:355 +#: lib/command.php:401 lib/command.php:462 lib/command.php:518 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/subs.php:34 lib/subs.php:125 msgid "No such user." msgstr "Wužiwar njeeksistuje" +#: actions/all.php:84 +#, php-format +msgid "%1$s and friends, page %2$d" +msgstr "%1$s a pÅ™ećeljo, strona %2$d" + #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 +#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -105,7 +110,7 @@ msgstr "" msgid "You and friends" msgstr "Ty a pÅ™ećeljo" -#: actions/allrss.php:119 actions/apitimelinefriends.php:122 +#: actions/allrss.php:119 actions/apitimelinefriends.php:121 #: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" @@ -116,6 +121,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:155 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." @@ -129,7 +151,7 @@ msgstr "API-metoda njenamakana." #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:114 +#: actions/apistatusesupdate.php:119 msgid "This method requires a POST." msgstr "Tuta metoda wužaduje sej POST." @@ -158,8 +180,9 @@ msgstr "Profil njeje so skÅ‚adować daÅ‚." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257 -#: actions/designadminpanel.php:122 actions/newnotice.php:94 +#: actions/apistatusesupdate.php:132 actions/avatarsettings.php:257 +#: actions/designadminpanel.php:122 actions/editapplication.php:118 +#: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format msgid "" @@ -171,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 msgid "Unable to save your design settings." msgstr "" @@ -211,26 +237,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!" @@ -254,16 +260,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." @@ -283,8 +289,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." @@ -316,7 +322,8 @@ msgstr "PÅ™imjeno so hižo wužiwa. Spytaj druhe." msgid "Not a valid nickname." msgstr "Žane pÅ‚aćiwe pÅ™imjeno." -#: actions/apigroupcreate.php:196 actions/editgroup.php:195 +#: actions/apigroupcreate.php:196 actions/editapplication.php:212 +#: actions/editgroup.php:195 actions/newapplication.php:200 #: actions/newgroup.php:139 actions/profilesettings.php:222 #: actions/register.php:217 msgid "Homepage is not a valid URL." @@ -328,7 +335,8 @@ msgstr "Startowa strona njeje pÅ‚aćiwy URL." msgid "Full name is too long (max 255 chars)." msgstr "DospoÅ‚ne mjeno je pÅ™edoÅ‚ho (maks. 255 znamjeÅ¡kow)." -#: actions/apigroupcreate.php:213 +#: actions/apigroupcreate.php:213 actions/editapplication.php:187 +#: actions/newapplication.php:169 #, php-format msgid "Description is too long (max %d chars)." msgstr "Wopisanje je pÅ™edoÅ‚ho (maks. %d znamjeÅ¡kow)." @@ -368,7 +376,7 @@ msgstr "Alias njemóže samsny kaž pÅ™imjeno być." msgid "Group not found!" msgstr "Skupina njenamakana!" -#: actions/apigroupjoin.php:110 lib/command.php:217 +#: actions/apigroupjoin.php:110 actions/joingroup.php:90 msgid "You are already a member of that group." msgstr "Sy hižo ÄÅ‚on teje skupiny." @@ -376,19 +384,19 @@ msgstr "Sy hižo ÄÅ‚on teje skupiny." msgid "You have been blocked from that group by the admin." msgstr "" -#: actions/apigroupjoin.php:138 lib/command.php:234 -#, fuzzy, php-format +#: actions/apigroupjoin.php:138 actions/joingroup.php:124 +#, php-format msgid "Could not join user %1$s to group %2$s." -msgstr "Skupina njeje so daÅ‚a aktualizować." +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/leavegroup.php:127 -#, fuzzy, php-format +#: actions/apigroupleave.php:124 actions/leavegroup.php:119 +#, php-format msgid "Could not remove user %1$s from group %2$s." -msgstr "Skupina njeje so daÅ‚a aktualizować." +msgstr "NjebÄ› móžno wužiwarja %1$s ze skupiny %2$s wotstronić." #: actions/apigrouplist.php:95 #, php-format @@ -405,6 +413,97 @@ msgstr "" msgid "groups on %s" msgstr "skupiny na %s" +#: actions/apioauthauthorize.php:108 actions/apioauthauthorize.php:114 +msgid "Bad request." +msgstr "" + +#: actions/apioauthauthorize.php:134 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:115 actions/makeadmin.php:66 +#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 +#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:139 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 +#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/subscribe.php:46 actions/tagother.php:166 +#: 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 "" + +#: actions/apioauthauthorize.php:146 +msgid "Invalid nickname / password!" +msgstr "NjepÅ‚aćiwe pÅ™imjeno abo hesÅ‚o!" + +#: actions/apioauthauthorize.php:170 +msgid "DB error deleting OAuth app user." +msgstr "" + +#: actions/apioauthauthorize.php:196 +msgid "DB error inserting OAuth app user." +msgstr "Zmylk datoweje banki pÅ™i zasunjenju wužiwarja OAuth-aplikacije." + +#: actions/apioauthauthorize.php:231 +#, php-format +msgid "" +"The request token %s has been authorized. Please exchange it for an access " +"token." +msgstr "" + +#: actions/apioauthauthorize.php:241 +#, php-format +msgid "The request token %s has been denied." +msgstr "" + +#: actions/apioauthauthorize.php:246 actions/avatarsettings.php:281 +#: actions/designadminpanel.php:103 actions/editapplication.php:139 +#: actions/emailsettings.php:256 actions/grouplogo.php:319 +#: actions/imsettings.php:220 actions/newapplication.php:121 +#: actions/oauthconnectionssettings.php:151 actions/recoverpassword.php:44 +#: actions/smssettings.php:248 lib/designsettings.php:304 +msgid "Unexpected form submission." +msgstr "" + +#: actions/apioauthauthorize.php:273 +msgid "An application would like to connect to your account" +msgstr "" + +#: actions/apioauthauthorize.php:290 +msgid "Allow or deny access" +msgstr "" + +#: actions/apioauthauthorize.php:320 lib/action.php:435 +msgid "Account" +msgstr "Konto" + +#: actions/apioauthauthorize.php:323 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/apioauthauthorize.php:326 actions/login.php:233 +#: actions/register.php:429 lib/accountsettingsaction.php:116 +msgid "Password" +msgstr "HesÅ‚o" + +#: actions/apioauthauthorize.php:338 +msgid "Deny" +msgstr "Wotpokazać" + +#: actions/apioauthauthorize.php:344 +msgid "Allow" +msgstr "Dowolić" + +#: actions/apioauthauthorize.php:361 +msgid "Allow or deny access to your account information." +msgstr "" + #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." msgstr "Tuta metoda wužaduje sej POST abo DELETE." @@ -418,11 +517,11 @@ msgstr "NjemóžeÅ¡ status druheho wužiwarja zniÄić." msgid "No such notice." msgstr "Zdźělenka njeeksistuje." -#: actions/apistatusesretweet.php:83 lib/command.php:422 +#: actions/apistatusesretweet.php:83 msgid "Cannot repeat your own notice." msgstr "Njemóžno twoju zdźělenku wospjetować." -#: actions/apistatusesretweet.php:91 lib/command.php:427 +#: actions/apistatusesretweet.php:91 msgid "Already repeated that notice." msgstr "Tuta zdźělenka bu hižo wospjetowana." @@ -434,17 +533,17 @@ msgstr "Status zniÄeny." msgid "No status with that ID found." msgstr "Žadyn status z tym ID namakany." -#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:162 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "To je pÅ™edoÅ‚ho. Maksimalna wulkosć zdźělenki je %d znamjeÅ¡kow." -#: actions/apistatusesupdate.php:198 +#: actions/apistatusesupdate.php:203 msgid "Not found" msgstr "Njenamakany" -#: actions/apistatusesupdate.php:221 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:226 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -528,8 +627,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." @@ -553,8 +655,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" @@ -586,29 +688,6 @@ 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/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 -#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 -#: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 -#: actions/subscribe.php:46 actions/tagother.php:166 -#: 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 "" - -#: actions/avatarsettings.php:281 actions/designadminpanel.php:103 -#: actions/emailsettings.php:256 actions/grouplogo.php:319 -#: actions/imsettings.php:220 actions/recoverpassword.php:44 -#: actions/smssettings.php:248 lib/designsettings.php:304 -msgid "Unexpected form submission." -msgstr "" - #: actions/avatarsettings.php:328 msgid "Pick a square area of the image to be your avatar" msgstr "" @@ -667,19 +746,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:260 +msgid "No such group." +msgstr "Skupina njeeksistuje." #: actions/blockedfromgroup.php:90 #, php-format @@ -687,9 +762,9 @@ msgid "%s blocked profiles" msgstr "" #: actions/blockedfromgroup.php:93 -#, fuzzy, php-format +#, php-format msgid "%1$s blocked profiles, page %2$d" -msgstr "%s a pÅ™ećeljo, bok %d" +msgstr "%1$s zablokowa profile, stronu %2$d" #: actions/blockedfromgroup.php:108 msgid "A list of the users blocked from joining this group." @@ -746,7 +821,7 @@ msgid "Couldn't delete email confirmation." msgstr "" #: actions/confirmaddress.php:144 -msgid "Confirm Address" +msgid "Confirm address" msgstr "Adresu wobkrućić" #: actions/confirmaddress.php:159 @@ -799,10 +874,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ć." @@ -933,7 +1004,8 @@ msgstr "Na standard wróćo stajić" #: actions/pathsadminpanel.php:324 actions/profilesettings.php:174 #: actions/siteadminpanel.php:388 actions/smssettings.php:181 #: actions/subscriptions.php:203 actions/tagother.php:154 -#: actions/useradminpanel.php:313 lib/designsettings.php:256 +#: actions/useradminpanel.php:313 lib/applicationeditform.php:335 +#: lib/applicationeditform.php:336 lib/designsettings.php:256 #: lib/groupeditform.php:202 msgid "Save" msgstr "SkÅ‚adować" @@ -954,6 +1026,76 @@ msgstr "K faworitam pÅ™idać" msgid "No such document." msgstr "Dokument njeeksistuje." +#: actions/editapplication.php:54 lib/applicationeditform.php:136 +msgid "Edit application" +msgstr "" + +#: actions/editapplication.php:66 +msgid "You must be logged in to edit an application." +msgstr "DyrbiÅ¡ pÅ™izjewjeny być, zo by skupinu wobdźěłaÅ‚." + +#: actions/editapplication.php:77 actions/showapplication.php:94 +msgid "You are not the owner of this application." +msgstr "Njejsy wobsedźer tuteje aplikacije." + +#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:163 +#: actions/showapplication.php:87 +msgid "No such application." +msgstr "Aplikacija njeeksistuje." + +#: actions/editapplication.php:127 actions/newapplication.php:110 +#: actions/showapplication.php:118 lib/action.php:1167 +msgid "There was a problem with your session token." +msgstr "" + +#: actions/editapplication.php:161 +msgid "Use this form to edit your application." +msgstr "Wužij tutón formular, zo by aplikaciju wobdźěłaÅ‚." + +#: actions/editapplication.php:177 actions/newapplication.php:159 +msgid "Name is required." +msgstr "Mjeno je trÄ›bne." + +#: actions/editapplication.php:180 actions/newapplication.php:162 +msgid "Name is too long (max 255 chars)." +msgstr "Mjeno je pÅ™edoÅ‚ho (maks. 255 znamjeÅ¡kow)." + +#: actions/editapplication.php:183 actions/newapplication.php:165 +msgid "Description is required." +msgstr "Wopisanje je trÄ›bne." + +#: actions/editapplication.php:191 +msgid "Source URL is too long." +msgstr "" + +#: actions/editapplication.php:197 actions/newapplication.php:182 +msgid "Source URL is not valid." +msgstr "URL žórÅ‚a pÅ‚aćiwy njeje." + +#: actions/editapplication.php:200 actions/newapplication.php:185 +msgid "Organization is required." +msgstr "" + +#: actions/editapplication.php:203 actions/newapplication.php:188 +msgid "Organization is too long (max 255 chars)." +msgstr "Mjeno organizacije je pÅ™edoÅ‚ho (maks. 255 znamjeÅ¡kow)." + +#: actions/editapplication.php:206 actions/newapplication.php:191 +msgid "Organization homepage is required." +msgstr "" + +#: actions/editapplication.php:215 actions/newapplication.php:203 +msgid "Callback is too long." +msgstr "" + +#: actions/editapplication.php:222 actions/newapplication.php:212 +msgid "Callback URL is not valid." +msgstr "" + +#: actions/editapplication.php:255 +msgid "Could not update application." +msgstr "Aplikacija njeda so aktualizować." + #: actions/editgroup.php:56 #, php-format msgid "Edit %s group" @@ -965,7 +1107,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 @@ -990,7 +1132,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 @@ -1020,12 +1162,13 @@ msgid "" msgstr "" #: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 +#: actions/smssettings.php:126 lib/applicationeditform.php:333 +#: lib/applicationeditform.php:334 msgid "Cancel" msgstr "PÅ™etorhnyć" #: actions/emailsettings.php:121 -msgid "Email Address" +msgid "Email address" msgstr "E-mejlowa adresa" #: actions/emailsettings.php:123 @@ -1099,9 +1242,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." @@ -1275,13 +1419,6 @@ 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:79 msgid "No such file." msgstr "Dataja njeeksistuje." @@ -1298,7 +1435,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." @@ -1343,9 +1480,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." @@ -1366,12 +1503,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." @@ -1388,6 +1519,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 "" @@ -1406,9 +1541,9 @@ msgid "%s group members" msgstr "" #: actions/groupmembers.php:96 -#, fuzzy, php-format +#, php-format msgid "%1$s group members, page %2$d" -msgstr "%s abonentow, strona %d" +msgstr "%1$s skupinskich ÄÅ‚onow, strona %2$d" #: actions/groupmembers.php:111 msgid "A list of the users in this group." @@ -1506,7 +1641,7 @@ msgid "Error removing the block." msgstr "" #: actions/imsettings.php:59 -msgid "IM Settings" +msgid "IM settings" msgstr "IM-nastajenja" #: actions/imsettings.php:70 @@ -1532,7 +1667,7 @@ msgid "" msgstr "" #: actions/imsettings.php:124 -msgid "IM Address" +msgid "IM address" msgstr "IM-adresa" #: actions/imsettings.php:126 @@ -1624,7 +1759,7 @@ 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 lib/command.php:315 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -1667,7 +1802,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:234 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236 msgid "Send" msgstr "PósÅ‚ać" @@ -1711,16 +1846,7 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "" -#: actions/joingroup.php:90 -msgid "You are already a member of that group" -msgstr "" - -#: actions/joingroup.php:128 -#, fuzzy, php-format -msgid "Could not join user %1$s to group %2$s" -msgstr "Wužiwarja za skupinu blokować" - -#: actions/joingroup.php:135 lib/command.php:239 +#: actions/joingroup.php:131 #, php-format msgid "%1$s joined group %2$s" msgstr "" @@ -1729,74 +1855,55 @@ msgstr "" msgid "You must be logged in to leave a group." msgstr "DyrbiÅ¡ pÅ™izjewjeny być, zo by skupinu wopušćiÅ‚." -#: actions/leavegroup.php:90 lib/command.php:268 +#: actions/leavegroup.php:90 lib/command.php:265 msgid "You are not a member of that group." msgstr "Njejsy ÄÅ‚on teje skupiny." -#: actions/leavegroup.php:119 lib/command.php:278 -msgid "Could not find membership record." -msgstr "" - -#: actions/leavegroup.php:134 lib/command.php:289 +#: actions/leavegroup.php:127 #, php-format 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:460 +#: 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 -#: lib/groupeditform.php:152 lib/userprofile.php:131 -msgid "Nickname" -msgstr "PÅ™imjeno" - -#: actions/login.php:253 actions/register.php:428 -#: 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]" @@ -1808,24 +1915,44 @@ msgid "Only an admin can make another user an admin." msgstr "Jenož administrator móže druheho wužiwarja k administratorej Äinić." #: actions/makeadmin.php:95 -#, fuzzy, php-format +#, php-format msgid "%1$s is already an admin for group \"%2$s\"." -msgstr "%s je hižo administrator za skupinu \"%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 %1$s in group %2$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 -#, fuzzy, php-format -msgid "Can't make %1$s an admin for group %2$s" -msgstr "%s je hižo administrator za skupinu \"%s\"." +#, php-format +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" msgstr "Žadyn aktualny status" +#: actions/newapplication.php:52 +msgid "New application" +msgstr "" + +#: actions/newapplication.php:64 +msgid "You must be logged in to register an application." +msgstr "DyrbiÅ¡ pÅ™izjewjeny być, zo by aplikaciju registrowaÅ‚." + +#: actions/newapplication.php:143 +msgid "Use this form to register a new application." +msgstr "Wužij tutón formular, zo by nowu aplikaciju registrowaÅ‚." + +#: actions/newapplication.php:173 +msgid "Source URL is required." +msgstr "" + +#: actions/newapplication.php:255 actions/newapplication.php:264 +msgid "Could not create application." +msgstr "Aplikacija njeda so wutworić." + #: actions/newgroup.php:53 msgid "New group" msgstr "Nowa skupina" @@ -1838,12 +1965,12 @@ msgstr "Wužij tutón formular, zo by nowu skupinu wutworiÅ‚." msgid "New message" msgstr "Nowa powÄ›sć" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 msgid "You can't send a message to this user." msgstr "NjemóžeÅ¡ tutomu wužiwarju powÄ›sć pósÅ‚ać." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:484 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 +#: lib/command.php:475 msgid "No content!" msgstr "Žadyn wobsah!" @@ -1851,7 +1978,7 @@ msgstr "Žadyn wobsah!" msgid "No recipient specified." msgstr "Žadyn pÅ™ijimowar podaty." -#: actions/newmessage.php:164 lib/command.php:370 +#: actions/newmessage.php:164 lib/command.php:361 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -1862,8 +1989,8 @@ msgstr "PowÄ›sć pósÅ‚ana" #: 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" @@ -1930,6 +2057,48 @@ msgstr "" msgid "Nudge sent!" msgstr "" +#: actions/oauthappssettings.php:59 +msgid "You must be logged in to list your applications." +msgstr "DyrbiÅ¡ pÅ™izjewjeny być, zo by swoje aplikacije nalistowaÅ‚." + +#: actions/oauthappssettings.php:74 +msgid "OAuth applications" +msgstr "Aplikacije OAuth" + +#: actions/oauthappssettings.php:85 +msgid "Applications you have registered" +msgstr "" + +#: actions/oauthappssettings.php:135 +#, php-format +msgid "You have not registered any applications yet." +msgstr "" + +#: actions/oauthconnectionssettings.php:71 +msgid "Connected applications" +msgstr "" + +#: actions/oauthconnectionssettings.php:87 +msgid "You have allowed the following applications to access you account." +msgstr "" + +#: actions/oauthconnectionssettings.php:170 +msgid "You are not a user of that application." +msgstr "Njejsy wužiwar tuteje aplikacije." + +#: actions/oauthconnectionssettings.php:180 +msgid "Unable to revoke access for app: " +msgstr "" + +#: actions/oauthconnectionssettings.php:192 +#, php-format +msgid "You have not authorized any applications to use your account." +msgstr "" + +#: actions/oauthconnectionssettings.php:205 +msgid "Developers can edit the registration settings for their applications " +msgstr "" + #: actions/oembed.php:79 actions/shownotice.php:100 msgid "Notice has no profile" msgstr "Zdźělenka nima profil" @@ -1947,8 +2116,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:1038 +#: lib/api.php:1066 lib/api.php:1176 msgid "Not a supported data format." msgstr "Njeje podpÄ›rany datowy format." @@ -1961,7 +2130,7 @@ msgid "Notice Search" msgstr "Zdźělenku pytać" #: actions/othersettings.php:60 -msgid "Other Settings" +msgid "Other settings" msgstr "Druhe nastajenja" #: actions/othersettings.php:71 @@ -1992,6 +2161,26 @@ msgstr "" msgid "URL shortening service is too long (max 50 chars)." msgstr "" +#: actions/otp.php:69 +msgid "No user ID specified." +msgstr "Žadyn wužiwarski ID podaty." + +#: actions/otp.php:83 +msgid "No login token specified." +msgstr "Žane pÅ™izjewjenske znamjeÅ¡ko podate." + +#: actions/otp.php:90 +msgid "No login token requested." +msgstr "" + +#: actions/otp.php:95 +msgid "Invalid login token specified." +msgstr "NjepÅ‚aćiwe pÅ™izjewjenske znamjeÅ¡ko podate." + +#: actions/otp.php:104 +msgid "Login token expired." +msgstr "PÅ™izjewjenske znamjeÅ¡ko spadnjene." + #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" @@ -2026,7 +2215,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ć" @@ -2188,7 +2377,7 @@ msgid "When to use SSL" msgstr "" #: actions/pathsadminpanel.php:308 -msgid "SSL Server" +msgid "SSL server" msgstr "SSL-serwer" #: actions/pathsadminpanel.php:309 @@ -2246,42 +2435,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 -#: lib/groupeditform.php:161 +#: actions/profilesettings.php:115 actions/register.php:453 +#: lib/applicationeditform.php:230 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 "" @@ -2573,7 +2762,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ć." @@ -2585,7 +2774,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:457 +#: actions/register.php:114 actions/register.php:503 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Registrować" @@ -2598,64 +2787,60 @@ 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, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -2674,7 +2859,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.)" @@ -2812,6 +2997,80 @@ msgstr "" msgid "User is already sandboxed." msgstr "" +#: actions/showapplication.php:82 +msgid "You must be logged in to view an application." +msgstr "DyrbiÅ¡ pÅ™izjewjeny być, zo by sej aplikaciju wobhladaÅ‚." + +#: actions/showapplication.php:158 +msgid "Application profile" +msgstr "Aplikaciski profil" + +#: actions/showapplication.php:160 lib/applicationeditform.php:182 +msgid "Icon" +msgstr "" + +#: actions/showapplication.php:170 actions/version.php:195 +#: lib/applicationeditform.php:197 +msgid "Name" +msgstr "Mjeno" + +#: actions/showapplication.php:179 lib/applicationeditform.php:224 +msgid "Organization" +msgstr "Organizacija" + +#: actions/showapplication.php:188 actions/version.php:198 +#: lib/applicationeditform.php:211 lib/groupeditform.php:172 +msgid "Description" +msgstr "Wopisanje" + +#: actions/showapplication.php:193 actions/showgroup.php:429 +#: lib/profileaction.php:174 +msgid "Statistics" +msgstr "Statistika" + +#: actions/showapplication.php:204 +#, php-format +msgid "created by %1$s - %2$s access by default - %3$d users" +msgstr "" + +#: actions/showapplication.php:214 +msgid "Application actions" +msgstr "" + +#: actions/showapplication.php:233 +msgid "Reset key & secret" +msgstr "" + +#: actions/showapplication.php:241 +msgid "Application info" +msgstr "" + +#: actions/showapplication.php:243 +msgid "Consumer key" +msgstr "" + +#: actions/showapplication.php:248 +msgid "Consumer secret" +msgstr "" + +#: actions/showapplication.php:253 +msgid "Request token URL" +msgstr "" + +#: actions/showapplication.php:258 +msgid "Access token URL" +msgstr "" + +#: actions/showapplication.php:263 +msgid "Authorize URL" +msgstr "URL awtorizować" + +#: actions/showapplication.php:268 +msgid "" +"Note: We support HMAC-SHA1 signatures. We do not support the plaintext " +"signature method." +msgstr "" + #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "" @@ -2909,7 +3168,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)" @@ -2917,10 +3176,6 @@ msgstr "(Žadyn)" msgid "All members" msgstr "WÅ¡itcy ÄÅ‚onojo" -#: actions/showgroup.php:429 lib/profileaction.php:174 -msgid "Statistics" -msgstr "Statistika" - #: actions/showgroup.php:432 msgid "Created" msgstr "Wutworjeny" @@ -2976,9 +3231,9 @@ msgid " tagged %s" msgstr "" #: actions/showstream.php:122 -#, fuzzy, php-format +#, php-format msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" -msgstr "Kanal za pÅ™ećelow wužiwarja %s (RSS 1.0)" +msgstr "PowÄ›sćowy kanal za %1$s je %2$s (RSS 1.0) markÄ›rowaÅ‚" #: actions/showstream.php:129 #, php-format @@ -3057,13 +3312,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." @@ -3242,8 +3497,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 @@ -3271,8 +3526,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" @@ -3355,9 +3610,9 @@ msgid "%s subscribers" msgstr "%s abonentow" #: actions/subscribers.php:52 -#, fuzzy, php-format +#, php-format msgid "%1$s subscribers, page %2$d" -msgstr "%s abonentow, strona %d" +msgstr "%1$s abonentow, strona %2$d" #: actions/subscribers.php:63 msgid "These are the people who listen to your notices." @@ -3392,9 +3647,9 @@ msgid "%s subscriptions" msgstr "%s abonementow" #: actions/subscriptions.php:54 -#, fuzzy, php-format +#, php-format msgid "%1$s subscriptions, page %2$d" -msgstr "%s abonementow, strona %d" +msgstr "%1$s abonementow, strona %2$d" #: actions/subscriptions.php:65 msgid "These are the people whose notices you listen to." @@ -3507,10 +3762,6 @@ 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" @@ -3701,10 +3952,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 "" @@ -3734,9 +3981,9 @@ msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" #: actions/version.php:73 -#, fuzzy, php-format +#, php-format msgid "StatusNet %s" -msgstr "Statistika" +msgstr "StatusNet %s" #: actions/version.php:153 #, php-format @@ -3746,9 +3993,8 @@ msgid "" msgstr "" #: actions/version.php:157 -#, fuzzy msgid "StatusNet" -msgstr "Status zniÄeny." +msgstr "StatusNet" #: actions/version.php:161 msgid "Contributors" @@ -3781,42 +4027,48 @@ msgstr "" msgid "Plugins" msgstr "" -#: actions/version.php:195 -#, fuzzy -msgid "Name" -msgstr "PÅ™imjeno" - #: actions/version.php:196 lib/action.php:741 -#, fuzzy msgid "Version" -msgstr "Posedźenja" +msgstr "Wersija" #: actions/version.php:197 -#, fuzzy msgid "Author(s)" -msgstr "Awtor" +msgstr "Awtorojo" -#: actions/version.php:198 lib/groupeditform.php:172 -msgid "Description" -msgstr "Wopisanje" - -#: classes/File.php:137 +#: 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/Group_member.php:41 +msgid "Group join failed." +msgstr "PÅ™izamknjenje k skupinje je so njeporadźiÅ‚o." + +#: classes/Group_member.php:53 +msgid "Not part of group." +msgstr "Njeje dźěl skupiny." + +#: classes/Group_member.php:60 +msgid "Group leave failed." +msgstr "Wopušćenje skupiny je so njeporadźiÅ‚o." + +#: classes/Login_token.php:76 +#, php-format +msgid "Could not create login token for %s" +msgstr "Njeje móžno byÅ‚o, pÅ™izjewjenske znamjeÅ¡ko za %s wutworić" + #: classes/Message.php:45 msgid "You are banned from sending direct messages." msgstr "" @@ -3829,49 +4081,49 @@ msgstr "" msgid "Could not update message with new URI." msgstr "" -#: classes/Notice.php:172 +#: classes/Notice.php:171 #, php-format msgid "DB error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:226 +#: classes/Notice.php:225 msgid "Problem saving notice. Too long." msgstr "" -#: classes/Notice.php:230 +#: classes/Notice.php:229 msgid "Problem saving notice. Unknown user." msgstr "" -#: classes/Notice.php:235 +#: classes/Notice.php:234 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:241 +#: classes/Notice.php:240 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:247 +#: classes/Notice.php:246 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:309 classes/Notice.php:334 +#: classes/Notice.php:305 classes/Notice.php:330 msgid "Problem saving notice." msgstr "" -#: classes/Notice.php:1034 +#: classes/Notice.php:1052 #, php-format msgid "DB error inserting reply: %s" msgstr "" -#: classes/Notice.php:1359 +#: classes/Notice.php:1423 #, php-format msgid "RT @%1$s %2$s" msgstr "" -#: classes/User.php:368 +#: classes/User.php:382 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" @@ -3912,6 +4164,11 @@ msgstr "Druhe" msgid "Other options" msgstr "Druhe opcije" +#: lib/action.php:144 +#, php-format +msgid "%1$s - %2$s" +msgstr "%1$s - %2$s" + #: lib/action.php:159 msgid "Untitled page" msgstr "Strona bjez titula" @@ -3928,10 +4185,6 @@ msgstr "" msgid "Personal profile and friends timeline" msgstr "" -#: lib/action.php:435 -msgid "Account" -msgstr "Konto" - #: lib/action.php:435 msgid "Change your email, avatar, password, profile" msgstr "" @@ -4081,18 +4334,13 @@ msgstr "" msgid "Before" msgstr "" -#: lib/action.php:1167 -msgid "There was a problem with your session token." -msgstr "" - #: lib/adminpanelaction.php:96 msgid "You cannot make changes to this site." msgstr "" #: lib/adminpanelaction.php:107 -#, fuzzy msgid "Changes to that panel are not allowed." -msgstr "Registracija njedowolena." +msgstr "ZmÄ›ny na tutym woknje njejsu dowolene." #: lib/adminpanelaction.php:206 msgid "showForm() not implemented." @@ -4118,6 +4366,67 @@ msgstr "" msgid "Paths configuration" msgstr "" +#: lib/applicationeditform.php:186 +msgid "Icon for this application" +msgstr "" + +#: lib/applicationeditform.php:206 +#, php-format +msgid "Describe your application in %d characters" +msgstr "Wopisaj swoju aplikaciju z %d znamjeÅ¡kami" + +#: lib/applicationeditform.php:209 +msgid "Describe your application" +msgstr "Wopisaj swoju aplikaciju" + +#: lib/applicationeditform.php:218 +msgid "Source URL" +msgstr "URL žórÅ‚a" + +#: lib/applicationeditform.php:220 +msgid "URL of the homepage of this application" +msgstr "" + +#: lib/applicationeditform.php:226 +msgid "Organization responsible for this application" +msgstr "" + +#: lib/applicationeditform.php:232 +msgid "URL for the homepage of the organization" +msgstr "" + +#: lib/applicationeditform.php:238 +msgid "URL to redirect to after authentication" +msgstr "" + +#: lib/applicationeditform.php:260 +msgid "Browser" +msgstr "" + +#: lib/applicationeditform.php:276 +msgid "Desktop" +msgstr "" + +#: lib/applicationeditform.php:277 +msgid "Type of application, browser or desktop" +msgstr "" + +#: lib/applicationeditform.php:299 +msgid "Read-only" +msgstr "" + +#: lib/applicationeditform.php:317 +msgid "Read-write" +msgstr "" + +#: lib/applicationeditform.php:318 +msgid "Default access for this application: read-only, or read-write" +msgstr "" + +#: lib/applicationlist.php:154 +msgid "Revoke" +msgstr "WotwoÅ‚ać" + #: lib/attachmentlist.php:87 msgid "Attachments" msgstr "" @@ -4138,15 +4447,13 @@ msgstr "" msgid "Tags for this attachment" msgstr "" -#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 -#, fuzzy +#: lib/authenticationplugin.php:214 lib/authenticationplugin.php:219 msgid "Password changing failed" -msgstr "HesÅ‚o zmÄ›njene" +msgstr "ZmÄ›njenje hesÅ‚a je so njeporadźiÅ‚o" -#: lib/authenticationplugin.php:197 -#, fuzzy +#: lib/authenticationplugin.php:229 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" @@ -4166,7 +4473,7 @@ msgstr "" #: lib/command.php:88 #, php-format -msgid "Could not find a user with nickname %s." +msgid "Could not find a user with nickname %s" msgstr "" #: lib/command.php:92 @@ -4175,7 +4482,7 @@ msgstr "" #: lib/command.php:99 #, php-format -msgid "Nudge sent to %s." +msgid "Nudge sent to %s" msgstr "" #: lib/command.php:126 @@ -4186,141 +4493,160 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:399 lib/command.php:460 -#, fuzzy -msgid "Notice with that id does not exist." -msgstr "" -"Wužiwar z tej e-mejlowej adresu abo tym wužiwarskim mjenom njeeksistuje." +#: lib/command.php:152 lib/command.php:390 lib/command.php:451 +msgid "Notice with that id does not exist" +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 "Wužiwar nima profil." +#: lib/command.php:168 lib/command.php:406 lib/command.php:467 +#: lib/command.php:523 +msgid "User has no last notice" +msgstr "Wužiwar nima poslednju powÄ›sć" #: lib/command.php:190 msgid "Notice marked as fave." msgstr "" -#: lib/command.php:284 -#, fuzzy, php-format -msgid "Could not remove user %1$s to group %2$s." -msgstr "Skupina njeje so daÅ‚a aktualizować." +#: lib/command.php:217 +msgid "You are already a member of that group" +msgstr "Sy hižo ÄÅ‚on teje skupiny" -#: lib/command.php:318 +#: lib/command.php:231 +#, php-format +msgid "Could not join user %s to group %s" +msgstr "NjebÄ› móžno wužiwarja %s skupinje %s pÅ™idać" + +#: lib/command.php:236 +#, php-format +msgid "%s joined group %s" +msgstr "%s je so k skupinje %s pÅ™izamknyÅ‚" + +#: lib/command.php:275 +#, php-format +msgid "Could not remove user %s to group %s" +msgstr "NjebÄ› móžno wužiwarja %s do skupiny %s pÅ™esunyć" + +#: lib/command.php:280 +#, php-format +msgid "%s left group %s" +msgstr "%s je skupinu %s wopušćiÅ‚" + +#: lib/command.php:309 #, php-format msgid "Fullname: %s" msgstr "DospoÅ‚ne mjeno: %s" -#: lib/command.php:321 +#: lib/command.php:312 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "MÄ›stno: %s" -#: lib/command.php:324 +#: lib/command.php:315 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "" -#: lib/command.php:327 +#: lib/command.php:318 #, php-format msgid "About: %s" msgstr "Wo: %s" -#: lib/command.php:358 +#: lib/command.php:349 #, php-format -msgid "Message too long - maximum is %1$d characters, you sent %2$d." +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 "Direktne powÄ›sće do %s" +#: lib/command.php:367 +#, php-format +msgid "Direct message to %s sent" +msgstr "Direktna powÄ›sć do %s pósÅ‚ana" -#: lib/command.php:378 +#: lib/command.php:369 msgid "Error sending direct message." msgstr "" -#: lib/command.php:435 -#, fuzzy, php-format -msgid "Notice from %s repeated." +#: lib/command.php:413 +msgid "Cannot repeat your own notice" +msgstr "NjemóžeÅ¡ swójsku powÄ›sć wospjetować" + +#: lib/command.php:418 +msgid "Already repeated that notice" +msgstr "Tuta zdźělenka bu hižo wospjetowana" + +#: lib/command.php:426 +#, php-format +msgid "Notice from %s repeated" msgstr "Zdźělenka wot %s wospjetowana" -#: lib/command.php:437 +#: lib/command.php:428 msgid "Error repeating notice." msgstr "Zmylk pÅ™i wospjetowanju zdźělenki" -#: lib/command.php:491 +#: lib/command.php:482 #, php-format -msgid "Notice too long - maximum is %1$d characters, you sent %2$d." +msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:500 -#, fuzzy, php-format -msgid "Reply to %s sent." -msgstr "Na tutu zdźělenku wotmoÅ‚wić" +#: lib/command.php:491 +#, php-format +msgid "Reply to %s sent" +msgstr "WotmoÅ‚wa na %s pósÅ‚ana" -#: lib/command.php:502 +#: lib/command.php:493 msgid "Error saving notice." msgstr "" -#: lib/command.php:556 -msgid "Specify the name of the user to subscribe to." +#: lib/command.php:547 +msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:563 +#: lib/command.php:554 #, php-format msgid "Subscribed to %s" msgstr "" -#: lib/command.php:584 -msgid "Specify the name of the user to unsubscribe from." +#: lib/command.php:575 +msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:591 +#: lib/command.php:582 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:609 lib/command.php:632 +#: lib/command.php:600 lib/command.php:623 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:612 +#: lib/command.php:603 msgid "Notification off." msgstr "" -#: lib/command.php:614 +#: lib/command.php:605 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:635 +#: lib/command.php:626 msgid "Notification on." msgstr "" -#: lib/command.php:637 +#: lib/command.php:628 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:650 -msgid "Login command is disabled." +#: lib/command.php:641 +msgid "Login command is disabled" msgstr "" -#: lib/command.php:664 -#, fuzzy, php-format -msgid "Could not create login token for %s." -msgstr "Njeje móžno byÅ‚o, pÅ™izjewjenske znamjeÅ¡ko za %s wutworić" - -#: lib/command.php:669 +#: lib/command.php:652 #, php-format -msgid "This link is useable only once, and is good for only 2 minutes: %s." +msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:685 +#: lib/command.php:668 msgid "You are not subscribed to anyone." msgstr "" -#: lib/command.php:687 +#: lib/command.php:670 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Sy tutu wosobu abonowaÅ‚:" @@ -4328,11 +4654,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:690 msgid "No one is subscribed to you." msgstr "" -#: lib/command.php:709 +#: lib/command.php:692 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Tuta wosoba je će abonowaÅ‚a:" @@ -4340,11 +4666,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:712 msgid "You are not a member of any groups." msgstr "" -#: lib/command.php:731 +#: lib/command.php:714 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Sy ÄÅ‚on tuteje skupiny:" @@ -4352,7 +4678,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:728 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4393,19 +4719,19 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:199 +#: lib/common.php:131 msgid "No configuration file found. " msgstr "Žana konfiguraciska dataja namakana. " -#: lib/common.php:200 +#: lib/common.php:132 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:201 +#: lib/common.php:134 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:202 +#: lib/common.php:135 msgid "Go to the installer." msgstr "" @@ -4421,6 +4747,14 @@ msgstr "" msgid "Updates by SMS" msgstr "" +#: lib/connectsettingsaction.php:120 +msgid "Connections" +msgstr "Zwiski" + +#: lib/connectsettingsaction.php:121 +msgid "Authorized connected applications" +msgstr "" + #: lib/dberroraction.php:60 msgid "Database error" msgstr "Zmylk w datowej bance" @@ -4603,11 +4937,16 @@ msgstr "MB" msgid "kB" msgstr "KB" -#: lib/jabber.php:191 +#: lib/jabber.php:202 #, php-format msgid "[%s]" msgstr "[%s]" +#: lib/jabber.php:385 +#, php-format +msgid "Unknown inbox source %d." +msgstr "Njeznate žórÅ‚o postoweho kašćika %d." + #: lib/joinform.php:114 msgid "Join" msgstr "" @@ -4665,24 +5004,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 @@ -4833,9 +5158,9 @@ msgid "Sorry, no incoming email allowed." msgstr "Wodaj, dochadźaće e-mejle njejsu dowolene." #: lib/mailhandler.php:228 -#, fuzzy, php-format +#, php-format msgid "Unsupported message type: %s" -msgstr "NjepodpÄ›rany format." +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." @@ -4868,7 +5193,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 @@ -4876,7 +5201,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 @@ -4886,7 +5211,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 @@ -4919,17 +5244,17 @@ msgid "Attach a file" msgstr "Dataju pÅ™ipowÄ›snyć" #: lib/noticeform.php:212 -#, fuzzy -msgid "Share my location." -msgstr "Nastajenja mÄ›stna njedachu so skÅ‚adować." - -#: lib/noticeform.php:214 -#, fuzzy -msgid "Do not share my location." -msgstr "Nastajenja mÄ›stna njedachu so skÅ‚adować." +msgid "Share my location" +msgstr "MÄ›stno dźělić" #: lib/noticeform.php:215 -msgid "Hide this info" +msgid "Do not share my location" +msgstr "Njedźěl moje mÄ›stno" + +#: lib/noticeform.php:216 +msgid "" +"Sorry, retrieving your geo location is taking longer than expected, please " +"try again later" msgstr "" #: lib/noticelist.php:428 @@ -5047,9 +5372,8 @@ msgid "Tags in %s's notices" msgstr "" #: lib/plugin.php:114 -#, fuzzy msgid "Unknown" -msgstr "Njeznata akcija" +msgstr "Njeznaty" #: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82 msgid "Subscriptions" @@ -5190,23 +5514,23 @@ msgstr "Hižo abonowany!" msgid "User has blocked you." msgstr "Wužiwar je će zablokowaÅ‚." -#: lib/subs.php:60 +#: lib/subs.php:63 msgid "Could not subscribe." msgstr "Abonowanje njebÄ› móžno" -#: lib/subs.php:79 +#: lib/subs.php:82 msgid "Could not subscribe other to you." msgstr "" -#: lib/subs.php:128 +#: lib/subs.php:137 msgid "Not subscribed!" msgstr "Njeje abonowany!" -#: lib/subs.php:133 +#: lib/subs.php:142 msgid "Couldn't delete self-subscription." msgstr "Sebjeabonement njeje so daÅ‚ zniÄić." -#: lib/subs.php:146 +#: lib/subs.php:158 msgid "Couldn't delete subscription." msgstr "Abonoment njeje so daÅ‚ zniÄić." @@ -5220,10 +5544,6 @@ msgstr "" msgid "People Tagcloud as tagged" msgstr "" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(žadyn)" - #: lib/tagcloudsection.php:56 msgid "None" msgstr "Žadyn" @@ -5284,47 +5604,47 @@ msgstr "PowÄ›sć" msgid "Moderate" msgstr "" -#: lib/util.php:837 +#: lib/util.php:875 msgid "a few seconds ago" msgstr "pÅ™ed něšto sekundami" -#: lib/util.php:839 +#: lib/util.php:877 msgid "about a minute ago" msgstr "pÅ™ed nÄ›hdźe jednej mjeÅ„Å¡inu" -#: lib/util.php:841 +#: lib/util.php:879 #, php-format msgid "about %d minutes ago" msgstr "pÅ™ed %d mjeÅ„Å¡inami" -#: lib/util.php:843 +#: lib/util.php:881 msgid "about an hour ago" msgstr "pÅ™ed nÄ›hdźe jednej hodźinu" -#: lib/util.php:845 +#: lib/util.php:883 #, php-format msgid "about %d hours ago" msgstr "pÅ™ed nÄ›hdźe %d hodźinami" -#: lib/util.php:847 +#: lib/util.php:885 msgid "about a day ago" msgstr "pÅ™ed nÄ›hdźe jednym dnjom" -#: lib/util.php:849 +#: lib/util.php:887 #, php-format msgid "about %d days ago" msgstr "pÅ™ed nÄ›hdźe %d dnjemi" -#: lib/util.php:851 +#: lib/util.php:889 msgid "about a month ago" msgstr "pÅ™ed nÄ›hdźe jednym mÄ›sacom" -#: lib/util.php:853 +#: lib/util.php:891 #, php-format msgid "about %d months ago" msgstr "pÅ™ed nÄ›hdźe %d mÄ›sacami" -#: lib/util.php:855 +#: lib/util.php:893 msgid "about a year ago" msgstr "pÅ™ed nÄ›hdźe jednym lÄ›tom" @@ -5342,5 +5662,5 @@ msgstr "" #: scripts/xmppdaemon.php:301 #, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" diff --git a/locale/ia/LC_MESSAGES/statusnet.po b/locale/ia/LC_MESSAGES/statusnet.po index 3e2e808680..6e32e96802 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-10 00:46+0000\n" -"PO-Revision-Date: 2010-01-10 00:48:08+0000\n" +"POT-Creation-Date: 2010-01-15 19:15+0000\n" +"PO-Revision-Date: 2010-01-15 19:17: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 (r60878); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r61101); 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" @@ -33,25 +33,30 @@ msgstr "Pagina non existe" #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 +#: actions/apistatusesupdate.php:149 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 #: 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 #: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 -#: lib/command.php:163 lib/command.php:311 lib/command.php:364 -#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/command.php:163 lib/command.php:302 lib/command.php:355 +#: lib/command.php:401 lib/command.php:462 lib/command.php:518 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/subs.php:34 lib/subs.php:125 msgid "No such user." msgstr "Usator non existe." +#: actions/all.php:84 +#, fuzzy, php-format +msgid "%1$s and friends, page %2$d" +msgstr "%s profilos blocate, pagina %d" + #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 +#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -111,7 +116,7 @@ msgstr "" msgid "You and friends" msgstr "Tu e amicos" -#: actions/allrss.php:119 actions/apitimelinefriends.php:122 +#: actions/allrss.php:119 actions/apitimelinefriends.php:121 #: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" @@ -122,6 +127,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:155 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." @@ -135,7 +157,7 @@ msgstr "Methodo API non trovate." #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:114 +#: actions/apistatusesupdate.php:119 msgid "This method requires a POST." msgstr "Iste methodo require un POST." @@ -166,8 +188,9 @@ msgstr "Non poteva salveguardar le profilo." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257 -#: actions/designadminpanel.php:122 actions/newnotice.php:94 +#: actions/apistatusesupdate.php:132 actions/avatarsettings.php:257 +#: actions/designadminpanel.php:122 actions/editapplication.php:118 +#: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format msgid "" @@ -181,6 +204,9 @@ msgstr "" #: actions/apiaccountupdateprofilebackgroundimage.php:146 #: actions/apiaccountupdateprofilecolors.php:164 #: actions/apiaccountupdateprofilecolors.php:174 +#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 +#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 +#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 msgid "Unable to save your design settings." msgstr "Impossibile salveguardar le configurationes del apparentia." @@ -221,26 +247,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!" @@ -264,7 +270,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 @@ -272,7 +279,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 @@ -293,7 +301,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 @@ -326,7 +335,8 @@ msgstr "Pseudonymo ja in uso. Proba un altere." msgid "Not a valid nickname." msgstr "Non un pseudonymo valide." -#: actions/apigroupcreate.php:196 actions/editgroup.php:195 +#: actions/apigroupcreate.php:196 actions/editapplication.php:212 +#: actions/editgroup.php:195 actions/newapplication.php:200 #: actions/newgroup.php:139 actions/profilesettings.php:222 #: actions/register.php:217 msgid "Homepage is not a valid URL." @@ -338,7 +348,8 @@ msgstr "Le pagina personal non es un URL valide." msgid "Full name is too long (max 255 chars)." msgstr "Le nomine complete es troppo longe (max. 255 characteres)." -#: actions/apigroupcreate.php:213 +#: actions/apigroupcreate.php:213 actions/editapplication.php:187 +#: actions/newapplication.php:169 #, php-format msgid "Description is too long (max %d chars)." msgstr "Description es troppo longe (max %d charachteres)." @@ -378,7 +389,7 @@ msgstr "Le alias non pote esser identic al pseudonymo." msgid "Group not found!" msgstr "Gruppo non trovate!" -#: actions/apigroupjoin.php:110 lib/command.php:217 +#: 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." @@ -386,7 +397,7 @@ 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 lib/command.php:234 +#: actions/apigroupjoin.php:138 actions/joingroup.php:124 #, 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." @@ -395,7 +406,7 @@ msgstr "Non poteva inscriber le usator %s in le gruppo %s." msgid "You are not a member of this group." msgstr "Tu non es membro de iste gruppo." -#: actions/apigroupleave.php:124 actions/leavegroup.php:127 +#: actions/apigroupleave.php:124 actions/leavegroup.php:119 #, fuzzy, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "Non poteva remover le usator %s del gruppo %s." @@ -415,6 +426,101 @@ msgstr "Gruppos de %s" msgid "groups on %s" msgstr "gruppos in %s" +#: actions/apioauthauthorize.php:108 actions/apioauthauthorize.php:114 +msgid "Bad request." +msgstr "" + +#: actions/apioauthauthorize.php:134 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:115 actions/makeadmin.php:66 +#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 +#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:139 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 +#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/subscribe.php:46 actions/tagother.php:166 +#: 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 "Occurreva un problema con le indicio de tu session. Per favor reproba." + +#: actions/apioauthauthorize.php:146 +#, fuzzy +msgid "Invalid nickname / password!" +msgstr "Nomine de usator o contrasigno invalide." + +#: actions/apioauthauthorize.php:170 +#, fuzzy +msgid "DB error deleting OAuth app user." +msgstr "Error durante le configuration del usator." + +#: actions/apioauthauthorize.php:196 +#, fuzzy +msgid "DB error inserting OAuth app user." +msgstr "Error durante le configuration del usator." + +#: actions/apioauthauthorize.php:231 +#, php-format +msgid "" +"The request token %s has been authorized. Please exchange it for an access " +"token." +msgstr "" + +#: actions/apioauthauthorize.php:241 +#, php-format +msgid "The request token %s has been denied." +msgstr "" + +#: actions/apioauthauthorize.php:246 actions/avatarsettings.php:281 +#: actions/designadminpanel.php:103 actions/editapplication.php:139 +#: actions/emailsettings.php:256 actions/grouplogo.php:319 +#: actions/imsettings.php:220 actions/newapplication.php:121 +#: actions/oauthconnectionssettings.php:151 actions/recoverpassword.php:44 +#: actions/smssettings.php:248 lib/designsettings.php:304 +msgid "Unexpected form submission." +msgstr "Submission de formulario inexpectate." + +#: actions/apioauthauthorize.php:273 +msgid "An application would like to connect to your account" +msgstr "" + +#: actions/apioauthauthorize.php:290 +msgid "Allow or deny access" +msgstr "" + +#: actions/apioauthauthorize.php:320 lib/action.php:435 +msgid "Account" +msgstr "" + +#: actions/apioauthauthorize.php:323 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/apioauthauthorize.php:326 actions/login.php:233 +#: actions/register.php:429 lib/accountsettingsaction.php:116 +msgid "Password" +msgstr "Contrasigno" + +#: actions/apioauthauthorize.php:338 +#, fuzzy +msgid "Deny" +msgstr "Apparentia" + +#: actions/apioauthauthorize.php:344 +msgid "Allow" +msgstr "" + +#: actions/apioauthauthorize.php:361 +msgid "Allow or deny access to your account information." +msgstr "" + #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." msgstr "Iste methodo require un commando POST o DELETE." @@ -428,11 +534,11 @@ msgstr "Tu non pote deler le stato de un altere usator." msgid "No such notice." msgstr "Nota non trovate." -#: actions/apistatusesretweet.php:83 lib/command.php:422 +#: actions/apistatusesretweet.php:83 msgid "Cannot repeat your own notice." msgstr "Non pote repeter tu proprie nota." -#: actions/apistatusesretweet.php:91 lib/command.php:427 +#: actions/apistatusesretweet.php:91 msgid "Already repeated that notice." msgstr "Iste nota ha ja essite repetite." @@ -444,18 +550,18 @@ msgstr "Stato delite." msgid "No status with that ID found." msgstr "Nulle stato trovate con iste ID." -#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:162 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" "Isto es troppo longe. Le longitude maximal del notas es %d characteres." -#: actions/apistatusesupdate.php:198 +#: actions/apistatusesupdate.php:203 msgid "Not found" msgstr "Non trovate" -#: actions/apistatusesupdate.php:221 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:226 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -542,8 +648,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." @@ -566,8 +675,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" @@ -599,29 +708,6 @@ 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/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 -#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 -#: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 -#: actions/subscribe.php:46 actions/tagother.php:166 -#: 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 "Occurreva un problema con le indicio de tu session. Per favor reproba." - -#: actions/avatarsettings.php:281 actions/designadminpanel.php:103 -#: actions/emailsettings.php:256 actions/grouplogo.php:319 -#: actions/imsettings.php:220 actions/recoverpassword.php:44 -#: actions/smssettings.php:248 lib/designsettings.php:304 -msgid "Unexpected form submission." -msgstr "Submission de formulario inexpectate." - #: actions/avatarsettings.php:328 msgid "Pick a square area of the image to be your avatar" msgstr "Selige un area quadrate del imagine pro facer lo tu avatar" @@ -683,19 +769,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:260 +msgid "No such group." +msgstr "Gruppo non existe." #: actions/blockedfromgroup.php:90 #, php-format @@ -762,7 +844,8 @@ msgid "Couldn't delete email confirmation." msgstr "Non poteva deler confirmation de e-mail." #: actions/confirmaddress.php:144 -msgid "Confirm Address" +#, fuzzy +msgid "Confirm address" msgstr "Confirmar adresse" #: actions/confirmaddress.php:159 @@ -817,10 +900,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." @@ -954,7 +1033,8 @@ msgstr "Revenir al predefinitiones" #: actions/pathsadminpanel.php:324 actions/profilesettings.php:174 #: actions/siteadminpanel.php:388 actions/smssettings.php:181 #: actions/subscriptions.php:203 actions/tagother.php:154 -#: actions/useradminpanel.php:313 lib/designsettings.php:256 +#: actions/useradminpanel.php:313 lib/applicationeditform.php:335 +#: lib/applicationeditform.php:336 lib/designsettings.php:256 #: lib/groupeditform.php:202 msgid "Save" msgstr "Salveguardar" @@ -975,6 +1055,85 @@ msgstr "Adder al favorites" msgid "No such document." msgstr "Documento non existe." +#: actions/editapplication.php:54 lib/applicationeditform.php:136 +msgid "Edit application" +msgstr "" + +#: actions/editapplication.php:66 +#, fuzzy +msgid "You must be logged in to edit an application." +msgstr "Tu debe aperir un session pro modificar un gruppo." + +#: actions/editapplication.php:77 actions/showapplication.php:94 +#, fuzzy +msgid "You are not the owner of this application." +msgstr "Tu non es membro de iste gruppo." + +#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:163 +#: actions/showapplication.php:87 +#, fuzzy +msgid "No such application." +msgstr "Nota non trovate." + +#: actions/editapplication.php:127 actions/newapplication.php:110 +#: actions/showapplication.php:118 lib/action.php:1167 +msgid "There was a problem with your session token." +msgstr "" + +#: actions/editapplication.php:161 +#, fuzzy +msgid "Use this form to edit your application." +msgstr "Usa iste formulario pro modificar le gruppo." + +#: actions/editapplication.php:177 actions/newapplication.php:159 +#, fuzzy +msgid "Name is required." +msgstr "Identic al contrasigno hic supra. Requisite." + +#: actions/editapplication.php:180 actions/newapplication.php:162 +#, fuzzy +msgid "Name is too long (max 255 chars)." +msgstr "Le nomine complete es troppo longe (max. 255 characteres)." + +#: actions/editapplication.php:183 actions/newapplication.php:165 +msgid "Description is required." +msgstr "" + +#: actions/editapplication.php:191 +msgid "Source URL is too long." +msgstr "" + +#: actions/editapplication.php:197 actions/newapplication.php:182 +#, fuzzy +msgid "Source URL is not valid." +msgstr "Le pagina personal non es un URL valide." + +#: actions/editapplication.php:200 actions/newapplication.php:185 +msgid "Organization is required." +msgstr "" + +#: actions/editapplication.php:203 actions/newapplication.php:188 +#, fuzzy +msgid "Organization is too long (max 255 chars)." +msgstr "Loco es troppo longe (max. 255 characteres)." + +#: actions/editapplication.php:206 actions/newapplication.php:191 +msgid "Organization homepage is required." +msgstr "" + +#: actions/editapplication.php:215 actions/newapplication.php:203 +msgid "Callback is too long." +msgstr "" + +#: actions/editapplication.php:222 actions/newapplication.php:212 +msgid "Callback URL is not valid." +msgstr "" + +#: actions/editapplication.php:255 +#, fuzzy +msgid "Could not update application." +msgstr "Non poteva actualisar gruppo." + #: actions/editgroup.php:56 #, php-format msgid "Edit %s group" @@ -986,7 +1145,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 @@ -1011,7 +1171,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 @@ -1043,13 +1204,15 @@ msgstr "" "spam!) pro un message con ulterior instructiones." #: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 +#: actions/smssettings.php:126 lib/applicationeditform.php:333 +#: lib/applicationeditform.php:334 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\"" @@ -1123,9 +1286,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." @@ -1307,13 +1471,6 @@ 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:79 msgid "No such file." msgstr "File non existe." @@ -1330,7 +1487,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." @@ -1378,9 +1535,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." @@ -1403,12 +1560,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." @@ -1425,6 +1576,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." @@ -1554,7 +1710,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 @@ -1584,7 +1741,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 @@ -1685,7 +1843,7 @@ 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 lib/command.php:315 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 #, php-format msgid "%1$s (%2$s)" msgstr "" @@ -1731,7 +1889,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:234 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236 msgid "Send" msgstr "Inviar" @@ -1801,16 +1959,7 @@ 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 -msgid "You are already a member of that group" -msgstr "Tu es ja membro de iste gruppo" - -#: actions/joingroup.php:128 -#, fuzzy, php-format -msgid "Could not join user %1$s to group %2$s" -msgstr "Non poteva facer le usator %s membro del gruppo %s" - -#: actions/joingroup.php:135 lib/command.php:239 +#: actions/joingroup.php:131 #, fuzzy, php-format msgid "%1$s joined group %2$s" msgstr "%s se faceva membro del gruppo %s" @@ -1819,71 +1968,52 @@ msgstr "%s se faceva membro del gruppo %s" msgid "You must be logged in to leave a group." msgstr "Tu debe aperir un session pro quitar un gruppo." -#: actions/leavegroup.php:90 lib/command.php:268 +#: actions/leavegroup.php:90 lib/command.php:265 msgid "You are not a member of that group." msgstr "Tu non es membro de iste gruppo." -#: actions/leavegroup.php:119 lib/command.php:278 -msgid "Could not find membership record." -msgstr "Non poteva trovar le datos del membrato." - -#: actions/leavegroup.php:134 lib/command.php:289 +#: actions/leavegroup.php:127 #, 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:460 +#: 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 -#: lib/groupeditform.php:152 lib/userprofile.php:131 -msgid "Nickname" -msgstr "Pseudonymo" - -#: actions/login.php:253 actions/register.php:428 -#: 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." @@ -1891,7 +2021,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]" @@ -1911,18 +2041,41 @@ msgstr "%s es ja administrator del gruppo \"%s\"." #: actions/makeadmin.php:132 #, fuzzy, php-format -msgid "Can't get membership record for %1$s in group %2$s" +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 #, fuzzy, php-format -msgid "Can't make %1$s an admin for group %2$s" +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 msgid "No current status" msgstr "Nulle stato actual" +#: actions/newapplication.php:52 +msgid "New application" +msgstr "" + +#: actions/newapplication.php:64 +#, fuzzy +msgid "You must be logged in to register an application." +msgstr "Tu debe aperir un session pro crear un gruppo." + +#: actions/newapplication.php:143 +#, fuzzy +msgid "Use this form to register a new application." +msgstr "Usa iste formulario pro crear un nove gruppo." + +#: actions/newapplication.php:173 +msgid "Source URL is required." +msgstr "" + +#: actions/newapplication.php:255 actions/newapplication.php:264 +#, fuzzy +msgid "Could not create application." +msgstr "Non poteva crear aliases." + #: actions/newgroup.php:53 msgid "New group" msgstr "Nove gruppo" @@ -1935,12 +2088,12 @@ msgstr "Usa iste formulario pro crear un nove gruppo." msgid "New message" msgstr "Nove message" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 msgid "You can't send a message to this user." msgstr "Tu non pote inviar un message a iste usator." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:484 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 +#: lib/command.php:475 msgid "No content!" msgstr "Nulle contento!" @@ -1948,7 +2101,7 @@ msgstr "Nulle contento!" msgid "No recipient specified." msgstr "Nulle destinatario specificate." -#: actions/newmessage.php:164 lib/command.php:370 +#: actions/newmessage.php:164 lib/command.php:361 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -1960,8 +2113,8 @@ msgid "Message sent" msgstr "Message inviate" #: actions/newmessage.php:185 -#, php-format -msgid "Direct message to %s sent" +#, fuzzy, php-format +msgid "Direct message to %s sent." msgstr "Message directe a %s inviate" #: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 @@ -2038,6 +2191,50 @@ msgstr "Pulsata inviate" msgid "Nudge sent!" msgstr "Pulsata inviate!" +#: actions/oauthappssettings.php:59 +#, fuzzy +msgid "You must be logged in to list your applications." +msgstr "Tu debe aperir un session pro modificar un gruppo." + +#: actions/oauthappssettings.php:74 +msgid "OAuth applications" +msgstr "" + +#: actions/oauthappssettings.php:85 +msgid "Applications you have registered" +msgstr "" + +#: actions/oauthappssettings.php:135 +#, php-format +msgid "You have not registered any applications yet." +msgstr "" + +#: actions/oauthconnectionssettings.php:71 +msgid "Connected applications" +msgstr "" + +#: actions/oauthconnectionssettings.php:87 +msgid "You have allowed the following applications to access you account." +msgstr "" + +#: actions/oauthconnectionssettings.php:170 +#, fuzzy +msgid "You are not a user of that application." +msgstr "Tu non es membro de iste gruppo." + +#: actions/oauthconnectionssettings.php:180 +msgid "Unable to revoke access for app: " +msgstr "" + +#: actions/oauthconnectionssettings.php:192 +#, php-format +msgid "You have not authorized any applications to use your account." +msgstr "" + +#: actions/oauthconnectionssettings.php:205 +msgid "Developers can edit the registration settings for their applications " +msgstr "" + #: actions/oembed.php:79 actions/shownotice.php:100 msgid "Notice has no profile" msgstr "Le nota ha nulle profilo" @@ -2055,8 +2252,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:1038 +#: lib/api.php:1066 lib/api.php:1176 msgid "Not a supported data format." msgstr "Formato de datos non supportate." @@ -2069,7 +2266,8 @@ msgid "Notice Search" msgstr "Rercerca de notas" #: actions/othersettings.php:60 -msgid "Other Settings" +#, fuzzy +msgid "Other settings" msgstr "Altere configurationes" #: actions/othersettings.php:71 @@ -2100,6 +2298,30 @@ 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/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 msgid "Outbox for %s" @@ -2135,7 +2357,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" @@ -2297,7 +2519,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 @@ -2360,42 +2583,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 -#: lib/groupeditform.php:161 +#: actions/profilesettings.php:115 actions/register.php:453 +#: lib/applicationeditform.php:230 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\"" @@ -2706,7 +2929,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." @@ -2718,7 +2941,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:457 +#: actions/register.php:114 actions/register.php:503 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Crear un conto" @@ -2732,19 +2955,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. " @@ -2752,42 +2971,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." @@ -2795,7 +3014,7 @@ msgstr "" " excepte iste datos private: contrasigno, adresse de e-mail, adresse de " "messageria instantanee, numero de telephono." -#: actions/register.php:537 +#: actions/register.php:538 #, fuzzy, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -2827,7 +3046,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.)" @@ -2979,6 +3198,83 @@ 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/showapplication.php:82 +#, fuzzy +msgid "You must be logged in to view an application." +msgstr "Tu debe aperir un session pro quitar un gruppo." + +#: actions/showapplication.php:158 +#, fuzzy +msgid "Application profile" +msgstr "Le nota ha nulle profilo" + +#: actions/showapplication.php:160 lib/applicationeditform.php:182 +msgid "Icon" +msgstr "" + +#: actions/showapplication.php:170 actions/version.php:195 +#: lib/applicationeditform.php:197 +#, fuzzy +msgid "Name" +msgstr "Pseudonymo" + +#: actions/showapplication.php:179 lib/applicationeditform.php:224 +msgid "Organization" +msgstr "" + +#: actions/showapplication.php:188 actions/version.php:198 +#: lib/applicationeditform.php:211 lib/groupeditform.php:172 +msgid "Description" +msgstr "" + +#: actions/showapplication.php:193 actions/showgroup.php:429 +#: lib/profileaction.php:174 +msgid "Statistics" +msgstr "Statisticas" + +#: actions/showapplication.php:204 +#, php-format +msgid "created by %1$s - %2$s access by default - %3$d users" +msgstr "" + +#: actions/showapplication.php:214 +msgid "Application actions" +msgstr "" + +#: actions/showapplication.php:233 +msgid "Reset key & secret" +msgstr "" + +#: actions/showapplication.php:241 +msgid "Application info" +msgstr "" + +#: actions/showapplication.php:243 +msgid "Consumer key" +msgstr "" + +#: actions/showapplication.php:248 +msgid "Consumer secret" +msgstr "" + +#: actions/showapplication.php:253 +msgid "Request token URL" +msgstr "" + +#: actions/showapplication.php:258 +msgid "Access token URL" +msgstr "" + +#: actions/showapplication.php:263 +msgid "Authorize URL" +msgstr "" + +#: actions/showapplication.php:268 +msgid "" +"Note: We support HMAC-SHA1 signatures. We do not support the plaintext " +"signature method." +msgstr "" + #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "Non poteva recuperar notas favorite." @@ -3084,7 +3380,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)" @@ -3092,10 +3388,6 @@ msgstr "(Nulle)" msgid "All members" msgstr "Tote le membros" -#: actions/showgroup.php:429 lib/profileaction.php:174 -msgid "Statistics" -msgstr "Statisticas" - #: actions/showgroup.php:432 msgid "Created" msgstr "Create" @@ -3253,12 +3545,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 @@ -3440,7 +3733,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 @@ -3469,7 +3763,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 @@ -3714,10 +4009,6 @@ 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 "" @@ -3909,10 +4200,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 "" @@ -3989,11 +4276,6 @@ msgstr "" msgid "Plugins" msgstr "" -#: actions/version.php:195 -#, fuzzy -msgid "Name" -msgstr "Pseudonymo" - #: actions/version.php:196 lib/action.php:741 #, fuzzy msgid "Version" @@ -4003,27 +4285,43 @@ msgstr "Conversation" msgid "Author(s)" msgstr "" -#: actions/version.php:198 lib/groupeditform.php:172 -msgid "Description" -msgstr "" - -#: classes/File.php:137 +#: 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/Group_member.php:41 +#, fuzzy +msgid "Group join failed." +msgstr "Profilo del gruppo" + +#: classes/Group_member.php:53 +#, fuzzy +msgid "Not part of group." +msgstr "Non poteva actualisar gruppo." + +#: classes/Group_member.php:60 +#, fuzzy +msgid "Group leave failed." +msgstr "Profilo del gruppo" + +#: 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 "" @@ -4036,49 +4334,49 @@ msgstr "" msgid "Could not update message with new URI." msgstr "" -#: classes/Notice.php:172 +#: classes/Notice.php:171 #, php-format msgid "DB error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:226 +#: classes/Notice.php:225 msgid "Problem saving notice. Too long." msgstr "" -#: classes/Notice.php:230 +#: classes/Notice.php:229 msgid "Problem saving notice. Unknown user." msgstr "" -#: classes/Notice.php:235 +#: classes/Notice.php:234 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:241 +#: classes/Notice.php:240 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:247 +#: classes/Notice.php:246 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:309 classes/Notice.php:334 +#: classes/Notice.php:305 classes/Notice.php:330 msgid "Problem saving notice." msgstr "" -#: classes/Notice.php:1034 +#: classes/Notice.php:1052 #, php-format msgid "DB error inserting reply: %s" msgstr "" -#: classes/Notice.php:1359 +#: classes/Notice.php:1423 #, php-format msgid "RT @%1$s %2$s" msgstr "" -#: classes/User.php:368 +#: classes/User.php:382 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" @@ -4119,6 +4417,11 @@ msgstr "" msgid "Other options" msgstr "" +#: lib/action.php:144 +#, fuzzy, php-format +msgid "%1$s - %2$s" +msgstr "%s quitava le gruppo %s" + #: lib/action.php:159 msgid "Untitled page" msgstr "" @@ -4135,10 +4438,6 @@ msgstr "" msgid "Personal profile and friends timeline" msgstr "" -#: lib/action.php:435 -msgid "Account" -msgstr "" - #: lib/action.php:435 msgid "Change your email, avatar, password, profile" msgstr "" @@ -4288,10 +4587,6 @@ msgstr "" msgid "Before" msgstr "" -#: lib/action.php:1167 -msgid "There was a problem with your session token." -msgstr "" - #: lib/adminpanelaction.php:96 msgid "You cannot make changes to this site." msgstr "" @@ -4325,6 +4620,69 @@ msgstr "" msgid "Paths configuration" msgstr "" +#: lib/applicationeditform.php:186 +msgid "Icon for this application" +msgstr "" + +#: lib/applicationeditform.php:206 +#, fuzzy, php-format +msgid "Describe your application in %d characters" +msgstr "Describe te e tu interesses in %d characteres" + +#: lib/applicationeditform.php:209 +msgid "Describe your application" +msgstr "" + +#: lib/applicationeditform.php:218 +#, fuzzy +msgid "Source URL" +msgstr "URL pro reporto" + +#: lib/applicationeditform.php:220 +msgid "URL of the homepage of this application" +msgstr "" + +#: lib/applicationeditform.php:226 +msgid "Organization responsible for this application" +msgstr "" + +#: lib/applicationeditform.php:232 +msgid "URL for the homepage of the organization" +msgstr "" + +#: lib/applicationeditform.php:238 +msgid "URL to redirect to after authentication" +msgstr "" + +#: lib/applicationeditform.php:260 +msgid "Browser" +msgstr "" + +#: lib/applicationeditform.php:276 +msgid "Desktop" +msgstr "" + +#: lib/applicationeditform.php:277 +msgid "Type of application, browser or desktop" +msgstr "" + +#: lib/applicationeditform.php:299 +msgid "Read-only" +msgstr "" + +#: lib/applicationeditform.php:317 +msgid "Read-write" +msgstr "" + +#: lib/applicationeditform.php:318 +msgid "Default access for this application: read-only, or read-write" +msgstr "" + +#: lib/applicationlist.php:154 +#, fuzzy +msgid "Revoke" +msgstr "Remover" + #: lib/attachmentlist.php:87 msgid "Attachments" msgstr "" @@ -4345,12 +4703,12 @@ msgstr "" msgid "Tags for this attachment" msgstr "" -#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 +#: lib/authenticationplugin.php:214 lib/authenticationplugin.php:219 #, fuzzy msgid "Password changing failed" msgstr "Cambio del contrasigno" -#: lib/authenticationplugin.php:197 +#: lib/authenticationplugin.php:229 #, fuzzy msgid "Password changing is not allowed" msgstr "Cambio del contrasigno" @@ -4373,7 +4731,7 @@ msgstr "" #: lib/command.php:88 #, fuzzy, php-format -msgid "Could not find a user with nickname %s." +msgid "Could not find a user with nickname %s" msgstr "Non poteva trovar le usator de destination." #: lib/command.php:92 @@ -4382,7 +4740,7 @@ msgstr "" #: lib/command.php:99 #, fuzzy, php-format -msgid "Nudge sent to %s." +msgid "Nudge sent to %s" msgstr "Pulsata inviate" #: lib/command.php:126 @@ -4393,166 +4751,188 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:399 lib/command.php:460 +#: lib/command.php:152 lib/command.php:390 lib/command.php:451 #, fuzzy -msgid "Notice with that id does not exist." +msgid "Notice with that id does not exist" msgstr "Nulle usator existe con iste adresse de e-mail o nomine de usator." -#: lib/command.php:168 lib/command.php:415 lib/command.php:476 -#: lib/command.php:532 +#: lib/command.php:168 lib/command.php:406 lib/command.php:467 +#: lib/command.php:523 #, fuzzy -msgid "User has no last notice." +msgid "User has no last notice" msgstr "Le usator non ha un profilo." #: lib/command.php:190 msgid "Notice marked as fave." msgstr "" -#: lib/command.php:284 -#, fuzzy, php-format -msgid "Could not remove user %1$s to group %2$s." +#: lib/command.php:217 +msgid "You are already a member of that group" +msgstr "Tu es ja membro de iste gruppo" + +#: lib/command.php:231 +#, php-format +msgid "Could not join user %s to group %s" +msgstr "Non poteva facer le usator %s membro del gruppo %s" + +#: lib/command.php:236 +#, php-format +msgid "%s joined group %s" +msgstr "%s se faceva membro del gruppo %s" + +#: lib/command.php:275 +#, php-format +msgid "Could not remove user %s to group %s" msgstr "Non poteva remover le usator %s del gruppo %s" -#: lib/command.php:318 +#: lib/command.php:280 #, php-format -msgid "Fullname: %s" -msgstr "" +msgid "%s left group %s" +msgstr "%s quitava le gruppo %s" -#: lib/command.php:321 +#: lib/command.php:309 +#, fuzzy, php-format +msgid "Fullname: %s" +msgstr "Nomine complete" + +#: lib/command.php:312 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "" -#: lib/command.php:324 +#: lib/command.php:315 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "" -#: lib/command.php:327 +#: lib/command.php:318 #, php-format msgid "About: %s" msgstr "" -#: lib/command.php:358 +#: lib/command.php:349 #, php-format -msgid "Message too long - maximum is %1$d characters, you sent %2$d." +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." +#: lib/command.php:367 +#, php-format +msgid "Direct message to %s sent" msgstr "Message directe a %s inviate" -#: lib/command.php:378 +#: lib/command.php:369 msgid "Error sending direct message." msgstr "" -#: lib/command.php:435 +#: lib/command.php:413 +msgid "Cannot repeat your own notice" +msgstr "Non pote repeter tu proprie nota" + +#: lib/command.php:418 +msgid "Already repeated that notice" +msgstr "Iste nota ha ja essite repetite" + +#: lib/command.php:426 #, fuzzy, php-format -msgid "Notice from %s repeated." +msgid "Notice from %s repeated" msgstr "Nota delite." -#: lib/command.php:437 +#: lib/command.php:428 msgid "Error repeating notice." msgstr "Error durante le repetition del nota." -#: lib/command.php:491 +#: lib/command.php:482 #, php-format -msgid "Notice too long - maximum is %1$d characters, you sent %2$d." +msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:500 +#: lib/command.php:491 #, fuzzy, php-format -msgid "Reply to %s sent." +msgid "Reply to %s sent" msgstr "Responsas a %s" -#: lib/command.php:502 +#: lib/command.php:493 msgid "Error saving notice." msgstr "" -#: lib/command.php:556 -msgid "Specify the name of the user to subscribe to." +#: lib/command.php:547 +msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:563 +#: lib/command.php:554 #, php-format msgid "Subscribed to %s" msgstr "" -#: lib/command.php:584 -msgid "Specify the name of the user to unsubscribe from." +#: lib/command.php:575 +msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:591 +#: lib/command.php:582 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:609 lib/command.php:632 +#: lib/command.php:600 lib/command.php:623 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:612 +#: lib/command.php:603 msgid "Notification off." msgstr "" -#: lib/command.php:614 +#: lib/command.php:605 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:635 +#: lib/command.php:626 msgid "Notification on." msgstr "" -#: lib/command.php:637 +#: lib/command.php:628 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:650 -msgid "Login command is disabled." +#: lib/command.php:641 +msgid "Login command is disabled" msgstr "" -#: lib/command.php:664 -#, fuzzy, php-format -msgid "Could not create login token for %s." -msgstr "Non poteva crear aliases." - -#: lib/command.php:669 +#: lib/command.php:652 #, php-format -msgid "This link is useable only once, and is good for only 2 minutes: %s." +msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:685 +#: lib/command.php:668 msgid "You are not subscribed to anyone." msgstr "" -#: lib/command.php:687 +#: lib/command.php:670 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:690 msgid "No one is subscribed to you." msgstr "" -#: lib/command.php:709 +#: lib/command.php:692 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:712 msgid "You are not a member of any groups." msgstr "" -#: lib/command.php:731 +#: lib/command.php:714 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:728 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4593,19 +4973,19 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:199 +#: lib/common.php:131 msgid "No configuration file found. " msgstr "" -#: lib/common.php:200 +#: lib/common.php:132 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:201 +#: lib/common.php:134 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:202 +#: lib/common.php:135 msgid "Go to the installer." msgstr "" @@ -4621,6 +5001,15 @@ msgstr "" msgid "Updates by SMS" msgstr "" +#: lib/connectsettingsaction.php:120 +#, fuzzy +msgid "Connections" +msgstr "Conversation" + +#: lib/connectsettingsaction.php:121 +msgid "Authorized connected applications" +msgstr "" + #: lib/dberroraction.php:60 msgid "Database error" msgstr "" @@ -4803,11 +5192,16 @@ msgstr "" msgid "kB" msgstr "" -#: lib/jabber.php:191 +#: lib/jabber.php:202 #, php-format msgid "[%s]" msgstr "" +#: lib/jabber.php:385 +#, fuzzy, php-format +msgid "Unknown inbox source %d." +msgstr "Lingua \"%s\" incognite" + #: lib/joinform.php:114 msgid "Join" msgstr "" @@ -4865,22 +5259,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 @@ -5066,7 +5448,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 @@ -5074,8 +5456,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 @@ -5084,7 +5467,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 @@ -5118,16 +5501,18 @@ msgstr "" #: lib/noticeform.php:212 #, fuzzy -msgid "Share my location." -msgstr "Non poteva salveguardar le preferentias de loco." - -#: lib/noticeform.php:214 -#, fuzzy -msgid "Do not share my location." +msgid "Share my location" msgstr "Non poteva salveguardar le preferentias de loco." #: lib/noticeform.php:215 -msgid "Hide this info" +#, fuzzy +msgid "Do not share my location" +msgstr "Non poteva salveguardar le preferentias de loco." + +#: lib/noticeform.php:216 +msgid "" +"Sorry, retrieving your geo location is taking longer than expected, please " +"try again later" msgstr "" #: lib/noticelist.php:428 @@ -5390,23 +5775,23 @@ msgstr "" msgid "User has blocked you." msgstr "" -#: lib/subs.php:60 +#: lib/subs.php:63 msgid "Could not subscribe." msgstr "" -#: lib/subs.php:79 +#: lib/subs.php:82 msgid "Could not subscribe other to you." msgstr "" -#: lib/subs.php:128 +#: lib/subs.php:137 msgid "Not subscribed!" msgstr "" -#: lib/subs.php:133 +#: lib/subs.php:142 msgid "Couldn't delete self-subscription." msgstr "" -#: lib/subs.php:146 +#: lib/subs.php:158 msgid "Couldn't delete subscription." msgstr "" @@ -5420,10 +5805,6 @@ msgstr "" msgid "People Tagcloud as tagged" msgstr "" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "" - #: lib/tagcloudsection.php:56 msgid "None" msgstr "" @@ -5484,47 +5865,47 @@ msgstr "" msgid "Moderate" msgstr "" -#: lib/util.php:837 +#: lib/util.php:875 msgid "a few seconds ago" msgstr "" -#: lib/util.php:839 +#: lib/util.php:877 msgid "about a minute ago" msgstr "" -#: lib/util.php:841 +#: lib/util.php:879 #, php-format msgid "about %d minutes ago" msgstr "" -#: lib/util.php:843 +#: lib/util.php:881 msgid "about an hour ago" msgstr "" -#: lib/util.php:845 +#: lib/util.php:883 #, php-format msgid "about %d hours ago" msgstr "" -#: lib/util.php:847 +#: lib/util.php:885 msgid "about a day ago" msgstr "" -#: lib/util.php:849 +#: lib/util.php:887 #, php-format msgid "about %d days ago" msgstr "" -#: lib/util.php:851 +#: lib/util.php:889 msgid "about a month ago" msgstr "" -#: lib/util.php:853 +#: lib/util.php:891 #, php-format msgid "about %d months ago" msgstr "" -#: lib/util.php:855 +#: lib/util.php:893 msgid "about a year ago" msgstr "" @@ -5540,5 +5921,5 @@ msgstr "" #: scripts/xmppdaemon.php:301 #, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" diff --git a/locale/is/LC_MESSAGES/statusnet.po b/locale/is/LC_MESSAGES/statusnet.po index c5fdf46717..6ef030c3fb 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-10 00:46+0000\n" -"PO-Revision-Date: 2010-01-10 00:48:13+0000\n" +"POT-Creation-Date: 2010-01-15 19:15+0000\n" +"PO-Revision-Date: 2010-01-15 19:17:14+0000\n" "Language-Team: Icelandic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60878); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r61101); 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" @@ -36,25 +36,30 @@ msgstr "Ekkert þannig merki." #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 +#: actions/apistatusesupdate.php:149 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 #: 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 #: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 -#: lib/command.php:163 lib/command.php:311 lib/command.php:364 -#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/command.php:163 lib/command.php:302 lib/command.php:355 +#: lib/command.php:401 lib/command.php:462 lib/command.php:518 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/subs.php:34 lib/subs.php:125 msgid "No such user." msgstr "Enginn svoleiðis notandi." +#: actions/all.php:84 +#, fuzzy, php-format +msgid "%1$s and friends, page %2$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 +#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -106,7 +111,7 @@ msgstr "" msgid "You and friends" msgstr "" -#: actions/allrss.php:119 actions/apitimelinefriends.php:122 +#: actions/allrss.php:119 actions/apitimelinefriends.php:121 #: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" @@ -117,6 +122,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:155 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!" @@ -131,7 +153,7 @@ msgstr "Aðferð í forritsskilum fannst ekki!" #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:114 +#: actions/apistatusesupdate.php:119 msgid "This method requires a POST." msgstr "Þessi aðferð krefst POST." @@ -162,8 +184,9 @@ msgstr "Gat ekki vistað persónulega síðu." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257 -#: actions/designadminpanel.php:122 actions/newnotice.php:94 +#: actions/apistatusesupdate.php:132 actions/avatarsettings.php:257 +#: actions/designadminpanel.php:122 actions/editapplication.php:118 +#: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format msgid "" @@ -175,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 "" @@ -217,26 +243,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!" @@ -260,16 +266,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." @@ -291,8 +299,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." @@ -324,7 +333,8 @@ msgstr "Stuttnefni nú þegar í notkun. Prófaðu eitthvað annað." msgid "Not a valid nickname." msgstr "Ekki tækt stuttnefni." -#: actions/apigroupcreate.php:196 actions/editgroup.php:195 +#: actions/apigroupcreate.php:196 actions/editapplication.php:212 +#: actions/editgroup.php:195 actions/newapplication.php:200 #: actions/newgroup.php:139 actions/profilesettings.php:222 #: actions/register.php:217 msgid "Homepage is not a valid URL." @@ -336,7 +346,8 @@ msgstr "Heimasíða er ekki gild vefslóð." msgid "Full name is too long (max 255 chars)." msgstr "Fullt nafn er of langt (í mesta lagi 255 stafir)." -#: actions/apigroupcreate.php:213 +#: actions/apigroupcreate.php:213 actions/editapplication.php:187 +#: actions/newapplication.php:169 #, fuzzy, php-format msgid "Description is too long (max %d chars)." msgstr "Lýsing er of löng (í mesta lagi 140 tákn)." @@ -377,7 +388,7 @@ msgstr "" msgid "Group not found!" msgstr "Aðferð í forritsskilum fannst ekki!" -#: actions/apigroupjoin.php:110 lib/command.php:217 +#: 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" @@ -386,7 +397,7 @@ 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 lib/command.php:234 +#: actions/apigroupjoin.php:138 actions/joingroup.php:124 #, fuzzy, php-format msgid "Could not join user %1$s to group %2$s." msgstr "Gat ekki bætt notandanum %s í hópinn %s" @@ -396,7 +407,7 @@ 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/leavegroup.php:127 +#: actions/apigroupleave.php:124 actions/leavegroup.php:119 #, fuzzy, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "Gat ekki fjarlægt notandann %s úr hópnum %s" @@ -416,6 +427,101 @@ msgstr "Hópar %s" msgid "groups on %s" msgstr "Hópsaðgerðir" +#: actions/apioauthauthorize.php:108 actions/apioauthauthorize.php:114 +msgid "Bad request." +msgstr "" + +#: actions/apioauthauthorize.php:134 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:115 actions/makeadmin.php:66 +#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 +#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:139 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 +#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/subscribe.php:46 actions/tagother.php:166 +#: 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 "Það kom upp vandamál með setutókann þinn. Vinsamlegast reyndu aftur." + +#: actions/apioauthauthorize.php:146 +#, fuzzy +msgid "Invalid nickname / password!" +msgstr "Ótækt notendanafn eða lykilorð." + +#: actions/apioauthauthorize.php:170 +#, fuzzy +msgid "DB error deleting OAuth app user." +msgstr "Villa kom upp í stillingu notanda." + +#: actions/apioauthauthorize.php:196 +#, fuzzy +msgid "DB error inserting OAuth app user." +msgstr "Gagnagrunnsvilla við innsetningu myllumerkis: %s" + +#: actions/apioauthauthorize.php:231 +#, php-format +msgid "" +"The request token %s has been authorized. Please exchange it for an access " +"token." +msgstr "" + +#: actions/apioauthauthorize.php:241 +#, php-format +msgid "The request token %s has been denied." +msgstr "" + +#: actions/apioauthauthorize.php:246 actions/avatarsettings.php:281 +#: actions/designadminpanel.php:103 actions/editapplication.php:139 +#: actions/emailsettings.php:256 actions/grouplogo.php:319 +#: actions/imsettings.php:220 actions/newapplication.php:121 +#: actions/oauthconnectionssettings.php:151 actions/recoverpassword.php:44 +#: actions/smssettings.php:248 lib/designsettings.php:304 +msgid "Unexpected form submission." +msgstr "Bjóst ekki við innsendingu eyðublaðs." + +#: actions/apioauthauthorize.php:273 +msgid "An application would like to connect to your account" +msgstr "" + +#: actions/apioauthauthorize.php:290 +msgid "Allow or deny access" +msgstr "" + +#: actions/apioauthauthorize.php:320 lib/action.php:435 +msgid "Account" +msgstr "Aðgangur" + +#: actions/apioauthauthorize.php:323 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/apioauthauthorize.php:326 actions/login.php:233 +#: actions/register.php:429 lib/accountsettingsaction.php:116 +msgid "Password" +msgstr "Lykilorð" + +#: actions/apioauthauthorize.php:338 +msgid "Deny" +msgstr "" + +#: actions/apioauthauthorize.php:344 +#, fuzzy +msgid "Allow" +msgstr "Allt" + +#: actions/apioauthauthorize.php:361 +msgid "Allow or deny access to your account information." +msgstr "" + #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." msgstr "Þessi aðferð krefst POST eða DELETE." @@ -429,12 +535,12 @@ msgstr "Þú getur ekki eytt stöðu annars notanda." msgid "No such notice." msgstr "Ekkert svoleiðis babl." -#: actions/apistatusesretweet.php:83 lib/command.php:422 +#: actions/apistatusesretweet.php:83 #, fuzzy msgid "Cannot repeat your own notice." msgstr "Get ekki kveikt á tilkynningum." -#: actions/apistatusesretweet.php:91 lib/command.php:427 +#: actions/apistatusesretweet.php:91 #, fuzzy msgid "Already repeated that notice." msgstr "Eyða þessu babli" @@ -447,17 +553,17 @@ msgstr "" msgid "No status with that ID found." msgstr "Engin staða með þessu kenni fannst." -#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:162 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Þetta er of langt. Hámarkslengd babls er 140 tákn." -#: actions/apistatusesupdate.php:198 +#: actions/apistatusesupdate.php:203 msgid "Not found" msgstr "Fannst ekki" -#: actions/apistatusesupdate.php:221 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:226 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -542,8 +648,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." @@ -566,8 +675,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ð" @@ -599,29 +708,6 @@ 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/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 -#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 -#: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 -#: actions/subscribe.php:46 actions/tagother.php:166 -#: 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 "Það kom upp vandamál með setutókann þinn. Vinsamlegast reyndu aftur." - -#: actions/avatarsettings.php:281 actions/designadminpanel.php:103 -#: actions/emailsettings.php:256 actions/grouplogo.php:319 -#: actions/imsettings.php:220 actions/recoverpassword.php:44 -#: actions/smssettings.php:248 lib/designsettings.php:304 -msgid "Unexpected form submission." -msgstr "Bjóst ekki við innsendingu eyðublaðs." - #: actions/avatarsettings.php:328 msgid "Pick a square area of the image to be your avatar" msgstr "" @@ -683,19 +769,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:260 +msgid "No such group." +msgstr "Enginn þannig hópur." #: actions/blockedfromgroup.php:90 #, php-format @@ -763,7 +845,8 @@ msgid "Couldn't delete email confirmation." msgstr "Gat ekki eytt tölvupóstsstaðfestingu." #: actions/confirmaddress.php:144 -msgid "Confirm Address" +#, fuzzy +msgid "Confirm address" msgstr "Staðfesta tölvupóstfang" #: actions/confirmaddress.php:159 @@ -817,10 +900,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." @@ -960,7 +1039,8 @@ msgstr "" #: actions/pathsadminpanel.php:324 actions/profilesettings.php:174 #: actions/siteadminpanel.php:388 actions/smssettings.php:181 #: actions/subscriptions.php:203 actions/tagother.php:154 -#: actions/useradminpanel.php:313 lib/designsettings.php:256 +#: actions/useradminpanel.php:313 lib/applicationeditform.php:335 +#: lib/applicationeditform.php:336 lib/designsettings.php:256 #: lib/groupeditform.php:202 msgid "Save" msgstr "Vista" @@ -981,6 +1061,86 @@ msgstr "Bæta við sem uppáhaldsbabli" msgid "No such document." msgstr "Ekkert svoleiðis skjal." +#: actions/editapplication.php:54 lib/applicationeditform.php:136 +msgid "Edit application" +msgstr "" + +#: actions/editapplication.php:66 +#, fuzzy +msgid "You must be logged in to edit an application." +msgstr "Þú verður að hafa skráð þig inn til að búa til hóp." + +#: actions/editapplication.php:77 actions/showapplication.php:94 +#, fuzzy +msgid "You are not the owner of this application." +msgstr "Þú ert ekki meðlimur í þessum hópi." + +#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:163 +#: actions/showapplication.php:87 +#, fuzzy +msgid "No such application." +msgstr "Ekkert svoleiðis babl." + +#: actions/editapplication.php:127 actions/newapplication.php:110 +#: actions/showapplication.php:118 lib/action.php:1167 +msgid "There was a problem with your session token." +msgstr "Það komu upp vandamál varðandi setutókann þinn." + +#: actions/editapplication.php:161 +#, fuzzy +msgid "Use this form to edit your application." +msgstr "Notaðu þetta eyðublað til að breyta hópnum." + +#: actions/editapplication.php:177 actions/newapplication.php:159 +#, fuzzy +msgid "Name is required." +msgstr "Sama og lykilorðið hér fyrir ofan. Nauðsynlegt." + +#: actions/editapplication.php:180 actions/newapplication.php:162 +#, fuzzy +msgid "Name is too long (max 255 chars)." +msgstr "Fullt nafn er of langt (í mesta lagi 255 stafir)." + +#: actions/editapplication.php:183 actions/newapplication.php:165 +#, fuzzy +msgid "Description is required." +msgstr "Lýsing" + +#: actions/editapplication.php:191 +msgid "Source URL is too long." +msgstr "" + +#: actions/editapplication.php:197 actions/newapplication.php:182 +#, fuzzy +msgid "Source URL is not valid." +msgstr "Heimasíða er ekki gild vefslóð." + +#: actions/editapplication.php:200 actions/newapplication.php:185 +msgid "Organization is required." +msgstr "" + +#: actions/editapplication.php:203 actions/newapplication.php:188 +#, fuzzy +msgid "Organization is too long (max 255 chars)." +msgstr "Staðsetning er of löng (í mesta lagi 255 stafir)." + +#: actions/editapplication.php:206 actions/newapplication.php:191 +msgid "Organization homepage is required." +msgstr "" + +#: actions/editapplication.php:215 actions/newapplication.php:203 +msgid "Callback is too long." +msgstr "" + +#: actions/editapplication.php:222 actions/newapplication.php:212 +msgid "Callback URL is not valid." +msgstr "" + +#: actions/editapplication.php:255 +#, fuzzy +msgid "Could not update application." +msgstr "Gat ekki uppfært hóp." + #: actions/editgroup.php:56 #, php-format msgid "Edit %s group" @@ -992,7 +1152,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 @@ -1017,7 +1178,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 @@ -1049,13 +1211,15 @@ msgstr "" "ruslpóstinn þinn!). Þar ættu að vera skilaboð með ítarlegri leiðbeiningum." #: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 +#: actions/smssettings.php:126 lib/applicationeditform.php:333 +#: lib/applicationeditform.php:334 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\"" @@ -1128,9 +1292,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." @@ -1314,13 +1479,6 @@ 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:79 #, fuzzy msgid "No such file." @@ -1339,7 +1497,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" @@ -1384,8 +1542,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 @@ -1407,12 +1566,6 @@ msgstr "" msgid "Couldn't update your design." msgstr "" -#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 -#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 -#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 -msgid "Unable to save your design settings!" -msgstr "" - #: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231 msgid "Design preferences saved." msgstr "" @@ -1427,6 +1580,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 "" @@ -1545,7 +1703,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 @@ -1578,7 +1737,8 @@ msgstr "" "s við í vinalistann þinn?)" #: actions/imsettings.php:124 -msgid "IM Address" +#, fuzzy +msgid "IM address" msgstr "Snarskilaboðafang" #: actions/imsettings.php:126 @@ -1677,7 +1837,7 @@ 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 lib/command.php:315 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -1723,7 +1883,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:234 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236 msgid "Send" msgstr "Senda" @@ -1793,16 +1953,7 @@ 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 -msgid "You are already a member of that group" -msgstr "Þú ert nú þegar meðlimur í þessum hópi" - -#: actions/joingroup.php:128 -#, fuzzy, php-format -msgid "Could not join user %1$s to group %2$s" -msgstr "Gat ekki bætt notandanum %s í hópinn %s" - -#: actions/joingroup.php:135 lib/command.php:239 +#: actions/joingroup.php:131 #, fuzzy, php-format msgid "%1$s joined group %2$s" msgstr "%s bætti sér í hópinn %s" @@ -1811,72 +1962,52 @@ msgstr "%s bætti sér í hópinn %s" msgid "You must be logged in to leave a group." msgstr "Þú verður aða hafa skráð þig inn til að ganga úr hóp." -#: actions/leavegroup.php:90 lib/command.php:268 +#: actions/leavegroup.php:90 lib/command.php:265 msgid "You are not a member of that group." msgstr "Þú ert ekki meðlimur í þessum hópi." -#: actions/leavegroup.php:119 lib/command.php:278 -msgid "Could not find membership record." -msgstr "Gat ekki fundið meðlimaskrá." - -#: actions/leavegroup.php:134 lib/command.php:289 +#: actions/leavegroup.php:127 #, 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:460 +#: 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 -#: lib/groupeditform.php:152 lib/userprofile.php:131 -msgid "Nickname" -msgstr "Stuttnefni" - -#: actions/login.php:253 actions/register.php:428 -#: 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." @@ -1884,7 +2015,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]" @@ -1904,19 +2035,42 @@ 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 %1$s in group %2$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 %1$s an admin for group %2$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" msgstr "Engin núverandi staða" +#: actions/newapplication.php:52 +msgid "New application" +msgstr "" + +#: actions/newapplication.php:64 +#, fuzzy +msgid "You must be logged in to register an application." +msgstr "Þú verður að hafa skráð þig inn til að búa til hóp." + +#: actions/newapplication.php:143 +#, fuzzy +msgid "Use this form to register a new application." +msgstr "Notaðu þetta eyðublað til að búa til nýjan hóp." + +#: actions/newapplication.php:173 +msgid "Source URL is required." +msgstr "" + +#: actions/newapplication.php:255 actions/newapplication.php:264 +#, fuzzy +msgid "Could not create application." +msgstr "Gat ekki búið til uppáhald." + #: actions/newgroup.php:53 msgid "New group" msgstr "Nýr hópur" @@ -1929,12 +2083,12 @@ msgstr "Notaðu þetta eyðublað til að búa til nýjan hóp." msgid "New message" msgstr "Ný skilaboð" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 msgid "You can't send a message to this user." msgstr "Þú getur ekki sent þessum notanda skilaboð." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:484 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 +#: lib/command.php:475 msgid "No content!" msgstr "Ekkert innihald!" @@ -1942,7 +2096,7 @@ msgstr "Ekkert innihald!" msgid "No recipient specified." msgstr "Enginn móttökuaðili tilgreindur." -#: actions/newmessage.php:164 lib/command.php:370 +#: actions/newmessage.php:164 lib/command.php:361 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -1954,8 +2108,8 @@ msgid "Message sent" msgstr "" #: actions/newmessage.php:185 -#, php-format -msgid "Direct message to %s sent" +#, fuzzy, php-format +msgid "Direct message to %s sent." msgstr "Bein skilaboð send til %s" #: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 @@ -2027,6 +2181,51 @@ msgstr "Ãtt við notanda" msgid "Nudge sent!" msgstr "Ãtt við notanda!" +#: actions/oauthappssettings.php:59 +#, fuzzy +msgid "You must be logged in to list your applications." +msgstr "Þú verður að hafa skráð þig inn til að bæta þér í hóp." + +#: actions/oauthappssettings.php:74 +#, fuzzy +msgid "OAuth applications" +msgstr "Aðrir valkostir" + +#: actions/oauthappssettings.php:85 +msgid "Applications you have registered" +msgstr "" + +#: actions/oauthappssettings.php:135 +#, php-format +msgid "You have not registered any applications yet." +msgstr "" + +#: actions/oauthconnectionssettings.php:71 +msgid "Connected applications" +msgstr "" + +#: actions/oauthconnectionssettings.php:87 +msgid "You have allowed the following applications to access you account." +msgstr "" + +#: actions/oauthconnectionssettings.php:170 +#, fuzzy +msgid "You are not a user of that application." +msgstr "Þú ert ekki meðlimur í þessum hópi." + +#: actions/oauthconnectionssettings.php:180 +msgid "Unable to revoke access for app: " +msgstr "" + +#: actions/oauthconnectionssettings.php:192 +#, php-format +msgid "You have not authorized any applications to use your account." +msgstr "" + +#: actions/oauthconnectionssettings.php:205 +msgid "Developers can edit the registration settings for their applications " +msgstr "" + #: actions/oembed.php:79 actions/shownotice.php:100 msgid "Notice has no profile" msgstr "Babl hefur enga persónulega síðu" @@ -2044,8 +2243,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:1038 +#: lib/api.php:1066 lib/api.php:1176 msgid "Not a supported data format." msgstr "Enginn stuðningur við gagnasnið." @@ -2058,7 +2257,8 @@ msgid "Notice Search" msgstr "Leit í babli" #: actions/othersettings.php:60 -msgid "Other Settings" +#, fuzzy +msgid "Other settings" msgstr "Aðrar stillingar" #: actions/othersettings.php:71 @@ -2090,6 +2290,31 @@ 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/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 msgid "Outbox for %s" @@ -2125,7 +2350,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" @@ -2295,8 +2520,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" @@ -2358,45 +2584,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 -#: lib/groupeditform.php:161 +#: actions/profilesettings.php:115 actions/register.php:453 +#: lib/applicationeditform.php:230 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\"" @@ -2696,7 +2922,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." @@ -2708,7 +2934,7 @@ msgstr "" msgid "Registration successful" msgstr "Nýskráning tókst" -#: actions/register.php:114 actions/register.php:502 lib/action.php:457 +#: actions/register.php:114 actions/register.php:503 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Nýskrá" @@ -2721,66 +2947,62 @@ 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 +#: actions/register.php:538 #, fuzzy, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -2813,7 +3035,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.)" @@ -2968,6 +3190,84 @@ msgstr "Þú getur ekki sent þessum notanda skilaboð." msgid "User is already sandboxed." msgstr "" +#: actions/showapplication.php:82 +#, fuzzy +msgid "You must be logged in to view an application." +msgstr "Þú verður aða hafa skráð þig inn til að ganga úr hóp." + +#: actions/showapplication.php:158 +#, fuzzy +msgid "Application profile" +msgstr "Babl hefur enga persónulega síðu" + +#: actions/showapplication.php:160 lib/applicationeditform.php:182 +msgid "Icon" +msgstr "" + +#: actions/showapplication.php:170 actions/version.php:195 +#: lib/applicationeditform.php:197 +#, fuzzy +msgid "Name" +msgstr "Stuttnefni" + +#: actions/showapplication.php:179 lib/applicationeditform.php:224 +#, fuzzy +msgid "Organization" +msgstr "Uppröðun" + +#: actions/showapplication.php:188 actions/version.php:198 +#: lib/applicationeditform.php:211 lib/groupeditform.php:172 +msgid "Description" +msgstr "Lýsing" + +#: actions/showapplication.php:193 actions/showgroup.php:429 +#: lib/profileaction.php:174 +msgid "Statistics" +msgstr "Tölfræði" + +#: actions/showapplication.php:204 +#, php-format +msgid "created by %1$s - %2$s access by default - %3$d users" +msgstr "" + +#: actions/showapplication.php:214 +msgid "Application actions" +msgstr "" + +#: actions/showapplication.php:233 +msgid "Reset key & secret" +msgstr "" + +#: actions/showapplication.php:241 +msgid "Application info" +msgstr "" + +#: actions/showapplication.php:243 +msgid "Consumer key" +msgstr "" + +#: actions/showapplication.php:248 +msgid "Consumer secret" +msgstr "" + +#: actions/showapplication.php:253 +msgid "Request token URL" +msgstr "" + +#: actions/showapplication.php:258 +msgid "Access token URL" +msgstr "" + +#: actions/showapplication.php:263 +msgid "Authorize URL" +msgstr "" + +#: actions/showapplication.php:268 +msgid "" +"Note: We support HMAC-SHA1 signatures. We do not support the plaintext " +"signature method." +msgstr "" + #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "Gat ekki sótt uppáhaldsbabl." @@ -3065,7 +3365,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)" @@ -3073,10 +3373,6 @@ msgstr "(Ekkert)" msgid "All members" msgstr "Allir meðlimir" -#: actions/showgroup.php:429 lib/profileaction.php:174 -msgid "Statistics" -msgstr "Tölfræði" - #: actions/showgroup.php:432 msgid "Created" msgstr "" @@ -3216,12 +3512,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 @@ -3411,7 +3707,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 @@ -3441,7 +3738,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 @@ -3692,10 +3990,6 @@ 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" @@ -3904,11 +4198,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 "" @@ -3985,11 +4274,6 @@ msgstr "" msgid "Plugins" msgstr "" -#: actions/version.php:195 -#, fuzzy -msgid "Name" -msgstr "Stuttnefni" - #: actions/version.php:196 lib/action.php:741 #, fuzzy msgid "Version" @@ -3999,27 +4283,43 @@ msgstr "Persónulegt" msgid "Author(s)" msgstr "" -#: actions/version.php:198 lib/groupeditform.php:172 -msgid "Description" -msgstr "Lýsing" - -#: classes/File.php:137 +#: 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/Group_member.php:41 +#, fuzzy +msgid "Group join failed." +msgstr "Hópssíðan" + +#: classes/Group_member.php:53 +#, fuzzy +msgid "Not part of group." +msgstr "Gat ekki uppfært hóp." + +#: classes/Group_member.php:60 +#, fuzzy +msgid "Group leave failed." +msgstr "Hópssíðan" + +#: 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." @@ -4033,51 +4333,51 @@ msgstr "Gat ekki skeytt skilaboðum inn í." msgid "Could not update message with new URI." msgstr "Gat ekki uppfært skilaboð með nýju veffangi." -#: classes/Notice.php:172 +#: classes/Notice.php:171 #, php-format msgid "DB error inserting hashtag: %s" msgstr "Gagnagrunnsvilla við innsetningu myllumerkis: %s" -#: classes/Notice.php:226 +#: classes/Notice.php:225 msgid "Problem saving notice. Too long." msgstr "" -#: classes/Notice.php:230 +#: classes/Notice.php:229 msgid "Problem saving notice. Unknown user." msgstr "Gat ekki vistað babl. Óþekktur notandi." -#: classes/Notice.php:235 +#: classes/Notice.php:234 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Of mikið babl í einu; slakaðu aðeins á og haltu svo áfram eftir nokkrar " "mínútur." -#: classes/Notice.php:241 +#: classes/Notice.php:240 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:247 +#: classes/Notice.php:246 msgid "You are banned from posting notices on this site." msgstr "Það hefur verið lagt bann við babli frá þér á þessari síðu." -#: classes/Notice.php:309 classes/Notice.php:334 +#: classes/Notice.php:305 classes/Notice.php:330 msgid "Problem saving notice." msgstr "Vandamál komu upp við að vista babl." -#: classes/Notice.php:1034 +#: classes/Notice.php:1052 #, php-format msgid "DB error inserting reply: %s" msgstr "Gagnagrunnsvilla við innsetningu svars: %s" -#: classes/Notice.php:1359 +#: classes/Notice.php:1423 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" -#: classes/User.php:368 +#: classes/User.php:382 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" @@ -4118,6 +4418,11 @@ msgstr "Annað" msgid "Other options" msgstr "Aðrir valkostir" +#: lib/action.php:144 +#, fuzzy, php-format +msgid "%1$s - %2$s" +msgstr "%1$s (%2$s)" + #: lib/action.php:159 msgid "Untitled page" msgstr "Ónafngreind síða" @@ -4134,10 +4439,6 @@ msgstr "Heim" msgid "Personal profile and friends timeline" msgstr "Persónuleg síða og vinarás" -#: lib/action.php:435 -msgid "Account" -msgstr "Aðgangur" - #: lib/action.php:435 msgid "Change your email, avatar, password, profile" msgstr "" @@ -4297,10 +4598,6 @@ msgstr "Eftir" msgid "Before" msgstr "Ãður" -#: lib/action.php:1167 -msgid "There was a problem with your session token." -msgstr "Það komu upp vandamál varðandi setutókann þinn." - #: lib/adminpanelaction.php:96 #, fuzzy msgid "You cannot make changes to this site." @@ -4340,6 +4637,72 @@ msgstr "SMS staðfesting" msgid "Paths configuration" msgstr "SMS staðfesting" +#: lib/applicationeditform.php:186 +msgid "Icon for this application" +msgstr "" + +#: lib/applicationeditform.php:206 +#, fuzzy, php-format +msgid "Describe your application in %d characters" +msgstr "Lýstu hópnum eða umfjöllunarefninu með 140 táknum" + +#: lib/applicationeditform.php:209 +#, fuzzy +msgid "Describe your application" +msgstr "Lýstu hópnum eða umfjöllunarefninu með 140 táknum" + +#: lib/applicationeditform.php:218 +#, fuzzy +msgid "Source URL" +msgstr "Frumþula" + +#: lib/applicationeditform.php:220 +#, fuzzy +msgid "URL of the homepage of this application" +msgstr "Vefslóð vefsíðu hópsins eða umfjöllunarefnisins" + +#: lib/applicationeditform.php:226 +msgid "Organization responsible for this application" +msgstr "" + +#: lib/applicationeditform.php:232 +#, fuzzy +msgid "URL for the homepage of the organization" +msgstr "Vefslóð vefsíðu hópsins eða umfjöllunarefnisins" + +#: lib/applicationeditform.php:238 +msgid "URL to redirect to after authentication" +msgstr "" + +#: lib/applicationeditform.php:260 +msgid "Browser" +msgstr "" + +#: lib/applicationeditform.php:276 +msgid "Desktop" +msgstr "" + +#: lib/applicationeditform.php:277 +msgid "Type of application, browser or desktop" +msgstr "" + +#: lib/applicationeditform.php:299 +msgid "Read-only" +msgstr "" + +#: lib/applicationeditform.php:317 +msgid "Read-write" +msgstr "" + +#: lib/applicationeditform.php:318 +msgid "Default access for this application: read-only, or read-write" +msgstr "" + +#: lib/applicationlist.php:154 +#, fuzzy +msgid "Revoke" +msgstr "Fjarlægja" + #: lib/attachmentlist.php:87 msgid "Attachments" msgstr "" @@ -4360,12 +4723,12 @@ msgstr "" msgid "Tags for this attachment" msgstr "" -#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 +#: lib/authenticationplugin.php:214 lib/authenticationplugin.php:219 #, fuzzy msgid "Password changing failed" msgstr "Lykilorðabreyting" -#: lib/authenticationplugin.php:197 +#: lib/authenticationplugin.php:229 #, fuzzy msgid "Password changing is not allowed" msgstr "Lykilorðabreyting" @@ -4388,7 +4751,7 @@ msgstr "Fyrirgefðu en þessi skipun hefur ekki enn verið útbúin." #: lib/command.php:88 #, fuzzy, php-format -msgid "Could not find a user with nickname %s." +msgid "Could not find a user with nickname %s" msgstr "Gat ekki uppfært notanda með staðfestu tölvupóstfangi." #: lib/command.php:92 @@ -4397,7 +4760,7 @@ msgstr "" #: lib/command.php:99 #, fuzzy, php-format -msgid "Nudge sent to %s." +msgid "Nudge sent to %s" msgstr "Ãtt við notanda" #: lib/command.php:126 @@ -4408,173 +4771,194 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:399 lib/command.php:460 +#: lib/command.php:152 lib/command.php:390 lib/command.php:451 #, fuzzy -msgid "Notice with that id does not exist." +msgid "Notice with that id does not exist" msgstr "Enginn persónuleg síða með þessu einkenni." -#: lib/command.php:168 lib/command.php:415 lib/command.php:476 -#: lib/command.php:532 -#, fuzzy -msgid "User has no last notice." +#: lib/command.php:168 lib/command.php:406 lib/command.php:467 +#: lib/command.php:523 +msgid "User has no last notice" msgstr "Notandi hefur ekkert nýtt babl" #: lib/command.php:190 msgid "Notice marked as fave." msgstr "Babl gert að uppáhaldi." -#: lib/command.php:284 -#, fuzzy, php-format -msgid "Could not remove user %1$s to group %2$s." +#: lib/command.php:217 +msgid "You are already a member of that group" +msgstr "Þú ert nú þegar meðlimur í þessum hópi" + +#: lib/command.php:231 +#, php-format +msgid "Could not join user %s to group %s" +msgstr "Gat ekki bætt notandanum %s í hópinn %s" + +#: lib/command.php:236 +#, php-format +msgid "%s joined group %s" +msgstr "%s bætti sér í hópinn %s" + +#: lib/command.php:275 +#, 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:318 +#: lib/command.php:280 +#, php-format +msgid "%s left group %s" +msgstr "%s gekk úr hópnum %s" + +#: lib/command.php:309 #, php-format msgid "Fullname: %s" msgstr "Fullt nafn: %s" -#: lib/command.php:321 +#: lib/command.php:312 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "Staðsetning: %s" -#: lib/command.php:324 +#: lib/command.php:315 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "Heimasíða: %s" -#: lib/command.php:327 +#: lib/command.php:318 #, php-format msgid "About: %s" msgstr "Um: %s" -#: lib/command.php:358 +#: lib/command.php:349 #, fuzzy, php-format -msgid "Message too long - maximum is %1$d characters, you sent %2$d." +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." +#: lib/command.php:367 +#, php-format +msgid "Direct message to %s sent" msgstr "Bein skilaboð send til %s" -#: lib/command.php:378 +#: lib/command.php:369 msgid "Error sending direct message." msgstr "Villa kom upp við að senda bein skilaboð" -#: lib/command.php:435 +#: lib/command.php:413 +#, fuzzy +msgid "Cannot repeat your own notice" +msgstr "Get ekki kveikt á tilkynningum." + +#: lib/command.php:418 +#, fuzzy +msgid "Already repeated that notice" +msgstr "Eyða þessu babli" + +#: lib/command.php:426 #, fuzzy, php-format -msgid "Notice from %s repeated." +msgid "Notice from %s repeated" msgstr "Babl sent inn" -#: lib/command.php:437 +#: lib/command.php:428 #, fuzzy msgid "Error repeating notice." msgstr "Vandamál komu upp við að vista babl." -#: lib/command.php:491 +#: lib/command.php:482 #, fuzzy, php-format -msgid "Notice too long - maximum is %1$d characters, you sent %2$d." +msgid "Notice 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:500 +#: lib/command.php:491 #, fuzzy, php-format -msgid "Reply to %s sent." +msgid "Reply to %s sent" msgstr "Svara þessu babli" -#: lib/command.php:502 +#: lib/command.php:493 #, fuzzy 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." +#: lib/command.php:547 +msgid "Specify the name of the user to subscribe to" msgstr "Tilgreindu nafn notandans sem þú vilt gerast áskrifandi að" -#: lib/command.php:563 +#: lib/command.php:554 #, php-format 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." +#: lib/command.php:575 +msgid "Specify the name of the user to unsubscribe from" msgstr "Tilgreindu nafn notandans sem þú vilt hætta sem áskrifandi að" -#: lib/command.php:591 +#: lib/command.php:582 #, php-format msgid "Unsubscribed from %s" msgstr "Nú ert þú ekki lengur áskrifandi að %s" -#: lib/command.php:609 lib/command.php:632 +#: lib/command.php:600 lib/command.php:623 msgid "Command not yet implemented." msgstr "Skipun hefur ekki verið fullbúin" -#: lib/command.php:612 +#: lib/command.php:603 msgid "Notification off." msgstr "Tilkynningar af." -#: lib/command.php:614 +#: lib/command.php:605 msgid "Can't turn off notification." msgstr "Get ekki slökkt á tilkynningum." -#: lib/command.php:635 +#: lib/command.php:626 msgid "Notification on." msgstr "Tilkynningar á." -#: lib/command.php:637 +#: lib/command.php:628 msgid "Can't turn on notification." msgstr "Get ekki kveikt á tilkynningum." -#: lib/command.php:650 -msgid "Login command is disabled." +#: lib/command.php:641 +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:652 #, php-format -msgid "This link is useable only once, and is good for only 2 minutes: %s." +msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:685 +#: lib/command.php:668 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Þú ert ekki áskrifandi." -#: lib/command.php:687 +#: lib/command.php:670 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:690 #, 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:692 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:712 #, 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:714 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:728 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4615,20 +4999,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:199 +#: lib/common.php:131 #, fuzzy msgid "No configuration file found. " msgstr "Enginn staðfestingarlykill." -#: lib/common.php:200 +#: lib/common.php:132 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:201 +#: lib/common.php:134 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:202 +#: lib/common.php:135 #, fuzzy msgid "Go to the installer." msgstr "Skrá þig inn á síðuna" @@ -4645,6 +5029,15 @@ msgstr "Færslur sendar með snarskilaboðaþjónustu (instant messaging)" msgid "Updates by SMS" msgstr "Færslur sendar með SMS" +#: lib/connectsettingsaction.php:120 +#, fuzzy +msgid "Connections" +msgstr "Tengjast" + +#: lib/connectsettingsaction.php:121 +msgid "Authorized connected applications" +msgstr "" + #: lib/dberroraction.php:60 msgid "Database error" msgstr "" @@ -4831,11 +5224,16 @@ msgstr "" msgid "kB" msgstr "" -#: lib/jabber.php:191 +#: lib/jabber.php:202 #, php-format msgid "[%s]" msgstr "" +#: lib/jabber.php:385 +#, php-format +msgid "Unknown inbox source %d." +msgstr "" + #: lib/joinform.php:114 msgid "Join" msgstr "Gerast meðlimur" @@ -4893,21 +5291,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" @@ -5105,7 +5491,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 @@ -5114,7 +5500,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 @@ -5124,7 +5510,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 @@ -5158,16 +5544,18 @@ msgstr "" #: lib/noticeform.php:212 #, fuzzy -msgid "Share my location." -msgstr "Gat ekki vistað merki." - -#: lib/noticeform.php:214 -#, fuzzy -msgid "Do not share my location." +msgid "Share my location" msgstr "Gat ekki vistað merki." #: lib/noticeform.php:215 -msgid "Hide this info" +#, fuzzy +msgid "Do not share my location" +msgstr "Gat ekki vistað merki." + +#: lib/noticeform.php:216 +msgid "" +"Sorry, retrieving your geo location is taking longer than expected, please " +"try again later" msgstr "" #: lib/noticelist.php:428 @@ -5440,25 +5828,25 @@ msgstr "" msgid "User has blocked you." msgstr "Notandinn hefur lokað á þig." -#: lib/subs.php:60 +#: lib/subs.php:63 msgid "Could not subscribe." msgstr "Gat ekki farið í áskrift." -#: lib/subs.php:79 +#: lib/subs.php:82 msgid "Could not subscribe other to you." msgstr "Gat ekki leyft öðrum að gerast áskrifandi að þér." -#: lib/subs.php:128 +#: lib/subs.php:137 #, fuzzy msgid "Not subscribed!" msgstr "Ekki í áskrift!" -#: lib/subs.php:133 +#: lib/subs.php:142 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "Gat ekki eytt áskrift." -#: lib/subs.php:146 +#: lib/subs.php:158 msgid "Couldn't delete subscription." msgstr "Gat ekki eytt áskrift." @@ -5472,10 +5860,6 @@ msgstr "" msgid "People Tagcloud as tagged" msgstr "" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(ekkert)" - #: lib/tagcloudsection.php:56 msgid "None" msgstr "Ekkert" @@ -5538,47 +5922,47 @@ msgstr "Skilaboð" msgid "Moderate" msgstr "" -#: lib/util.php:837 +#: lib/util.php:875 msgid "a few seconds ago" msgstr "fyrir nokkrum sekúndum" -#: lib/util.php:839 +#: lib/util.php:877 msgid "about a minute ago" msgstr "fyrir um einni mínútu síðan" -#: lib/util.php:841 +#: lib/util.php:879 #, php-format msgid "about %d minutes ago" msgstr "fyrir um %d mínútum síðan" -#: lib/util.php:843 +#: lib/util.php:881 msgid "about an hour ago" msgstr "fyrir um einum klukkutíma síðan" -#: lib/util.php:845 +#: lib/util.php:883 #, php-format msgid "about %d hours ago" msgstr "fyrir um %d klukkutímum síðan" -#: lib/util.php:847 +#: lib/util.php:885 msgid "about a day ago" msgstr "fyrir um einum degi síðan" -#: lib/util.php:849 +#: lib/util.php:887 #, php-format msgid "about %d days ago" msgstr "fyrir um %d dögum síðan" -#: lib/util.php:851 +#: lib/util.php:889 msgid "about a month ago" msgstr "fyrir um einum mánuði síðan" -#: lib/util.php:853 +#: lib/util.php:891 #, php-format msgid "about %d months ago" msgstr "fyrir um %d mánuðum síðan" -#: lib/util.php:855 +#: lib/util.php:893 msgid "about a year ago" msgstr "fyrir um einu ári síðan" @@ -5594,5 +5978,5 @@ msgstr "" #: scripts/xmppdaemon.php:301 #, fuzzy, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "Skilaboð eru of löng - 140 tákn eru í mesta lagi leyfð en þú sendir %d" diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po index 2870622620..032a363f0a 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-10 00:46+0000\n" -"PO-Revision-Date: 2010-01-10 00:48:16+0000\n" +"POT-Creation-Date: 2010-01-15 19:15+0000\n" +"PO-Revision-Date: 2010-01-15 19:17:18+0000\n" "Language-Team: Italian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60878); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r61101); 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" @@ -34,25 +34,30 @@ msgstr "Pagina inesistente." #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 +#: actions/apistatusesupdate.php:149 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 #: 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 #: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 -#: lib/command.php:163 lib/command.php:311 lib/command.php:364 -#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/command.php:163 lib/command.php:302 lib/command.php:355 +#: lib/command.php:401 lib/command.php:462 lib/command.php:518 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/subs.php:34 lib/subs.php:125 msgid "No such user." msgstr "Utente inesistente." +#: actions/all.php:84 +#, fuzzy, php-format +msgid "%1$s and friends, page %2$d" +msgstr "Profili bloccati di %1$s, pagina %2$d" + #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 +#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -91,13 +96,14 @@ msgstr "" "scrivi un messaggio." #: actions/all.php:134 -#, fuzzy, php-format +#, php-format msgid "" "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 @@ -112,7 +118,7 @@ msgstr "" msgid "You and friends" msgstr "Tu e i tuoi amici" -#: actions/allrss.php:119 actions/apitimelinefriends.php:122 +#: actions/allrss.php:119 actions/apitimelinefriends.php:121 #: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" @@ -123,6 +129,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:155 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." @@ -136,7 +159,7 @@ msgstr "Metodo delle API non trovato." #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:114 +#: actions/apistatusesupdate.php:119 msgid "This method requires a POST." msgstr "Questo metodo richiede POST." @@ -167,8 +190,9 @@ msgstr "Impossibile salvare il profilo." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257 -#: actions/designadminpanel.php:122 actions/newnotice.php:94 +#: actions/apistatusesupdate.php:132 actions/avatarsettings.php:257 +#: actions/designadminpanel.php:122 actions/editapplication.php:118 +#: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format msgid "" @@ -182,6 +206,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." @@ -222,26 +249,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!" @@ -265,16 +272,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." @@ -294,8 +301,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." @@ -329,7 +336,8 @@ msgstr "Soprannome già in uso. Prova con un altro." msgid "Not a valid nickname." msgstr "Non è un soprannome valido." -#: actions/apigroupcreate.php:196 actions/editgroup.php:195 +#: actions/apigroupcreate.php:196 actions/editapplication.php:212 +#: actions/editgroup.php:195 actions/newapplication.php:200 #: actions/newgroup.php:139 actions/profilesettings.php:222 #: actions/register.php:217 msgid "Homepage is not a valid URL." @@ -341,7 +349,8 @@ msgstr "L'indirizzo della pagina web non è valido." msgid "Full name is too long (max 255 chars)." msgstr "Nome troppo lungo (max 255 caratteri)." -#: actions/apigroupcreate.php:213 +#: actions/apigroupcreate.php:213 actions/editapplication.php:187 +#: actions/newapplication.php:169 #, php-format msgid "Description is too long (max %d chars)." msgstr "La descrizione è troppo lunga (max %d caratteri)." @@ -381,7 +390,7 @@ msgstr "L'alias non può essere lo stesso del soprannome." msgid "Group not found!" msgstr "Gruppo non trovato!" -#: actions/apigroupjoin.php:110 lib/command.php:217 +#: actions/apigroupjoin.php:110 actions/joingroup.php:90 msgid "You are already a member of that group." msgstr "Fai già parte di quel gruppo." @@ -389,19 +398,19 @@ 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 lib/command.php:234 -#, fuzzy, php-format +#: actions/apigroupjoin.php:138 actions/joingroup.php:124 +#, php-format msgid "Could not join user %1$s to group %2$s." -msgstr "Impossibile iscrivere l'utente %s al gruppo %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/leavegroup.php:127 -#, fuzzy, php-format +#: actions/apigroupleave.php:124 actions/leavegroup.php:119 +#, php-format msgid "Could not remove user %1$s from group %2$s." -msgstr "Impossibile rimuovere l'utente %s dal gruppo %s." +msgstr "Impossibile rimuovere l'utente %1$s dal gruppo %2$s." #: actions/apigrouplist.php:95 #, php-format @@ -418,6 +427,103 @@ msgstr "Gruppi di %s" msgid "groups on %s" msgstr "Gruppi su %s" +#: actions/apioauthauthorize.php:108 actions/apioauthauthorize.php:114 +msgid "Bad request." +msgstr "" + +#: actions/apioauthauthorize.php:134 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:115 actions/makeadmin.php:66 +#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 +#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:139 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 +#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/subscribe.php:46 actions/tagother.php:166 +#: 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 "" +"Si è verificato un problema con il tuo token di sessione. Prova di nuovo." + +#: actions/apioauthauthorize.php:146 +#, fuzzy +msgid "Invalid nickname / password!" +msgstr "Nome utente o password non valido." + +#: actions/apioauthauthorize.php:170 +#, fuzzy +msgid "DB error deleting OAuth app user." +msgstr "Errore nell'impostare l'utente." + +#: actions/apioauthauthorize.php:196 +#, fuzzy +msgid "DB error inserting OAuth app user." +msgstr "Errore del DB nell'inserire un hashtag: %s" + +#: actions/apioauthauthorize.php:231 +#, php-format +msgid "" +"The request token %s has been authorized. Please exchange it for an access " +"token." +msgstr "" + +#: actions/apioauthauthorize.php:241 +#, php-format +msgid "The request token %s has been denied." +msgstr "" + +#: actions/apioauthauthorize.php:246 actions/avatarsettings.php:281 +#: actions/designadminpanel.php:103 actions/editapplication.php:139 +#: actions/emailsettings.php:256 actions/grouplogo.php:319 +#: actions/imsettings.php:220 actions/newapplication.php:121 +#: actions/oauthconnectionssettings.php:151 actions/recoverpassword.php:44 +#: actions/smssettings.php:248 lib/designsettings.php:304 +msgid "Unexpected form submission." +msgstr "Invio del modulo inaspettato." + +#: actions/apioauthauthorize.php:273 +msgid "An application would like to connect to your account" +msgstr "" + +#: actions/apioauthauthorize.php:290 +msgid "Allow or deny access" +msgstr "" + +#: actions/apioauthauthorize.php:320 lib/action.php:435 +msgid "Account" +msgstr "Account" + +#: actions/apioauthauthorize.php:323 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/apioauthauthorize.php:326 actions/login.php:233 +#: actions/register.php:429 lib/accountsettingsaction.php:116 +msgid "Password" +msgstr "Password" + +#: actions/apioauthauthorize.php:338 +#, fuzzy +msgid "Deny" +msgstr "Aspetto" + +#: actions/apioauthauthorize.php:344 +#, fuzzy +msgid "Allow" +msgstr "Tutto" + +#: actions/apioauthauthorize.php:361 +msgid "Allow or deny access to your account information." +msgstr "" + #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." msgstr "Questo metodo richiede POST o DELETE." @@ -431,11 +537,11 @@ msgstr "Non puoi eliminare il messaggio di un altro utente." msgid "No such notice." msgstr "Nessun messaggio." -#: actions/apistatusesretweet.php:83 lib/command.php:422 +#: actions/apistatusesretweet.php:83 msgid "Cannot repeat your own notice." msgstr "Non puoi ripetere un tuo messaggio." -#: actions/apistatusesretweet.php:91 lib/command.php:427 +#: actions/apistatusesretweet.php:91 msgid "Already repeated that notice." msgstr "Hai già ripetuto quel messaggio." @@ -447,17 +553,17 @@ msgstr "Messaggio eliminato." msgid "No status with that ID found." msgstr "Nessun stato trovato con quel ID." -#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:162 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Troppo lungo. Lunghezza massima %d caratteri." -#: actions/apistatusesupdate.php:198 +#: actions/apistatusesupdate.php:203 msgid "Not found" msgstr "Non trovato" -#: actions/apistatusesupdate.php:221 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:226 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -468,14 +574,14 @@ msgid "Unsupported format." msgstr "Formato non supportato." #: actions/apitimelinefavorites.php:108 -#, fuzzy, php-format +#, php-format msgid "%1$s / Favorites from %2$s" -msgstr "%s / Preferiti da %s" +msgstr "%1$s / Preferiti da %2$s" #: actions/apitimelinefavorites.php:120 -#, fuzzy, php-format +#, php-format msgid "%1$s updates favorited by %2$s / %2$s." -msgstr "%s aggiornamenti preferiti da %s / %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 @@ -542,8 +648,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." @@ -567,8 +676,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" @@ -600,30 +709,6 @@ 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/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 -#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 -#: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 -#: actions/subscribe.php:46 actions/tagother.php:166 -#: 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 "" -"Si è verificato un problema con il tuo token di sessione. Prova di nuovo." - -#: actions/avatarsettings.php:281 actions/designadminpanel.php:103 -#: actions/emailsettings.php:256 actions/grouplogo.php:319 -#: actions/imsettings.php:220 actions/recoverpassword.php:44 -#: actions/smssettings.php:248 lib/designsettings.php:304 -msgid "Unexpected form submission." -msgstr "Invio del modulo inaspettato." - #: actions/avatarsettings.php:328 msgid "Pick a square area of the image to be your avatar" msgstr "Scegli un'area quadrata per la tua immagine personale" @@ -685,19 +770,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:260 +msgid "No such group." +msgstr "Nessuna gruppo." #: actions/blockedfromgroup.php:90 #, php-format @@ -705,9 +786,9 @@ msgid "%s blocked profiles" msgstr "Profili bloccati di %s" #: actions/blockedfromgroup.php:93 -#, fuzzy, php-format +#, php-format msgid "%1$s blocked profiles, page %2$d" -msgstr "Profili bloccati di %s, pagina %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." @@ -764,7 +845,8 @@ msgid "Couldn't delete email confirmation." msgstr "Impossibile eliminare l'email di conferma." #: actions/confirmaddress.php:144 -msgid "Confirm Address" +#, fuzzy +msgid "Confirm address" msgstr "Conferma indirizzo" #: actions/confirmaddress.php:159 @@ -819,11 +901,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." @@ -957,7 +1034,8 @@ msgstr "Reimposta i valori predefiniti" #: actions/pathsadminpanel.php:324 actions/profilesettings.php:174 #: actions/siteadminpanel.php:388 actions/smssettings.php:181 #: actions/subscriptions.php:203 actions/tagother.php:154 -#: actions/useradminpanel.php:313 lib/designsettings.php:256 +#: actions/useradminpanel.php:313 lib/applicationeditform.php:335 +#: lib/applicationeditform.php:336 lib/designsettings.php:256 #: lib/groupeditform.php:202 msgid "Save" msgstr "Salva" @@ -978,6 +1056,87 @@ msgstr "Aggiungi ai preferiti" msgid "No such document." msgstr "Nessun documento." +#: actions/editapplication.php:54 lib/applicationeditform.php:136 +msgid "Edit application" +msgstr "" + +#: actions/editapplication.php:66 +#, fuzzy +msgid "You must be logged in to edit an application." +msgstr "Devi eseguire l'accesso per modificare un gruppo." + +#: actions/editapplication.php:77 actions/showapplication.php:94 +#, fuzzy +msgid "You are not the owner of this application." +msgstr "Non fai parte di questo gruppo." + +#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:163 +#: actions/showapplication.php:87 +#, fuzzy +msgid "No such application." +msgstr "Nessun messaggio." + +#: actions/editapplication.php:127 actions/newapplication.php:110 +#: actions/showapplication.php:118 lib/action.php:1167 +msgid "There was a problem with your session token." +msgstr "Si è verificato un problema con il tuo token di sessione." + +#: actions/editapplication.php:161 +#, fuzzy +msgid "Use this form to edit your application." +msgstr "Usa questo modulo per modificare il gruppo." + +#: actions/editapplication.php:177 actions/newapplication.php:159 +#, fuzzy +msgid "Name is required." +msgstr "Stessa password di sopra; richiesta" + +#: actions/editapplication.php:180 actions/newapplication.php:162 +#, fuzzy +msgid "Name is too long (max 255 chars)." +msgstr "Nome troppo lungo (max 255 caratteri)." + +#: actions/editapplication.php:183 actions/newapplication.php:165 +#, fuzzy +msgid "Description is required." +msgstr "Descrizione" + +#: actions/editapplication.php:191 +msgid "Source URL is too long." +msgstr "" + +#: actions/editapplication.php:197 actions/newapplication.php:182 +#, fuzzy +msgid "Source URL is not valid." +msgstr "L'URL \"%s\" dell'immagine non è valido." + +#: actions/editapplication.php:200 actions/newapplication.php:185 +msgid "Organization is required." +msgstr "" + +#: actions/editapplication.php:203 actions/newapplication.php:188 +#, fuzzy +msgid "Organization is too long (max 255 chars)." +msgstr "Ubicazione troppo lunga (max 255 caratteri)." + +#: actions/editapplication.php:206 actions/newapplication.php:191 +msgid "Organization homepage is required." +msgstr "" + +#: actions/editapplication.php:215 actions/newapplication.php:203 +msgid "Callback is too long." +msgstr "" + +#: actions/editapplication.php:222 actions/newapplication.php:212 +#, fuzzy +msgid "Callback URL is not valid." +msgstr "L'URL \"%s\" dell'immagine non è valido." + +#: actions/editapplication.php:255 +#, fuzzy +msgid "Could not update application." +msgstr "Impossibile aggiornare il gruppo." + #: actions/editgroup.php:56 #, php-format msgid "Edit %s group" @@ -989,8 +1148,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." @@ -1014,7 +1173,7 @@ msgid "Options saved." msgstr "Opzioni salvate." #: actions/emailsettings.php:60 -msgid "Email Settings" +msgid "Email settings" msgstr "Impostazioni email" #: actions/emailsettings.php:71 @@ -1047,13 +1206,14 @@ msgstr "" "istruzioni." #: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 +#: actions/smssettings.php:126 lib/applicationeditform.php:333 +#: lib/applicationeditform.php:334 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\"" @@ -1129,9 +1289,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." @@ -1229,7 +1390,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 @@ -1314,13 +1475,6 @@ 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:79 msgid "No such file." msgstr "Nessun file." @@ -1337,7 +1491,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." @@ -1363,14 +1517,15 @@ msgid "Block user from group" msgstr "Blocca l'utente dal gruppo" #: actions/groupblock.php:162 -#, fuzzy, php-format +#, php-format msgid "" "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " "will be removed from the group, unable to post, and unable to subscribe to " "the group in the future." msgstr "" -"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" @@ -1384,9 +1539,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." @@ -1409,12 +1564,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." @@ -1431,6 +1580,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." @@ -1449,9 +1602,9 @@ msgid "%s group members" msgstr "Membri del gruppo %s" #: actions/groupmembers.php:96 -#, fuzzy, php-format +#, php-format msgid "%1$s group members, page %2$d" -msgstr "Membri del gruppo %s, pagina %d" +msgstr "Membri del gruppo %1$s, pagina %2$d" #: actions/groupmembers.php:111 msgid "A list of the users in this group." @@ -1560,7 +1713,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 @@ -1592,7 +1745,7 @@ msgstr "" "elenco contatti?" #: actions/imsettings.php:124 -msgid "IM Address" +msgid "IM address" msgstr "Indirizzo di messaggistica istantanea" #: actions/imsettings.php:126 @@ -1691,7 +1844,7 @@ 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 lib/command.php:315 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -1736,7 +1889,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:234 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236 msgid "Send" msgstr "Invia" @@ -1806,86 +1959,58 @@ 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 -msgid "You are already a member of that group" -msgstr "Fai già parte di quel gruppo" - -#: actions/joingroup.php:128 -#, fuzzy, php-format -msgid "Could not join user %1$s to group %2$s" -msgstr "Impossibile iscrivere l'utente %s al gruppo %s" - -#: actions/joingroup.php:135 lib/command.php:239 -#, fuzzy, php-format +#: actions/joingroup.php:131 +#, php-format msgid "%1$s joined group %2$s" -msgstr "%s fa ora parte del gruppo %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." msgstr "Devi eseguire l'accesso per lasciare un gruppo." -#: actions/leavegroup.php:90 lib/command.php:268 +#: actions/leavegroup.php:90 lib/command.php:265 msgid "You are not a member of that group." msgstr "Non fai parte di quel gruppo." -#: actions/leavegroup.php:119 lib/command.php:278 -msgid "Could not find membership record." -msgstr "Impossibile trovare il record della membership." - -#: actions/leavegroup.php:134 lib/command.php:289 -#, fuzzy, php-format +#: actions/leavegroup.php:127 +#, php-format msgid "%1$s left group %2$s" -msgstr "%s ha lasciato il gruppo %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:460 +#: 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 -#: lib/groupeditform.php:152 lib/userprofile.php:131 -msgid "Nickname" -msgstr "Soprannome" - -#: actions/login.php:253 actions/register.php:428 -#: 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." @@ -1893,7 +2018,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]" @@ -1908,24 +2033,47 @@ msgstr "" "Solo gli amministratori possono rendere un altro utente amministratori." #: actions/makeadmin.php:95 -#, fuzzy, php-format +#, php-format msgid "%1$s is already an admin for group \"%2$s\"." -msgstr "%s è già amministratore per il gruppo \"%s\"." +msgstr "%1$s è già amministratore del gruppo \"%2$s\"." #: actions/makeadmin.php:132 -#, fuzzy, php-format -msgid "Can't get membership record for %1$s in group %2$s" -msgstr "Impossibile recuperare la membership per %s nel gruppo %s" +#, php-format +msgid "Can't get membership record for %1$s in group %2$s." +msgstr "Impossibile recuperare la membership per %1$s nel gruppo %2$s" #: actions/makeadmin.php:145 -#, fuzzy, php-format -msgid "Can't make %1$s an admin for group %2$s" -msgstr "Impossibile rendere %s un amministratore per il gruppo %s" +#, php-format +msgid "Can't make %1$s an admin for group %2$s." +msgstr "Impossibile rendere %1$s un amministratore del gruppo %2$s" #: actions/microsummary.php:69 msgid "No current status" msgstr "Nessun messaggio corrente" +#: actions/newapplication.php:52 +msgid "New application" +msgstr "" + +#: actions/newapplication.php:64 +#, fuzzy +msgid "You must be logged in to register an application." +msgstr "Devi eseguire l'accesso per creare un gruppo." + +#: actions/newapplication.php:143 +#, fuzzy +msgid "Use this form to register a new application." +msgstr "Usa questo modulo per creare un nuovo gruppo." + +#: actions/newapplication.php:173 +msgid "Source URL is required." +msgstr "" + +#: actions/newapplication.php:255 actions/newapplication.php:264 +#, fuzzy +msgid "Could not create application." +msgstr "Impossibile creare gli alias." + #: actions/newgroup.php:53 msgid "New group" msgstr "Nuovo gruppo" @@ -1938,12 +2086,12 @@ msgstr "Usa questo modulo per creare un nuovo gruppo." msgid "New message" msgstr "Nuovo messaggio" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 msgid "You can't send a message to this user." msgstr "Non puoi inviare un messaggio a questo utente." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:484 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 +#: lib/command.php:475 msgid "No content!" msgstr "Nessun contenuto!" @@ -1951,7 +2099,7 @@ msgstr "Nessun contenuto!" msgid "No recipient specified." msgstr "Nessun destinatario specificato." -#: actions/newmessage.php:164 lib/command.php:370 +#: actions/newmessage.php:164 lib/command.php:361 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "Non inviarti un messaggio, piuttosto ripetilo a voce dolcemente." @@ -1962,8 +2110,8 @@ msgstr "Messaggio inviato" #: 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" @@ -1993,7 +2141,7 @@ msgstr "Cerca testo" #: actions/noticesearch.php:91 #, fuzzy, php-format msgid "Search results for \"%1$s\" on %2$s" -msgstr "Risultati della ricerca per \"%s\" su %s" +msgstr "Risultati della ricerca per \"%1$s\" su %2$s" #: actions/noticesearch.php:121 #, php-format @@ -2038,6 +2186,51 @@ msgstr "Richiamo inviato" msgid "Nudge sent!" msgstr "Richiamo inviato!" +#: actions/oauthappssettings.php:59 +#, fuzzy +msgid "You must be logged in to list your applications." +msgstr "Devi eseguire l'accesso per modificare un gruppo." + +#: actions/oauthappssettings.php:74 +#, fuzzy +msgid "OAuth applications" +msgstr "Altre opzioni" + +#: actions/oauthappssettings.php:85 +msgid "Applications you have registered" +msgstr "" + +#: actions/oauthappssettings.php:135 +#, php-format +msgid "You have not registered any applications yet." +msgstr "" + +#: actions/oauthconnectionssettings.php:71 +msgid "Connected applications" +msgstr "" + +#: actions/oauthconnectionssettings.php:87 +msgid "You have allowed the following applications to access you account." +msgstr "" + +#: actions/oauthconnectionssettings.php:170 +#, fuzzy +msgid "You are not a user of that application." +msgstr "Non fai parte di quel gruppo." + +#: actions/oauthconnectionssettings.php:180 +msgid "Unable to revoke access for app: " +msgstr "" + +#: actions/oauthconnectionssettings.php:192 +#, php-format +msgid "You have not authorized any applications to use your account." +msgstr "" + +#: actions/oauthconnectionssettings.php:205 +msgid "Developers can edit the registration settings for their applications " +msgstr "" + #: actions/oembed.php:79 actions/shownotice.php:100 msgid "Notice has no profile" msgstr "Il messaggio non ha un profilo" @@ -2055,8 +2248,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:1038 +#: lib/api.php:1066 lib/api.php:1176 msgid "Not a supported data format." msgstr "Non è un formato di dati supportato." @@ -2069,7 +2262,8 @@ msgid "Notice Search" msgstr "Cerca messaggi" #: actions/othersettings.php:60 -msgid "Other Settings" +#, fuzzy +msgid "Other settings" msgstr "Altre impostazioni" #: actions/othersettings.php:71 @@ -2100,6 +2294,31 @@ 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/otp.php:69 +#, fuzzy +msgid "No user ID specified." +msgstr "Nessun ID utente specificato." + +#: actions/otp.php:83 +#, fuzzy +msgid "No login token specified." +msgstr "Nessun token di accesso specificato." + +#: actions/otp.php:90 +#, fuzzy +msgid "No login token requested." +msgstr "Nessun token di accesso richiesto." + +#: actions/otp.php:95 +#, fuzzy +msgid "Invalid login token specified." +msgstr "Token di accesso specificato non valido." + +#: actions/otp.php:104 +#, fuzzy +msgid "Login token expired." +msgstr "Token di accesso scaduto." + #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" @@ -2136,7 +2355,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" @@ -2298,7 +2517,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 @@ -2328,20 +2547,20 @@ msgid "Not a valid people tag: %s" msgstr "Non è un'etichetta valida di persona: %s" #: actions/peopletag.php:144 -#, fuzzy, php-format +#, php-format msgid "Users self-tagged with %1$s - page %2$d" -msgstr "Utenti auto-etichettati con %s - pagina %d" +msgstr "Utenti auto-etichettati con %1$s - pagina %2$d" #: actions/postnotice.php:84 msgid "Invalid notice content" msgstr "Contenuto del messaggio non valido" #: actions/postnotice.php:90 -#, fuzzy, php-format +#, php-format msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" -"La licenza \"%s\" del messaggio non è compatibile con la licenza del sito \"%" -"s\"." +"La licenza \"%1$s\" del messaggio non è compatibile con la licenza del sito " +"\"%2$s\"." #: actions/profilesettings.php:60 msgid "Profile settings" @@ -2363,48 +2582,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 -#: lib/groupeditform.php:161 +#: actions/profilesettings.php:115 actions/register.php:453 +#: lib/applicationeditform.php:230 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 @@ -2464,9 +2683,8 @@ msgid "Couldn't update user for autosubscribe." msgstr "Impossibile aggiornare l'utente per auto-abbonarsi." #: actions/profilesettings.php:359 -#, fuzzy msgid "Couldn't save location prefs." -msgstr "Impossibile salvare le etichette." +msgstr "Impossibile salvare le preferenze della posizione." #: actions/profilesettings.php:371 msgid "Couldn't save profile." @@ -2708,7 +2926,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." @@ -2720,7 +2938,7 @@ msgstr "Codice di invito non valido." msgid "Registration successful" msgstr "Registrazione riuscita" -#: actions/register.php:114 actions/register.php:502 lib/action.php:457 +#: actions/register.php:114 actions/register.php:503 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Registra" @@ -2733,19 +2951,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. " @@ -2754,41 +2968,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." @@ -2796,8 +3010,8 @@ msgstr "" " a eccezione di questi dati personali: password, indirizzo email, indirizzo " "messaggistica istantanea e numero di telefono." -#: actions/register.php:537 -#, fuzzy, php-format +#: actions/register.php:538 +#, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " "want to...\n" @@ -2814,9 +3028,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 " @@ -2829,7 +3044,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.)" @@ -2942,13 +3157,13 @@ msgid "Replies feed for %s (Atom)" msgstr "Feed delle risposte di %s (Atom)" #: actions/replies.php:198 -#, fuzzy, php-format +#, php-format msgid "" "This is the timeline showing replies to %1$s but %2$s hasn't received a " "notice to his attention yet." msgstr "" -"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 @@ -2960,12 +3175,12 @@ msgstr "" "[entrare in qualche gruppo](%%action.groups%%)." #: actions/replies.php:205 -#, fuzzy, php-format +#, php-format msgid "" "You can try to [nudge %1$s](../%2$s) or [post something to his or her " "attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" -"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 @@ -2981,6 +3196,84 @@ msgstr "Non puoi mettere in \"sandbox\" gli utenti su questo sito." msgid "User is already sandboxed." msgstr "L'utente è già nella \"sandbox\"." +#: actions/showapplication.php:82 +#, fuzzy +msgid "You must be logged in to view an application." +msgstr "Devi eseguire l'accesso per lasciare un gruppo." + +#: actions/showapplication.php:158 +#, fuzzy +msgid "Application profile" +msgstr "Il messaggio non ha un profilo" + +#: actions/showapplication.php:160 lib/applicationeditform.php:182 +msgid "Icon" +msgstr "" + +#: actions/showapplication.php:170 actions/version.php:195 +#: lib/applicationeditform.php:197 +msgid "Name" +msgstr "Nome" + +#: actions/showapplication.php:179 lib/applicationeditform.php:224 +#, fuzzy +msgid "Organization" +msgstr "Paginazione" + +#: actions/showapplication.php:188 actions/version.php:198 +#: lib/applicationeditform.php:211 lib/groupeditform.php:172 +msgid "Description" +msgstr "Descrizione" + +#: actions/showapplication.php:193 actions/showgroup.php:429 +#: lib/profileaction.php:174 +msgid "Statistics" +msgstr "Statistiche" + +#: actions/showapplication.php:204 +#, php-format +msgid "created by %1$s - %2$s access by default - %3$d users" +msgstr "" + +#: actions/showapplication.php:214 +msgid "Application actions" +msgstr "" + +#: actions/showapplication.php:233 +msgid "Reset key & secret" +msgstr "" + +#: actions/showapplication.php:241 +msgid "Application info" +msgstr "" + +#: actions/showapplication.php:243 +msgid "Consumer key" +msgstr "" + +#: actions/showapplication.php:248 +msgid "Consumer secret" +msgstr "" + +#: actions/showapplication.php:253 +msgid "Request token URL" +msgstr "" + +#: actions/showapplication.php:258 +msgid "Access token URL" +msgstr "" + +#: actions/showapplication.php:263 +#, fuzzy +msgid "Authorize URL" +msgstr "Autore" + +#: actions/showapplication.php:268 +msgid "" +"Note: We support HMAC-SHA1 signatures. We do not support the plaintext " +"signature method." +msgstr "" + #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "Impossibile recuperare i messaggi preferiti." @@ -3085,7 +3378,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)" @@ -3093,10 +3386,6 @@ msgstr "(nessuno)" msgid "All members" msgstr "Tutti i membri" -#: actions/showgroup.php:429 lib/profileaction.php:174 -msgid "Statistics" -msgstr "Statistiche" - #: actions/showgroup.php:432 msgid "Created" msgstr "Creato" @@ -3161,9 +3450,9 @@ msgid " tagged %s" msgstr " etichettati con %s" #: actions/showstream.php:122 -#, fuzzy, php-format +#, php-format msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" -msgstr "Feed dei messaggi per %s etichettati con %s (RSS 1.0)" +msgstr "Feed dei messaggi per %1$s etichettati con %2$s (RSS 1.0)" #: actions/showstream.php:129 #, php-format @@ -3186,9 +3475,9 @@ msgid "FOAF for %s" msgstr "FOAF per %s" #: actions/showstream.php:191 -#, fuzzy, php-format +#, php-format msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet." -msgstr "Questa è l'attività di %s, ma %s non ha ancora scritto nulla." +msgstr "Questa è l'attività di %1$s, ma %2$s non ha ancora scritto nulla." #: actions/showstream.php:196 msgid "" @@ -3199,13 +3488,13 @@ msgstr "" "potrebbe essere un buon momento per iniziare! :)" #: actions/showstream.php:198 -#, fuzzy, php-format +#, php-format msgid "" "You can try to nudge %1$s or [post something to his or her attention](%%%%" "action.newnotice%%%%?status_textarea=%2$s)." msgstr "" -"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 @@ -3254,13 +3543,13 @@ msgid "Site name must have non-zero length." msgstr "Il nome del sito non deve avere lunghezza parti a zero." #: actions/siteadminpanel.php:154 -msgid "You must have a valid contact email address" +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\"" -msgstr "Lingua \"%s\" sconosciuta" +#, fuzzy, php-format +msgid "Unknown language \"%s\"." +msgstr "Lingua \"%s\" sconosciuta." #: actions/siteadminpanel.php:179 msgid "Invalid snapshot report URL." @@ -3443,7 +3732,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 @@ -3472,7 +3761,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 @@ -3563,9 +3852,9 @@ msgid "%s subscribers" msgstr "Abbonati a %s" #: actions/subscribers.php:52 -#, fuzzy, php-format +#, php-format msgid "%1$s subscribers, page %2$d" -msgstr "Abbonati a %s, pagina %d" +msgstr "Abbonati a %1$s, pagina %2$d" #: actions/subscribers.php:63 msgid "These are the people who listen to your notices." @@ -3604,9 +3893,9 @@ msgid "%s subscriptions" msgstr "Abbonamenti di %s" #: actions/subscriptions.php:54 -#, fuzzy, php-format +#, php-format msgid "%1$s subscriptions, page %2$d" -msgstr "Abbonamenti di %s, pagina %d" +msgstr "Abbonamenti di %1$s, pagina %2$d" #: actions/subscriptions.php:65 msgid "These are the people whose notices you listen to." @@ -3730,21 +4019,17 @@ 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 -#, fuzzy, php-format +#, php-format msgid "" "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" -"La licenza \"%s\" dello stream di chi ascolti non è compatibile con la " -"licenza \"%s\" di questo sito." +"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:321 #: lib/personalgroupnav.php:115 @@ -3901,7 +4186,7 @@ msgstr "" "completamente l'abbonamento." #: actions/userauthorization.php:296 -#, fuzzy, php-format +#, php-format msgid "Listener URI ‘%s’ not found here." msgstr "URL \"%s\" dell'ascoltatore non trovato qui." @@ -3935,10 +4220,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" @@ -3970,9 +4251,9 @@ msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "Prova a [cercare dei gruppi](%%action.groupsearch%%) e iscriviti." #: actions/version.php:73 -#, fuzzy, php-format +#, php-format msgid "StatusNet %s" -msgstr "Statistiche" +msgstr "StatusNet %s" #: actions/version.php:153 #, php-format @@ -3980,15 +4261,16 @@ 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 -#, fuzzy msgid "StatusNet" -msgstr "Messaggio eliminato." +msgstr "StatusNet" #: actions/version.php:161 msgid "Contributors" -msgstr "" +msgstr "Collaboratori" #: actions/version.php:168 msgid "" @@ -3997,6 +4279,10 @@ msgid "" "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 "" @@ -4005,6 +4291,10 @@ msgid "" "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 @@ -4012,31 +4302,22 @@ 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 "" - -#: actions/version.php:195 -#, fuzzy -msgid "Name" -msgstr "Soprannome" +msgstr "Plugin" #: actions/version.php:196 lib/action.php:741 -#, fuzzy msgid "Version" -msgstr "Sessioni" +msgstr "Versione" #: actions/version.php:197 -#, fuzzy msgid "Author(s)" -msgstr "Autore" +msgstr "Autori" -#: actions/version.php:198 lib/groupeditform.php:172 -msgid "Description" -msgstr "Descrizione" - -#: classes/File.php:137 +#: classes/File.php:144 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " @@ -4045,18 +4326,38 @@ 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/Group_member.php:41 +#, fuzzy +msgid "Group join failed." +msgstr "Profilo del gruppo" + +#: classes/Group_member.php:53 +#, fuzzy +msgid "Not part of group." +msgstr "Impossibile aggiornare il gruppo." + +#: classes/Group_member.php:60 +#, fuzzy +msgid "Group leave failed." +msgstr "Profilo del gruppo" + +#: classes/Login_token.php:76 +#, 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." @@ -4069,27 +4370,27 @@ msgstr "Impossibile inserire il messaggio." msgid "Could not update message with new URI." msgstr "Impossibile aggiornare il messaggio con il nuovo URI." -#: classes/Notice.php:172 +#: classes/Notice.php:171 #, php-format msgid "DB error inserting hashtag: %s" msgstr "Errore del DB nell'inserire un hashtag: %s" -#: classes/Notice.php:226 +#: classes/Notice.php:225 msgid "Problem saving notice. Too long." msgstr "Problema nel salvare il messaggio. Troppo lungo." -#: classes/Notice.php:230 +#: classes/Notice.php:229 msgid "Problem saving notice. Unknown user." msgstr "Problema nel salvare il messaggio. Utente sconosciuto." -#: classes/Notice.php:235 +#: classes/Notice.php:234 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Troppi messaggi troppo velocemente; fai una pausa e scrivi di nuovo tra " "qualche minuto." -#: classes/Notice.php:241 +#: classes/Notice.php:240 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4097,25 +4398,25 @@ msgstr "" "Troppi messaggi duplicati troppo velocemente; fai una pausa e scrivi di " "nuovo tra qualche minuto." -#: classes/Notice.php:247 +#: classes/Notice.php:246 msgid "You are banned from posting notices on this site." msgstr "Ti è proibito inviare messaggi su questo sito." -#: classes/Notice.php:309 classes/Notice.php:334 +#: classes/Notice.php:305 classes/Notice.php:330 msgid "Problem saving notice." msgstr "Problema nel salvare il messaggio." -#: classes/Notice.php:1034 +#: classes/Notice.php:1052 #, php-format msgid "DB error inserting reply: %s" msgstr "Errore del DB nell'inserire la risposta: %s" -#: classes/Notice.php:1359 +#: classes/Notice.php:1423 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" -#: classes/User.php:368 +#: classes/User.php:382 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Benvenuti su %1$s, @%2$s!" @@ -4156,6 +4457,11 @@ msgstr "Altro" msgid "Other options" msgstr "Altre opzioni" +#: lib/action.php:144 +#, fuzzy, php-format +msgid "%1$s - %2$s" +msgstr "%1$s - %2$s" + #: lib/action.php:159 msgid "Untitled page" msgstr "Pagina senza nome" @@ -4172,10 +4478,6 @@ msgstr "Home" msgid "Personal profile and friends timeline" msgstr "Profilo personale e attività degli amici" -#: lib/action.php:435 -msgid "Account" -msgstr "Account" - #: lib/action.php:435 msgid "Change your email, avatar, password, profile" msgstr "Modifica la tua email, immagine, password o il tuo profilo" @@ -4330,18 +4632,13 @@ msgstr "Successivi" msgid "Before" msgstr "Precedenti" -#: lib/action.php:1167 -msgid "There was a problem with your session token." -msgstr "Si è verificato un problema con il tuo token di sessione." - #: lib/adminpanelaction.php:96 msgid "You cannot make changes to this site." msgstr "Non puoi apportare modifiche al sito." #: lib/adminpanelaction.php:107 -#, fuzzy msgid "Changes to that panel are not allowed." -msgstr "Registrazione non consentita." +msgstr "Le modifiche al pannello non sono consentite." #: lib/adminpanelaction.php:206 msgid "showForm() not implemented." @@ -4367,6 +4664,72 @@ msgstr "Configurazione aspetto" msgid "Paths configuration" msgstr "Configurazione percorsi" +#: lib/applicationeditform.php:186 +msgid "Icon for this application" +msgstr "" + +#: lib/applicationeditform.php:206 +#, fuzzy, php-format +msgid "Describe your application in %d characters" +msgstr "Descrivi il gruppo o l'argomento in %d caratteri" + +#: lib/applicationeditform.php:209 +#, fuzzy +msgid "Describe your application" +msgstr "Descrivi il gruppo o l'argomento" + +#: lib/applicationeditform.php:218 +#, fuzzy +msgid "Source URL" +msgstr "Sorgenti" + +#: lib/applicationeditform.php:220 +#, fuzzy +msgid "URL of the homepage of this application" +msgstr "URL della pagina web, blog del gruppo o l'argomento" + +#: lib/applicationeditform.php:226 +msgid "Organization responsible for this application" +msgstr "" + +#: lib/applicationeditform.php:232 +#, fuzzy +msgid "URL for the homepage of the organization" +msgstr "URL della pagina web, blog del gruppo o l'argomento" + +#: lib/applicationeditform.php:238 +msgid "URL to redirect to after authentication" +msgstr "" + +#: lib/applicationeditform.php:260 +msgid "Browser" +msgstr "" + +#: lib/applicationeditform.php:276 +msgid "Desktop" +msgstr "" + +#: lib/applicationeditform.php:277 +msgid "Type of application, browser or desktop" +msgstr "" + +#: lib/applicationeditform.php:299 +msgid "Read-only" +msgstr "" + +#: lib/applicationeditform.php:317 +msgid "Read-write" +msgstr "" + +#: lib/applicationeditform.php:318 +msgid "Default access for this application: read-only, or read-write" +msgstr "" + +#: lib/applicationlist.php:154 +#, fuzzy +msgid "Revoke" +msgstr "Rimuovi" + #: lib/attachmentlist.php:87 msgid "Attachments" msgstr "Allegati" @@ -4387,15 +4750,13 @@ msgstr "Messaggi in cui appare questo allegato" msgid "Tags for this attachment" msgstr "Etichette per questo allegato" -#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 -#, fuzzy +#: lib/authenticationplugin.php:214 lib/authenticationplugin.php:219 msgid "Password changing failed" -msgstr "Modifica password" +msgstr "Modifica della password non riuscita" -#: lib/authenticationplugin.php:197 -#, fuzzy +#: lib/authenticationplugin.php:229 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" @@ -4414,8 +4775,8 @@ msgid "Sorry, this command is not yet implemented." msgstr "Questo comando non è ancora implementato." #: lib/command.php:88 -#, fuzzy, php-format -msgid "Could not find a user with nickname %s." +#, php-format +msgid "Could not find a user with nickname %s" msgstr "Impossibile trovare un utente col soprannome %s" #: lib/command.php:92 @@ -4423,8 +4784,8 @@ msgid "It does not make a lot of sense to nudge yourself!" msgstr "Non ha molto senso se cerchi di richiamarti!" #: lib/command.php:99 -#, fuzzy, php-format -msgid "Nudge sent to %s." +#, php-format +msgid "Nudge sent to %s" msgstr "Richiamo inviato a %s" #: lib/command.php:126 @@ -4438,171 +4799,188 @@ msgstr "" "Abbonati: %2$s\n" "Messaggi: %3$s" -#: lib/command.php:152 lib/command.php:399 lib/command.php:460 -#, fuzzy -msgid "Notice with that id does not exist." +#: lib/command.php:152 lib/command.php:390 lib/command.php:451 +msgid "Notice with that id does not exist" msgstr "Un messaggio con quel ID non esiste" -#: lib/command.php:168 lib/command.php:415 lib/command.php:476 -#: lib/command.php:532 -#, fuzzy -msgid "User has no last notice." -msgstr "L'utente non ha un ultimo messaggio" +#: lib/command.php:168 lib/command.php:406 lib/command.php:467 +#: lib/command.php:523 +msgid "User has no last notice" +msgstr "L'utente non ha un ultimo messaggio." #: lib/command.php:190 msgid "Notice marked as fave." msgstr "Messaggio indicato come preferito." -#: lib/command.php:284 -#, fuzzy, php-format -msgid "Could not remove user %1$s to group %2$s." -msgstr "Impossibile rimuovere l'utente %s dal gruppo %s" +#: lib/command.php:217 +msgid "You are already a member of that group" +msgstr "Fai già parte di quel gruppo" -#: lib/command.php:318 +#: lib/command.php:231 +#, 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:236 +#, php-format +msgid "%s joined group %s" +msgstr "%s fa ora parte del gruppo %s" + +#: lib/command.php:275 +#, 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:280 +#, php-format +msgid "%s left group %s" +msgstr "%1$s ha lasciato il gruppo %2$s" + +#: lib/command.php:309 #, php-format msgid "Fullname: %s" msgstr "Nome completo: %s" -#: lib/command.php:321 +#: lib/command.php:312 lib/mail.php:254 #, php-format msgid "Location: %s" -msgstr "Ubicazione: %s" +msgstr "Posizione: %s" -#: lib/command.php:324 +#: lib/command.php:315 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "Pagina web: %s" -#: lib/command.php:327 +#: lib/command.php:318 #, php-format msgid "About: %s" msgstr "Informazioni: %s" -#: lib/command.php:358 -#, fuzzy, php-format -msgid "Message too long - maximum is %1$d characters, you sent %2$d." +#: lib/command.php:349 +#, php-format +msgid "Message too long - maximum is %d characters, you sent %d" msgstr "Messaggio troppo lungo: massimo %d caratteri, inviati %d" -#: lib/command.php:376 -#, fuzzy, php-format -msgid "Direct message to %s sent." -msgstr "Messaggio diretto a %s inviato" +#: lib/command.php:367 +#, php-format +msgid "Direct message to %s sent" +msgstr "Messaggio diretto a %s inviato." -#: lib/command.php:378 +#: lib/command.php:369 msgid "Error sending direct message." msgstr "Errore nell'inviare il messaggio diretto." -#: lib/command.php:435 -#, fuzzy, php-format -msgid "Notice from %s repeated." +#: lib/command.php:413 +msgid "Cannot repeat your own notice" +msgstr "Impossibile ripetere un proprio messaggio" + +#: lib/command.php:418 +msgid "Already repeated that notice" +msgstr "Hai già ripetuto quel messaggio" + +#: lib/command.php:426 +#, php-format +msgid "Notice from %s repeated" msgstr "Messaggio da %s ripetuto" -#: lib/command.php:437 +#: lib/command.php:428 msgid "Error repeating notice." msgstr "Errore nel ripetere il messaggio." -#: lib/command.php:491 -#, fuzzy, php-format -msgid "Notice too long - maximum is %1$d characters, you sent %2$d." +#: lib/command.php:482 +#, php-format +msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Messaggio troppo lungo: massimo %d caratteri, inviati %d" -#: lib/command.php:500 -#, fuzzy, php-format -msgid "Reply to %s sent." +#: lib/command.php:491 +#, php-format +msgid "Reply to %s sent" msgstr "Risposta a %s inviata" -#: lib/command.php:502 +#: lib/command.php:493 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" +#: lib/command.php:547 +msgid "Specify the name of the user to subscribe to" +msgstr "Specifica il nome dell'utente a cui abbonarti." -#: lib/command.php:563 +#: lib/command.php:554 #, php-format 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" +#: lib/command.php:575 +msgid "Specify the name of the user to unsubscribe from" +msgstr "Specifica il nome dell'utente da cui annullare l'abbonamento." -#: lib/command.php:591 +#: lib/command.php:582 #, php-format msgid "Unsubscribed from %s" msgstr "Abbonamento a %s annullato" -#: lib/command.php:609 lib/command.php:632 +#: lib/command.php:600 lib/command.php:623 msgid "Command not yet implemented." msgstr "Comando non ancora implementato." -#: lib/command.php:612 +#: lib/command.php:603 msgid "Notification off." msgstr "Notifiche disattivate." -#: lib/command.php:614 +#: lib/command.php:605 msgid "Can't turn off notification." msgstr "Impossibile disattivare le notifiche." -#: lib/command.php:635 +#: lib/command.php:626 msgid "Notification on." msgstr "Notifiche attivate." -#: lib/command.php:637 +#: lib/command.php:628 msgid "Can't turn on notification." msgstr "Impossibile attivare le notifiche." -#: lib/command.php:650 -#, fuzzy -msgid "Login command is disabled." +#: lib/command.php:641 +msgid "Login command is disabled" msgstr "Il comando di accesso è disabilitato" -#: lib/command.php:664 -#, fuzzy, php-format -msgid "Could not create login token for %s." -msgstr "Impossibile creare il token di accesso per %s" - -#: lib/command.php:669 -#, fuzzy, php-format -msgid "This link is useable only once, and is good for only 2 minutes: %s." +#: lib/command.php:652 +#, 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" -#: lib/command.php:685 +#: lib/command.php:668 msgid "You are not subscribed to anyone." msgstr "Il tuo abbonamento è stato annullato." -#: lib/command.php:687 +#: lib/command.php:670 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:690 msgid "No one is subscribed to you." msgstr "Nessuno è abbonato ai tuoi messaggi." -#: lib/command.php:709 +#: lib/command.php:692 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:712 msgid "You are not a member of any groups." msgstr "Non fai parte di alcun gruppo." -#: lib/command.php:731 +#: lib/command.php:714 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:728 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4682,21 +5060,21 @@ msgstr "" "tracks - non ancora implementato\n" "tracking - non ancora implementato\n" -#: lib/common.php:199 +#: lib/common.php:131 msgid "No configuration file found. " msgstr "Non è stato trovato alcun file di configurazione. " -#: lib/common.php:200 +#: lib/common.php:132 msgid "I looked for configuration files in the following places: " msgstr "I file di configurazione sono stati cercati in questi posti: " -#: lib/common.php:201 +#: lib/common.php:134 msgid "You may wish to run the installer to fix this." msgstr "" "Potrebbe essere necessario lanciare il programma d'installazione per " "correggere il problema." -#: lib/common.php:202 +#: lib/common.php:135 msgid "Go to the installer." msgstr "Vai al programma d'installazione." @@ -4712,6 +5090,15 @@ msgstr "Messaggi via messaggistica istantanea (MI)" msgid "Updates by SMS" msgstr "Messaggi via SMS" +#: lib/connectsettingsaction.php:120 +#, fuzzy +msgid "Connections" +msgstr "Connetti" + +#: lib/connectsettingsaction.php:121 +msgid "Authorized connected applications" +msgstr "" + #: lib/dberroraction.php:60 msgid "Database error" msgstr "Errore del database" @@ -4897,11 +5284,16 @@ msgstr "MB" msgid "kB" msgstr "kB" -#: lib/jabber.php:191 +#: lib/jabber.php:202 #, php-format msgid "[%s]" msgstr "[%s]" +#: lib/jabber.php:385 +#, fuzzy, php-format +msgid "Unknown inbox source %d." +msgstr "Lingua \"%s\" sconosciuta." + #: lib/joinform.php:114 msgid "Join" msgstr "Iscriviti" @@ -4982,24 +5374,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 @@ -5213,9 +5591,9 @@ msgid "Sorry, no incoming email allowed." msgstr "Email di ricezione non consentita." #: lib/mailhandler.php:228 -#, fuzzy, php-format +#, php-format msgid "Unsupported message type: %s" -msgstr "Formato file immagine non supportato." +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." @@ -5251,7 +5629,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 @@ -5259,7 +5637,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 @@ -5269,8 +5647,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" @@ -5303,16 +5681,18 @@ msgstr "Allega un file" #: lib/noticeform.php:212 #, fuzzy -msgid "Share my location." -msgstr "Impossibile salvare le etichette." - -#: lib/noticeform.php:214 -#, fuzzy -msgid "Do not share my location." -msgstr "Impossibile salvare le etichette." +msgid "Share my location" +msgstr "Condividi la mia posizione" #: lib/noticeform.php:215 -msgid "Hide this info" +#, fuzzy +msgid "Do not share my location" +msgstr "Non condividere la mia posizione" + +#: lib/noticeform.php:216 +msgid "" +"Sorry, retrieving your geo location is taking longer than expected, please " +"try again later" msgstr "" #: lib/noticelist.php:428 @@ -5430,9 +5810,8 @@ msgid "Tags in %s's notices" msgstr "Etichette nei messaggi di %s" #: lib/plugin.php:114 -#, fuzzy msgid "Unknown" -msgstr "Azione sconosciuta" +msgstr "Sconosciuto" #: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82 msgid "Subscriptions" @@ -5491,9 +5870,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" @@ -5574,23 +5952,23 @@ msgstr "Hai già l'abbonamento!" msgid "User has blocked you." msgstr "L'utente non ti consente di seguirlo." -#: lib/subs.php:60 +#: lib/subs.php:63 msgid "Could not subscribe." msgstr "Impossibile abbonarsi." -#: lib/subs.php:79 +#: lib/subs.php:82 msgid "Could not subscribe other to you." msgstr "Impossibile abbonare altri a te." -#: lib/subs.php:128 +#: lib/subs.php:137 msgid "Not subscribed!" msgstr "Non hai l'abbonamento!" -#: lib/subs.php:133 +#: lib/subs.php:142 msgid "Couldn't delete self-subscription." msgstr "Impossibile eliminare l'auto-abbonamento." -#: lib/subs.php:146 +#: lib/subs.php:158 msgid "Couldn't delete subscription." msgstr "Impossibile eliminare l'abbonamento." @@ -5604,10 +5982,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" @@ -5668,47 +6042,47 @@ msgstr "Messaggio" msgid "Moderate" msgstr "Modera" -#: lib/util.php:837 +#: lib/util.php:875 msgid "a few seconds ago" msgstr "pochi secondi fa" -#: lib/util.php:839 +#: lib/util.php:877 msgid "about a minute ago" msgstr "circa un minuto fa" -#: lib/util.php:841 +#: lib/util.php:879 #, php-format msgid "about %d minutes ago" msgstr "circa %d minuti fa" -#: lib/util.php:843 +#: lib/util.php:881 msgid "about an hour ago" msgstr "circa un'ora fa" -#: lib/util.php:845 +#: lib/util.php:883 #, php-format msgid "about %d hours ago" msgstr "circa %d ore fa" -#: lib/util.php:847 +#: lib/util.php:885 msgid "about a day ago" msgstr "circa un giorno fa" -#: lib/util.php:849 +#: lib/util.php:887 #, php-format msgid "about %d days ago" msgstr "circa %d giorni fa" -#: lib/util.php:851 +#: lib/util.php:889 msgid "about a month ago" msgstr "circa un mese fa" -#: lib/util.php:853 +#: lib/util.php:891 #, php-format msgid "about %d months ago" msgstr "circa %d mesi fa" -#: lib/util.php:855 +#: lib/util.php:893 msgid "about a year ago" msgstr "circa un anno fa" @@ -5724,5 +6098,5 @@ msgstr "%s non è un colore valido. Usa 3 o 6 caratteri esadecimali." #: scripts/xmppdaemon.php:301 #, php-format -msgid "Message too long - maximum is %d characters, you sent %d" -msgstr "Messaggio troppo lungo: massimo %d caratteri, inviati %d" +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 cb4c445b89..e3eb8b28f7 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-10 00:46+0000\n" -"PO-Revision-Date: 2010-01-10 00:48:21+0000\n" +"POT-Creation-Date: 2010-01-15 19:15+0000\n" +"PO-Revision-Date: 2010-01-15 19:17:22+0000\n" "Language-Team: Japanese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60878); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r61101); 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" @@ -36,25 +36,30 @@ msgstr "ãã®ã‚ˆã†ãªãƒšãƒ¼ã‚¸ã¯ã‚ã‚Šã¾ã›ã‚“。" #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 +#: actions/apistatusesupdate.php:149 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 #: 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 #: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 -#: lib/command.php:163 lib/command.php:311 lib/command.php:364 -#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/command.php:163 lib/command.php:302 lib/command.php:355 +#: lib/command.php:401 lib/command.php:462 lib/command.php:518 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/subs.php:34 lib/subs.php:125 msgid "No such user." msgstr "ãã®ã‚ˆã†ãªåˆ©ç”¨è€…ã¯ã„ã¾ã›ã‚“。" +#: actions/all.php:84 +#, fuzzy, php-format +msgid "%1$s and friends, page %2$d" +msgstr "%1$s ブロックã•ã‚ŒãŸãƒ—ロファイルã€ãƒšãƒ¼ã‚¸ %2$d" + #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 +#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -91,13 +96,13 @@ msgstr "" "ã—ã¦ã¿ãŸã‚Šã€ä½•ã‹æŠ•ç¨¿ã—ã¦ã¿ã¾ã—ょã†ã€‚" #: actions/all.php:134 -#, fuzzy, php-format +#, php-format msgid "" "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 @@ -112,7 +117,7 @@ msgstr "" msgid "You and friends" msgstr "ã‚ãªãŸã¨å‹äºº" -#: actions/allrss.php:119 actions/apitimelinefriends.php:122 +#: actions/allrss.php:119 actions/apitimelinefriends.php:121 #: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" @@ -123,6 +128,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:155 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 メソッドãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。" @@ -136,7 +158,7 @@ msgstr "API メソッドãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。" #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:114 +#: actions/apistatusesupdate.php:119 msgid "This method requires a POST." msgstr "ã“ã®ãƒ¡ã‚½ãƒƒãƒ‰ã«ã¯ POST ãŒå¿…è¦ã§ã™ã€‚" @@ -167,8 +189,9 @@ msgstr "プロフィールをä¿å­˜ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚" #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257 -#: actions/designadminpanel.php:122 actions/newnotice.php:94 +#: actions/apistatusesupdate.php:132 actions/avatarsettings.php:257 +#: actions/designadminpanel.php:122 actions/editapplication.php:118 +#: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format msgid "" @@ -182,6 +205,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 +248,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,16 +271,16 @@ msgid "No status found with that ID." msgstr "ãã®ï¼©ï¼¤ã®ã‚¹ãƒ†ãƒ¼ã‚¿ã‚¹ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。" #: 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." @@ -295,8 +301,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." @@ -330,7 +336,8 @@ msgstr "ãã®ãƒ‹ãƒƒã‚¯ãƒãƒ¼ãƒ ã¯æ—¢ã«ä½¿ç”¨ã•ã‚Œã¦ã„ã¾ã™ã€‚ä»–ã®ã‚‚ã® msgid "Not a valid nickname." msgstr "有効ãªãƒ‹ãƒƒã‚¯ãƒãƒ¼ãƒ ã§ã¯ã‚ã‚Šã¾ã›ã‚“。" -#: actions/apigroupcreate.php:196 actions/editgroup.php:195 +#: actions/apigroupcreate.php:196 actions/editapplication.php:212 +#: actions/editgroup.php:195 actions/newapplication.php:200 #: actions/newgroup.php:139 actions/profilesettings.php:222 #: actions/register.php:217 msgid "Homepage is not a valid URL." @@ -342,7 +349,8 @@ msgstr "ホームページã®URLãŒä¸é©åˆ‡ã§ã™ã€‚" msgid "Full name is too long (max 255 chars)." msgstr "フルãƒãƒ¼ãƒ ãŒé•·ã™ãŽã¾ã™ã€‚（255å­—ã¾ã§ï¼‰" -#: actions/apigroupcreate.php:213 +#: actions/apigroupcreate.php:213 actions/editapplication.php:187 +#: actions/newapplication.php:169 #, php-format msgid "Description is too long (max %d chars)." msgstr "記述ãŒé•·ã™ãŽã¾ã™ã€‚（最長140字）" @@ -382,7 +390,7 @@ msgstr "別åã¯ãƒ‹ãƒƒã‚¯ãƒãƒ¼ãƒ ã¨åŒã˜ã§ã¯ã„ã‘ã¾ã›ã‚“。" msgid "Group not found!" msgstr "グループãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“!" -#: actions/apigroupjoin.php:110 lib/command.php:217 +#: actions/apigroupjoin.php:110 actions/joingroup.php:90 msgid "You are already a member of that group." msgstr "ã™ã§ã«ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã®ãƒ¡ãƒ³ãƒãƒ¼ã§ã™ã€‚" @@ -390,19 +398,19 @@ msgstr "ã™ã§ã«ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã®ãƒ¡ãƒ³ãƒãƒ¼ã§ã™ã€‚" msgid "You have been blocked from that group by the admin." msgstr "管ç†è€…ã«ã‚ˆã£ã¦ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã‹ã‚‰ãƒ–ロックã•ã‚Œã¦ã„ã¾ã™ã€‚" -#: actions/apigroupjoin.php:138 lib/command.php:234 -#, fuzzy, php-format +#: actions/apigroupjoin.php:138 actions/joingroup.php:124 +#, php-format msgid "Could not join user %1$s to group %2$s." -msgstr "利用者 %s ã¯ã‚°ãƒ«ãƒ¼ãƒ— %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/leavegroup.php:127 -#, fuzzy, php-format +#: actions/apigroupleave.php:124 actions/leavegroup.php:119 +#, php-format msgid "Could not remove user %1$s from group %2$s." -msgstr "利用者 %s をグループ %s ã‹ã‚‰å‰Šé™¤ã§ãã¾ã›ã‚“。" +msgstr "利用者 %1$s をグループ %2$s ã‹ã‚‰å‰Šé™¤ã§ãã¾ã›ã‚“。" #: actions/apigrouplist.php:95 #, php-format @@ -419,6 +427,99 @@ msgstr "%s グループ" msgid "groups on %s" msgstr "%s 上ã®ã‚°ãƒ«ãƒ¼ãƒ—" +#: actions/apioauthauthorize.php:108 actions/apioauthauthorize.php:114 +msgid "Bad request." +msgstr "悪ã„è¦æ±‚。" + +#: actions/apioauthauthorize.php:134 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:115 actions/makeadmin.php:66 +#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 +#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:139 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 +#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/subscribe.php:46 actions/tagother.php:166 +#: 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 "ã‚ãªãŸã®ã‚»ãƒƒã‚·ãƒ§ãƒ³ãƒˆãƒ¼ã‚¯ãƒ³ã«å•é¡ŒãŒã‚ã‚Šã¾ã—ãŸã€‚å†åº¦ãŠè©¦ã—ãã ã•ã„。" + +#: actions/apioauthauthorize.php:146 +msgid "Invalid nickname / password!" +msgstr "ä¸æ­£ãªãƒ¦ãƒ¼ã‚¶åã¾ãŸã¯ãƒ‘スワード。" + +#: actions/apioauthauthorize.php:170 +msgid "DB error deleting OAuth app user." +msgstr "OAuth アプリユーザã®å‰Šé™¤æ™‚ＤＢエラー。" + +#: actions/apioauthauthorize.php:196 +msgid "DB error inserting OAuth app user." +msgstr "OAuth アプリユーザã®è¿½åŠ æ™‚ＤＢエラー。" + +#: actions/apioauthauthorize.php:231 +#, php-format +msgid "" +"The request token %s has been authorized. Please exchange it for an access " +"token." +msgstr "" +"リクエストトークン %s ã¯æ‰¿èªã•ã‚Œã¾ã—ãŸã€‚ アクセストークンã¨ãれを交æ›ã—ã¦ãã " +"ã•ã„。" + +#: actions/apioauthauthorize.php:241 +#, php-format +msgid "The request token %s has been denied." +msgstr "リクエストトークン%sã¯å¦å®šã•ã‚Œã¾ã—ãŸã€‚" + +#: actions/apioauthauthorize.php:246 actions/avatarsettings.php:281 +#: actions/designadminpanel.php:103 actions/editapplication.php:139 +#: actions/emailsettings.php:256 actions/grouplogo.php:319 +#: actions/imsettings.php:220 actions/newapplication.php:121 +#: actions/oauthconnectionssettings.php:151 actions/recoverpassword.php:44 +#: actions/smssettings.php:248 lib/designsettings.php:304 +msgid "Unexpected form submission." +msgstr "予期ã›ã¬ãƒ•ã‚©ãƒ¼ãƒ é€ä¿¡ã§ã™ã€‚" + +#: actions/apioauthauthorize.php:273 +msgid "An application would like to connect to your account" +msgstr "アプリケーションã¯ã‚ãªãŸã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã«æŽ¥ç¶šã—ãŸã„ã§ã™" + +#: actions/apioauthauthorize.php:290 +msgid "Allow or deny access" +msgstr "アクセスを許å¯ã¾ãŸã¯æ‹’絶" + +#: actions/apioauthauthorize.php:320 lib/action.php:435 +msgid "Account" +msgstr "アカウント" + +#: actions/apioauthauthorize.php:323 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/apioauthauthorize.php:326 actions/login.php:233 +#: actions/register.php:429 lib/accountsettingsaction.php:116 +msgid "Password" +msgstr "パスワード" + +#: actions/apioauthauthorize.php:338 +msgid "Deny" +msgstr "拒絶" + +#: actions/apioauthauthorize.php:344 +msgid "Allow" +msgstr "許å¯" + +#: actions/apioauthauthorize.php:361 +msgid "Allow or deny access to your account information." +msgstr "アカウント情報ã¸ã®ã‚¢ã‚¯ã‚»ã‚¹ã‚’許å¯ã™ã‚‹ã‹ã€ã¾ãŸã¯æ‹’絶ã—ã¦ãã ã•ã„。" + #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." msgstr "ã“ã®ãƒ¡ã‚½ãƒƒãƒ‰ã«ã¯ POST ã‹ DELETE ãŒå¿…è¦ã§ã™ã€‚" @@ -432,11 +533,11 @@ msgstr "ä»–ã®åˆ©ç”¨è€…ã®ã‚¹ãƒ†ãƒ¼ã‚¿ã‚¹ã‚’消ã™ã“ã¨ã¯ã§ãã¾ã›ã‚“。" msgid "No such notice." msgstr "ãã®ã‚ˆã†ãªã¤ã¶ã‚„ãã¯ã‚ã‚Šã¾ã›ã‚“。" -#: actions/apistatusesretweet.php:83 lib/command.php:422 +#: actions/apistatusesretweet.php:83 msgid "Cannot repeat your own notice." msgstr "ã‚ãªãŸã®ã¤ã¶ã‚„ãã‚’ç¹°ã‚Šè¿”ã›ã¾ã›ã‚“。" -#: actions/apistatusesretweet.php:91 lib/command.php:427 +#: actions/apistatusesretweet.php:91 msgid "Already repeated that notice." msgstr "ã™ã§ã«ã¤ã¶ã‚„ãã‚’ç¹°ã‚Šè¿”ã—ã¦ã„ã¾ã™ã€‚" @@ -448,17 +549,17 @@ msgstr "ステータスを削除ã—ã¾ã—ãŸã€‚" msgid "No status with that ID found." msgstr "ãã®ï¼©ï¼¤ã§ã®ã‚¹ãƒ†ãƒ¼ã‚¿ã‚¹ã¯ã‚ã‚Šã¾ã›ã‚“。" -#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:162 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "é•·ã™ãŽã¾ã™ã€‚ã¤ã¶ã‚„ãã¯æœ€å¤§ 140 å­—ã¾ã§ã§ã™ã€‚" -#: actions/apistatusesupdate.php:198 +#: actions/apistatusesupdate.php:203 msgid "Not found" msgstr "ã¿ã¤ã‹ã‚Šã¾ã›ã‚“" -#: actions/apistatusesupdate.php:221 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:226 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "ã¤ã¶ã‚„ã㯠URL ã‚’å«ã‚ã¦æœ€å¤§ %d å­—ã¾ã§ã§ã™ã€‚" @@ -468,14 +569,14 @@ msgid "Unsupported format." msgstr "サãƒãƒ¼ãƒˆå¤–ã®å½¢å¼ã§ã™ã€‚" #: actions/apitimelinefavorites.php:108 -#, fuzzy, php-format +#, php-format msgid "%1$s / Favorites from %2$s" -msgstr "%s / %s ã‹ã‚‰ã®ãŠæ°—ã«å…¥ã‚Š" +msgstr "%1$s / %2$s ã‹ã‚‰ã®ãŠæ°—ã«å…¥ã‚Š" #: actions/apitimelinefavorites.php:120 -#, fuzzy, php-format +#, php-format msgid "%1$s updates favorited by %2$s / %2$s." -msgstr "%s 㯠%s ã§ãŠæ°—ã«å…¥ã‚Šã‚’æ›´æ–°ã—ã¾ã—㟠/ %s。" +msgstr "%1$s 㯠%2$s ã§ãŠæ°—ã«å…¥ã‚Šã‚’æ›´æ–°ã—ã¾ã—㟠/ %2$s。" #: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 #: actions/grouprss.php:131 actions/userrss.php:90 @@ -542,8 +643,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 "ニックãƒãƒ¼ãƒ ãŒã‚ã‚Šã¾ã›ã‚“。" @@ -566,8 +670,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 "åˆã£ã¦ã„るプロフィールã®ãªã„利用者" @@ -599,29 +703,6 @@ 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/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 -#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 -#: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 -#: actions/subscribe.php:46 actions/tagother.php:166 -#: 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 "ã‚ãªãŸã®ã‚»ãƒƒã‚·ãƒ§ãƒ³ãƒˆãƒ¼ã‚¯ãƒ³ã«å•é¡ŒãŒã‚ã‚Šã¾ã—ãŸã€‚å†åº¦ãŠè©¦ã—ãã ã•ã„。" - -#: actions/avatarsettings.php:281 actions/designadminpanel.php:103 -#: actions/emailsettings.php:256 actions/grouplogo.php:319 -#: actions/imsettings.php:220 actions/recoverpassword.php:44 -#: actions/smssettings.php:248 lib/designsettings.php:304 -msgid "Unexpected form submission." -msgstr "予期ã›ã¬ãƒ•ã‚©ãƒ¼ãƒ é€ä¿¡ã§ã™ã€‚" - #: actions/avatarsettings.php:328 msgid "Pick a square area of the image to be your avatar" msgstr "ã‚ãªãŸã®ã‚¢ãƒã‚¿ãƒ¼ã¨ãªã‚‹ã‚¤ãƒ¡ãƒ¼ã‚¸ã‚’正方形ã§æŒ‡å®š" @@ -684,18 +765,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:260 +msgid "No such group." msgstr "ãã®ã‚ˆã†ãªã‚°ãƒ«ãƒ¼ãƒ—ã¯ã‚ã‚Šã¾ã›ã‚“。" #: actions/blockedfromgroup.php:90 @@ -704,9 +781,9 @@ msgid "%s blocked profiles" msgstr "%s ブロックã•ã‚ŒãŸãƒ—ロファイル" #: actions/blockedfromgroup.php:93 -#, fuzzy, php-format +#, php-format msgid "%1$s blocked profiles, page %2$d" -msgstr "%s ブロックã•ã‚ŒãŸãƒ—ロファイルã€ãƒšãƒ¼ã‚¸ %d" +msgstr "%1$s ブロックã•ã‚ŒãŸãƒ—ロファイルã€ãƒšãƒ¼ã‚¸ %2$d" #: actions/blockedfromgroup.php:108 msgid "A list of the users blocked from joining this group." @@ -763,7 +840,7 @@ msgid "Couldn't delete email confirmation." msgstr "メール承èªã‚’削除ã§ãã¾ã›ã‚“" #: actions/confirmaddress.php:144 -msgid "Confirm Address" +msgid "Confirm address" msgstr "アドレスã®ç¢ºèª" #: actions/confirmaddress.php:159 @@ -818,10 +895,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 "利用者を削除ã§ãã¾ã›ã‚“" @@ -955,7 +1028,8 @@ msgstr "デフォルトã¸ãƒªã‚»ãƒƒãƒˆã™ã‚‹" #: actions/pathsadminpanel.php:324 actions/profilesettings.php:174 #: actions/siteadminpanel.php:388 actions/smssettings.php:181 #: actions/subscriptions.php:203 actions/tagother.php:154 -#: actions/useradminpanel.php:313 lib/designsettings.php:256 +#: actions/useradminpanel.php:313 lib/applicationeditform.php:335 +#: lib/applicationeditform.php:336 lib/designsettings.php:256 #: lib/groupeditform.php:202 msgid "Save" msgstr "ä¿å­˜" @@ -976,6 +1050,76 @@ msgstr "ãŠæ°—ã«å…¥ã‚Šã«åŠ ãˆã‚‹" msgid "No such document." msgstr "ãã®ã‚ˆã†ãªãƒ‰ã‚­ãƒ¥ãƒ¡ãƒ³ãƒˆã¯ã‚ã‚Šã¾ã›ã‚“。" +#: actions/editapplication.php:54 lib/applicationeditform.php:136 +msgid "Edit application" +msgstr "アプリケーション編集" + +#: actions/editapplication.php:66 +msgid "You must be logged in to edit an application." +msgstr "アプリケーションを編集ã™ã‚‹ã«ã¯ãƒ­ã‚°ã‚¤ãƒ³ã—ã¦ã„ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。" + +#: actions/editapplication.php:77 actions/showapplication.php:94 +msgid "You are not the owner of this application." +msgstr "ã“ã®ã‚¢ãƒ—リケーションã®ã‚ªãƒ¼ãƒŠãƒ¼ã§ã¯ã‚ã‚Šã¾ã›ã‚“。" + +#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:163 +#: actions/showapplication.php:87 +msgid "No such application." +msgstr "ãã®ã‚ˆã†ãªã‚¢ãƒ—リケーションã¯ã‚ã‚Šã¾ã›ã‚“。" + +#: actions/editapplication.php:127 actions/newapplication.php:110 +#: actions/showapplication.php:118 lib/action.php:1167 +msgid "There was a problem with your session token." +msgstr "ã‚ãªãŸã®ã‚»ãƒƒã‚·ãƒ§ãƒ³ãƒˆãƒ¼ã‚¯ãƒ³ã«é–¢ã™ã‚‹å•é¡ŒãŒã‚ã‚Šã¾ã—ãŸã€‚" + +#: actions/editapplication.php:161 +msgid "Use this form to edit your application." +msgstr "ã“ã®ãƒ•ã‚©ãƒ¼ãƒ ã‚’使ã£ã¦ã‚¢ãƒ—リケーションを編集ã—ã¾ã™ã€‚" + +#: actions/editapplication.php:177 actions/newapplication.php:159 +msgid "Name is required." +msgstr "åå‰ã¯å¿…é ˆã§ã™ã€‚" + +#: actions/editapplication.php:180 actions/newapplication.php:162 +msgid "Name is too long (max 255 chars)." +msgstr "åå‰ãŒé•·ã™ãŽã¾ã™ã€‚（最大255å­—ã¾ã§ï¼‰" + +#: actions/editapplication.php:183 actions/newapplication.php:165 +msgid "Description is required." +msgstr "概è¦ãŒå¿…è¦ã§ã™ã€‚" + +#: actions/editapplication.php:191 +msgid "Source URL is too long." +msgstr "ソースＵＲＬãŒé•·ã™ãŽã¾ã™ã€‚" + +#: actions/editapplication.php:197 actions/newapplication.php:182 +msgid "Source URL is not valid." +msgstr "ソースＵＲＬãŒä¸æ­£ã§ã™ã€‚" + +#: actions/editapplication.php:200 actions/newapplication.php:185 +msgid "Organization is required." +msgstr "組織ãŒå¿…è¦ã§ã™ã€‚" + +#: actions/editapplication.php:203 actions/newapplication.php:188 +msgid "Organization is too long (max 255 chars)." +msgstr "組織ãŒé•·ã™ãŽã¾ã™ã€‚（最大255字）" + +#: actions/editapplication.php:206 actions/newapplication.php:191 +msgid "Organization homepage is required." +msgstr "組織ã®ãƒ›ãƒ¼ãƒ ãƒšãƒ¼ã‚¸ãŒå¿…è¦ã§ã™ã€‚" + +#: actions/editapplication.php:215 actions/newapplication.php:203 +msgid "Callback is too long." +msgstr "コールãƒãƒƒã‚¯ãŒé•·ã™ãŽã¾ã™ã€‚" + +#: actions/editapplication.php:222 actions/newapplication.php:212 +msgid "Callback URL is not valid." +msgstr "コールãƒãƒƒã‚¯URLãŒä¸æ­£ã§ã™ã€‚" + +#: actions/editapplication.php:255 +msgid "Could not update application." +msgstr "アプリケーションを更新ã§ãã¾ã›ã‚“。" + #: actions/editgroup.php:56 #, php-format msgid "Edit %s group" @@ -987,7 +1131,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 @@ -1012,7 +1156,7 @@ msgid "Options saved." msgstr "オプションãŒä¿å­˜ã•ã‚Œã¾ã—ãŸã€‚" #: actions/emailsettings.php:60 -msgid "Email Settings" +msgid "Email settings" msgstr "メール設定" #: actions/emailsettings.php:71 @@ -1044,12 +1188,13 @@ msgstr "" "ã‹ã‚ŒãŸãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ãŒå±Šã„ã¦ã„ãªã„ã‹ç¢ºèªã—ã¦ãã ã•ã„。" #: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 +#: actions/smssettings.php:126 lib/applicationeditform.php:333 +#: lib/applicationeditform.php:334 msgid "Cancel" msgstr "中止" #: actions/emailsettings.php:121 -msgid "Email Address" +msgid "Email address" msgstr "メールアドレス" #: actions/emailsettings.php:123 @@ -1126,9 +1271,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,13 +1458,6 @@ 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:79 msgid "No such file." msgstr "ãã®ã‚ˆã†ãªãƒ•ã‚¡ã‚¤ãƒ«ã¯ã‚ã‚Šã¾ã›ã‚“。" @@ -1335,7 +1474,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 "ãã®ï¼©ï¼¤ã®ãƒ—ロファイルãŒã‚ã‚Šã¾ã›ã‚“。" @@ -1361,14 +1500,14 @@ msgid "Block user from group" msgstr "グループã‹ã‚‰ãƒ–ロックã•ã‚ŒãŸåˆ©ç”¨è€…" #: actions/groupblock.php:162 -#, fuzzy, php-format +#, php-format msgid "" "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " "will be removed from the group, unable to post, and unable to subscribe to " "the group in the future." msgstr "" -"本当ã«åˆ©ç”¨è€… %s をグループ %s ã‹ã‚‰ãƒ–ロックã—ã¾ã™ã‹? 彼らã¯ã‚°ãƒ«ãƒ¼ãƒ—ã‹ã‚‰å‰Šé™¤ã•" -"れるã€æŠ•ç¨¿ã§ããªã„ã€ã‚°ãƒ«ãƒ¼ãƒ—をフォローã§ããªããªã‚Šã¾ã™ã€‚" +"本当ã«åˆ©ç”¨è€… %1$s をグループ %2$s ã‹ã‚‰ãƒ–ロックã—ã¾ã™ã‹? 彼らã¯ã‚°ãƒ«ãƒ¼ãƒ—ã‹ã‚‰å‰Š" +"除ã•ã‚Œã‚‹ã€æŠ•ç¨¿ã§ããªã„ã€ã‚°ãƒ«ãƒ¼ãƒ—をフォローã§ããªããªã‚Šã¾ã™ã€‚" #: actions/groupblock.php:178 msgid "Do not block this user from this group" @@ -1382,9 +1521,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." @@ -1407,12 +1546,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 "デザイン設定ãŒä¿å­˜ã•ã‚Œã¾ã—ãŸã€‚" @@ -1429,6 +1562,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 "ロゴã¨ãªã‚‹ã‚¤ãƒ¡ãƒ¼ã‚¸ã®æ­£æ–¹å½¢ã‚’é¸æŠžã€‚" @@ -1447,9 +1584,9 @@ msgid "%s group members" msgstr "%s グループメンãƒãƒ¼" #: actions/groupmembers.php:96 -#, fuzzy, php-format +#, php-format msgid "%1$s group members, page %2$d" -msgstr "%s グループメンãƒãƒ¼ã€ãƒšãƒ¼ã‚¸ %d" +msgstr "%1$s グループメンãƒãƒ¼ã€ãƒšãƒ¼ã‚¸ %2$d" #: actions/groupmembers.php:111 msgid "A list of the users in this group." @@ -1558,7 +1695,7 @@ msgid "Error removing the block." msgstr "ブロックã®å‰Šé™¤ã‚¨ãƒ©ãƒ¼" #: actions/imsettings.php:59 -msgid "IM Settings" +msgid "IM settings" msgstr "IM設定" #: actions/imsettings.php:70 @@ -1588,7 +1725,7 @@ msgstr "" "ãŸãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’確èªã—ã¦ãã ã•ã„。(%s ã‚’å‹äººãƒªã‚¹ãƒˆã«è¿½åŠ ã—ã¾ã—ãŸã‹ï¼Ÿ)" #: actions/imsettings.php:124 -msgid "IM Address" +msgid "IM address" msgstr "IMアドレス" #: actions/imsettings.php:126 @@ -1687,7 +1824,7 @@ msgstr "æ–°ã—ã„利用者を招待" msgid "You are already subscribed to these users:" msgstr "ã™ã§ã«ã“れらã®åˆ©ç”¨è€…をフォローã—ã¦ã„ã¾ã™:" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:315 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 #, php-format msgid "%1$s (%2$s)" msgstr "" @@ -1733,7 +1870,7 @@ msgstr "パーソナルメッセージ" msgid "Optionally add a personal message to the invitation." msgstr "ä»»æ„ã«æ‹›å¾…ã«ãƒ‘ーソナルメッセージを加ãˆã¦ãã ã•ã„。" -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236 msgid "Send" msgstr "é€ã‚‹" @@ -1803,86 +1940,58 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "グループã«å…¥ã‚‹ãŸã‚ã«ã¯ãƒ­ã‚°ã‚¤ãƒ³ã—ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。" -#: actions/joingroup.php:90 -msgid "You are already a member of that group" -msgstr "ã‚ãªãŸã¯æ—¢ã«ãã®ã‚°ãƒ«ãƒ¼ãƒ—ã«å‚加ã—ã¦ã„ã¾ã™ã€‚" - -#: actions/joingroup.php:128 -#, fuzzy, php-format -msgid "Could not join user %1$s to group %2$s" -msgstr "利用者 %s ã¯ã‚°ãƒ«ãƒ¼ãƒ— %s ã«å‚加ã§ãã¾ã›ã‚“" - -#: actions/joingroup.php:135 lib/command.php:239 -#, fuzzy, php-format +#: actions/joingroup.php:131 +#, php-format msgid "%1$s joined group %2$s" -msgstr "%s ã¯ã‚°ãƒ«ãƒ¼ãƒ— %s ã«å‚加ã—ã¾ã—ãŸ" +msgstr "%1$s ã¯ã‚°ãƒ«ãƒ¼ãƒ— %2$s ã«å‚加ã—ã¾ã—ãŸ" #: actions/leavegroup.php:60 msgid "You must be logged in to leave a group." msgstr "グループã‹ã‚‰é›¢ã‚Œã‚‹ã«ã¯ãƒ­ã‚°ã‚¤ãƒ³ã—ã¦ã„ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。" -#: actions/leavegroup.php:90 lib/command.php:268 +#: actions/leavegroup.php:90 lib/command.php:265 msgid "You are not a member of that group." msgstr "ã‚ãªãŸã¯ãã®ã‚°ãƒ«ãƒ¼ãƒ—ã®ãƒ¡ãƒ³ãƒãƒ¼ã§ã¯ã‚ã‚Šã¾ã›ã‚“。" -#: actions/leavegroup.php:119 lib/command.php:278 -msgid "Could not find membership record." -msgstr "会員資格記録を見ã¤ã‘ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“ã§ã—ãŸã€‚" - -#: actions/leavegroup.php:134 lib/command.php:289 -#, fuzzy, php-format +#: actions/leavegroup.php:127 +#, php-format msgid "%1$s left group %2$s" -msgstr "%s ã¯ã‚°ãƒ«ãƒ¼ãƒ— %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:460 +#: 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 -#: lib/groupeditform.php:152 lib/userprofile.php:131 -msgid "Nickname" -msgstr "ニックãƒãƒ¼ãƒ " - -#: actions/login.php:253 actions/register.php:428 -#: 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." @@ -1890,7 +1999,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]" @@ -1904,24 +2013,44 @@ msgid "Only an admin can make another user an admin." msgstr "管ç†è€…ã ã‘ãŒåˆ¥ã®ãƒ¦ãƒ¼ã‚¶ã‚’管ç†è€…ã«ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚" #: actions/makeadmin.php:95 -#, fuzzy, php-format +#, php-format msgid "%1$s is already an admin for group \"%2$s\"." -msgstr "%s ã¯ã™ã§ã«ã‚°ãƒ«ãƒ¼ãƒ— \"%s\" ã®ç®¡ç†è€…ã§ã™ã€‚" +msgstr "%1$s ã¯ã™ã§ã«ã‚°ãƒ«ãƒ¼ãƒ— \"%2$s\" ã®ç®¡ç†è€…ã§ã™ã€‚" #: actions/makeadmin.php:132 -#, fuzzy, php-format -msgid "Can't get membership record for %1$s in group %2$s" -msgstr "%s ã®ä¼šå“¡è³‡æ ¼è¨˜éŒ²ã‚’グループ %s 中ã‹ã‚‰å–å¾—ã§ãã¾ã›ã‚“。" +#, php-format +msgid "Can't get membership record for %1$s in group %2$s." +msgstr "%1$s ã®ä¼šå“¡è³‡æ ¼è¨˜éŒ²ã‚’グループ %2$s 中ã‹ã‚‰å–å¾—ã§ãã¾ã›ã‚“。" #: actions/makeadmin.php:145 -#, fuzzy, php-format -msgid "Can't make %1$s an admin for group %2$s" -msgstr "%s をグループ %s ã®ç®¡ç†è€…ã«ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“" +#, php-format +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 "ç¾åœ¨ã®ã‚¹ãƒ†ãƒ¼ã‚¿ã‚¹ã¯ã‚ã‚Šã¾ã›ã‚“" +#: actions/newapplication.php:52 +msgid "New application" +msgstr "æ–°ã—ã„アプリケーション" + +#: actions/newapplication.php:64 +msgid "You must be logged in to register an application." +msgstr "アプリケーションを登録ã™ã‚‹ã«ã¯ãƒ­ã‚°ã‚¤ãƒ³ã—ã¦ã„ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。" + +#: actions/newapplication.php:143 +msgid "Use this form to register a new application." +msgstr "ã“ã®ãƒ•ã‚©ãƒ¼ãƒ ã‚’使ã£ã¦æ–°ã—ã„アプリケーションを登録ã—ã¾ã™ã€‚" + +#: actions/newapplication.php:173 +msgid "Source URL is required." +msgstr "ソースURLãŒå¿…è¦ã§ã™ã€‚" + +#: actions/newapplication.php:255 actions/newapplication.php:264 +msgid "Could not create application." +msgstr "アプリケーションを作æˆã§ãã¾ã›ã‚“。" + #: actions/newgroup.php:53 msgid "New group" msgstr "æ–°ã—ã„グループ" @@ -1934,12 +2063,12 @@ msgstr "ã“ã®ãƒ•ã‚©ãƒ¼ãƒ ã‚’使ã£ã¦æ–°ã—ã„グループを作æˆã—ã¾ã™ã€‚ msgid "New message" msgstr "æ–°ã—ã„メッセージ" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 msgid "You can't send a message to this user." msgstr "ã“ã®åˆ©ç”¨è€…ã«ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’é€ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。" -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:484 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 +#: lib/command.php:475 msgid "No content!" msgstr "コンテンツãŒã‚ã‚Šã¾ã›ã‚“ï¼" @@ -1947,7 +2076,7 @@ msgstr "コンテンツãŒã‚ã‚Šã¾ã›ã‚“ï¼" msgid "No recipient specified." msgstr "å—å–人ãŒæ›¸ã‹ã‚Œã¦ã„ã¾ã›ã‚“。" -#: actions/newmessage.php:164 lib/command.php:370 +#: actions/newmessage.php:164 lib/command.php:361 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -1959,7 +2088,7 @@ msgstr "メッセージをé€ã‚Šã¾ã—ãŸ" #: actions/newmessage.php:185 #, php-format -msgid "Direct message to %s sent" +msgid "Direct message to %s sent." msgstr "ダイレクトメッセージを %s ã«é€ã‚Šã¾ã—ãŸ" #: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 @@ -1987,9 +2116,9 @@ msgid "Text search" msgstr "テキスト検索" #: actions/noticesearch.php:91 -#, fuzzy, php-format +#, php-format msgid "Search results for \"%1$s\" on %2$s" -msgstr "%s ã® %s 上ã®æ¤œç´¢çµæžœ" +msgstr "\"%1$s\" ã® %2$s 上ã®æ¤œç´¢çµæžœ" #: actions/noticesearch.php:121 #, php-format @@ -2034,6 +2163,50 @@ msgstr "åˆå›³ã‚’é€ã£ãŸ" msgid "Nudge sent!" msgstr "åˆå›³ã‚’é€ã£ãŸ!" +#: actions/oauthappssettings.php:59 +msgid "You must be logged in to list your applications." +msgstr "アプリケーションをリストã™ã‚‹ã«ã¯ãƒ­ã‚°ã‚¤ãƒ³ã—ã¦ã„ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。" + +#: actions/oauthappssettings.php:74 +msgid "OAuth applications" +msgstr "OAuth アプリケーション" + +#: actions/oauthappssettings.php:85 +msgid "Applications you have registered" +msgstr "ã‚ãªãŸãŒç™»éŒ²ã—ãŸã‚¢ãƒ—リケーション" + +#: actions/oauthappssettings.php:135 +#, php-format +msgid "You have not registered any applications yet." +msgstr "ã‚ãªãŸã¯ã¾ã ãªã‚“ã®ã‚¢ãƒ—リケーションも登録ã—ã¦ã„ã¾ã›ã‚“。" + +#: actions/oauthconnectionssettings.php:71 +msgid "Connected applications" +msgstr "接続ã•ã‚ŒãŸã‚¢ãƒ—リケーション" + +#: actions/oauthconnectionssettings.php:87 +msgid "You have allowed the following applications to access you account." +msgstr "ã‚ãªãŸã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã«ã‚¢ã‚¯ã‚»ã‚¹ã™ã‚‹ä»¥ä¸‹ã®ã‚¢ãƒ—リケーションを許å¯ã—ã¾ã—ãŸã€‚" + +#: actions/oauthconnectionssettings.php:170 +msgid "You are not a user of that application." +msgstr "ã‚ãªãŸã¯ãã®ã‚¢ãƒ—リケーションã®åˆ©ç”¨è€…ã§ã¯ã‚ã‚Šã¾ã›ã‚“。" + +#: actions/oauthconnectionssettings.php:180 +msgid "Unable to revoke access for app: " +msgstr "アプリケーションã®ãŸã‚ã®å–消ã—アクセスãŒã§ãã¾ã›ã‚“: " + +#: actions/oauthconnectionssettings.php:192 +#, php-format +msgid "You have not authorized any applications to use your account." +msgstr "" +"ã‚ãªãŸã¯ã€ã©ã‚“ãªã‚¢ãƒ—リケーションもã‚ãªãŸã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã‚’使用ã™ã‚‹ã®ã‚’èªå¯ã—ã¦ã„" +"ã¾ã›ã‚“。" + +#: actions/oauthconnectionssettings.php:205 +msgid "Developers can edit the registration settings for their applications " +msgstr "開発者ã¯å½¼ã‚‰ã®ã‚¢ãƒ—リケーションã®ãŸã‚ã«ç™»éŒ²è¨­å®šã‚’編集ã§ãã¾ã™ " + #: actions/oembed.php:79 actions/shownotice.php:100 msgid "Notice has no profile" msgstr "ã¤ã¶ã‚„ãã«ã¯ãƒ—ロファイルã¯ã‚ã‚Šã¾ã›ã‚“。" @@ -2051,8 +2224,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:1038 +#: lib/api.php:1066 lib/api.php:1176 msgid "Not a supported data format." msgstr "サãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ãªã„データ形å¼ã€‚" @@ -2065,7 +2238,7 @@ msgid "Notice Search" msgstr "ã¤ã¶ã‚„ã検索" #: actions/othersettings.php:60 -msgid "Other Settings" +msgid "Other settings" msgstr "ãã®ä»–ã®è¨­å®š" #: actions/othersettings.php:71 @@ -2096,6 +2269,26 @@ msgstr "プロファイルデザインã®è¡¨ç¤ºã¾ãŸã¯éžè¡¨ç¤º" msgid "URL shortening service is too long (max 50 chars)." msgstr "URL 短縮サービスãŒé•·ã™ãŽã¾ã™ã€‚（最大50字）" +#: actions/otp.php:69 +msgid "No user ID specified." +msgstr "利用者IDã®è¨˜è¿°ãŒã‚ã‚Šã¾ã›ã‚“。" + +#: 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 #, php-format msgid "Outbox for %s" @@ -2132,7 +2325,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 "パスワード確èª" @@ -2294,7 +2487,7 @@ msgid "When to use SSL" msgstr "SSL 使用時" #: actions/pathsadminpanel.php:308 -msgid "SSL Server" +msgid "SSL server" msgstr "SSLサーãƒ" #: actions/pathsadminpanel.php:309 @@ -2324,18 +2517,19 @@ msgid "Not a valid people tag: %s" msgstr "æ­£ã—ã„ã‚¿ã‚°ã§ã¯ã‚ã‚Šã¾ã›ã‚“： %s" #: actions/peopletag.php:144 -#, fuzzy, php-format +#, php-format msgid "Users self-tagged with %1$s - page %2$d" -msgstr "ユーザãŒã¤ã‘ãŸã‚¿ã‚° %s - ページ %d" +msgstr "ユーザ自身ãŒã¤ã‘ãŸã‚¿ã‚° %1$s - ページ %2$d" #: actions/postnotice.php:84 msgid "Invalid notice content" msgstr "ä¸æ­£ãªã¤ã¶ã‚„ã内容" #: actions/postnotice.php:90 -#, fuzzy, php-format +#, php-format msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’." -msgstr "ã¤ã¶ã‚„ãライセンス ‘%s’ ã¯ã‚µã‚¤ãƒˆãƒ©ã‚¤ã‚»ãƒ³ã‚¹ ‘%s’ ã¨äº’æ›æ€§ãŒã‚ã‚Šã¾ã›ã‚“。" +msgstr "" +"ã¤ã¶ã‚„ãライセンス ‘%1$s’ ã¯ã‚µã‚¤ãƒˆãƒ©ã‚¤ã‚»ãƒ³ã‚¹ ‘%2$s’ ã¨äº’æ›æ€§ãŒã‚ã‚Šã¾ã›ã‚“。" #: actions/profilesettings.php:60 msgid "Profile settings" @@ -2356,42 +2550,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 -#: lib/groupeditform.php:161 +#: actions/profilesettings.php:115 actions/register.php:453 +#: lib/applicationeditform.php:230 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 "自分ã®ã„る場所。例：「都市, 都é“府県 (ã¾ãŸã¯åœ°åŸŸ), 国ã€" @@ -2456,7 +2650,6 @@ msgid "Couldn't update user for autosubscribe." msgstr "自動フォローã®ãŸã‚ã®åˆ©ç”¨è€…ã‚’æ›´æ–°ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚" #: actions/profilesettings.php:359 -#, fuzzy msgid "Couldn't save location prefs." msgstr "場所情報をä¿å­˜ã§ãã¾ã›ã‚“。" @@ -2702,7 +2895,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 "ã™ã¿ã¾ã›ã‚“ã€æ‹›å¾…ã•ã‚ŒãŸäººã€…ã ã‘ãŒç™»éŒ²ã§ãã¾ã™ã€‚" @@ -2714,7 +2907,7 @@ msgstr "ã™ã¿ã¾ã›ã‚“ã€ä¸æ­£ãªæ‹›å¾…コード。" msgid "Registration successful" msgstr "登録æˆåŠŸ" -#: actions/register.php:114 actions/register.php:502 lib/action.php:457 +#: actions/register.php:114 actions/register.php:503 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "登録" @@ -2727,19 +2920,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. " @@ -2747,47 +2936,47 @@ 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 +#: actions/register.php:538 #, fuzzy, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -2805,22 +2994,22 @@ 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" +"タントメッセージを通ã—ã¦ã¤ã¶ã‚„ãã‚’é€ã‚Œã‚‹ã‚ˆã†ã«ã™ã‚‹\n" "* ã‚ãªãŸãŒçŸ¥ã£ã¦ã„る人やã‚ãªãŸã¨åŒã˜èˆˆå‘³ã‚’ã‚‚ã£ã¦ã„る人を[検索](%%%%action." "peoplesearch%%%%) ã™ã‚‹\n" -"* [プロフィール設定](%%%%action.profilesettings%%%%) ã‚’æ›´æ–°ã—ã¦ä»–ã®åˆ©ç”¨è€…ã«ã‚" +"* [プロファイル設定](%%%%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.)" @@ -2934,13 +3123,13 @@ msgid "Replies feed for %s (Atom)" msgstr "%s ã®è¿”信フィード (Atom)" #: actions/replies.php:198 -#, fuzzy, php-format +#, php-format msgid "" "This is the timeline showing replies to %1$s but %2$s hasn't received a " "notice to his attention yet." msgstr "" -"ã“れ㯠%s ã¸ã®è¿”信を表示ã—ãŸã‚¿ã‚¤ãƒ ãƒ©ã‚¤ãƒ³ã§ã™ã€ã—ã‹ã— %s ã¯ã¾ã ã¤ã¶ã‚„ãã‚’å—ã‘" -"å–ã£ã¦ã„ã¾ã›ã‚“。" +"ã“れ㯠%1$s ã¸ã®è¿”信を表示ã—ãŸã‚¿ã‚¤ãƒ ãƒ©ã‚¤ãƒ³ã§ã™ã€ã—ã‹ã— %2$s ã¯ã¾ã ã¤ã¶ã‚„ãã‚’" +"å—ã‘å–ã£ã¦ã„ã¾ã›ã‚“。" #: actions/replies.php:203 #, php-format @@ -2952,13 +3141,13 @@ msgstr "" "ループã«åŠ ã‚ã‚‹] (%%action.groups%%)ã“ã¨ãŒã§ãã¾ã™ã€‚" #: actions/replies.php:205 -#, fuzzy, php-format +#, php-format msgid "" "You can try to [nudge %1$s](../%2$s) or [post something to his or her " "attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" -"ã‚ãªãŸã¯ [åˆå›³ %s](../%s) ã™ã‚‹ã‹ã€[ãã®äººå®›ã¦ã«ä½•ã‹ã‚’投稿](%%%%action." -"newnotice%%%%?status_textarea=%s)ã—ã¦ãã ã•ã„。" +"ã‚ãªãŸã¯ [%1$s ã«åˆå›³](../%2$s) ã™ã‚‹ã‹ã€[ãã®äººå®›ã¦ã«ä½•ã‹ã‚’投稿](%%%%action." +"newnotice%%%%?status_textarea=%3$s)ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚" #: actions/repliesrss.php:72 #, php-format @@ -2973,6 +3162,82 @@ msgstr "ã‚ãªãŸã¯ã“ã®ã‚µã‚¤ãƒˆã®ã‚µãƒ³ãƒ‰ãƒœãƒƒã‚¯ã‚¹ãƒ¦ãƒ¼ã‚¶ãŒã§ãã¾ msgid "User is already sandboxed." msgstr "利用者ã¯ã™ã§ã«ã‚µãƒ³ãƒ‰ãƒœãƒƒã‚¯ã‚¹ã§ã™ã€‚" +#: actions/showapplication.php:82 +msgid "You must be logged in to view an application." +msgstr "!!アプリケーションを見るãŸã‚ã«ã¯ãƒ­ã‚°ã‚¤ãƒ³ã—ã¦ã„ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。" + +#: actions/showapplication.php:158 +msgid "Application profile" +msgstr "アプリケーションプロファイル" + +#: actions/showapplication.php:160 lib/applicationeditform.php:182 +msgid "Icon" +msgstr "アイコン" + +#: actions/showapplication.php:170 actions/version.php:195 +#: lib/applicationeditform.php:197 +msgid "Name" +msgstr "åå‰" + +#: actions/showapplication.php:179 lib/applicationeditform.php:224 +msgid "Organization" +msgstr "組織" + +#: actions/showapplication.php:188 actions/version.php:198 +#: lib/applicationeditform.php:211 lib/groupeditform.php:172 +msgid "Description" +msgstr "概è¦" + +#: actions/showapplication.php:193 actions/showgroup.php:429 +#: lib/profileaction.php:174 +msgid "Statistics" +msgstr "統計データ" + +#: actions/showapplication.php:204 +#, php-format +msgid "created by %1$s - %2$s access by default - %3$d users" +msgstr "" + +#: actions/showapplication.php:214 +msgid "Application actions" +msgstr "アプリケーションアクション" + +#: actions/showapplication.php:233 +msgid "Reset key & secret" +msgstr "key 㨠secret ã®ãƒªã‚»ãƒƒãƒˆ" + +#: actions/showapplication.php:241 +msgid "Application info" +msgstr "アプリケーション情報" + +#: actions/showapplication.php:243 +msgid "Consumer key" +msgstr "" + +#: actions/showapplication.php:248 +msgid "Consumer secret" +msgstr "" + +#: actions/showapplication.php:253 +msgid "Request token URL" +msgstr "リクエストトークンURL" + +#: actions/showapplication.php:258 +msgid "Access token URL" +msgstr "アクセストークンURL" + +#: actions/showapplication.php:263 +msgid "Authorize URL" +msgstr "承èªURL" + +#: actions/showapplication.php:268 +msgid "" +"Note: We support HMAC-SHA1 signatures. We do not support the plaintext " +"signature method." +msgstr "" +"注æ„: ç§ãŸã¡ã¯HMAC-SHA1ç½²åをサãƒãƒ¼ãƒˆã—ã¾ã™ã€‚ ç§ãŸã¡ã¯å¹³æ–‡ç½²åメソッドをサ" +"ãƒãƒ¼ãƒˆã—ã¾ã›ã‚“。" + #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "ãŠæ°—ã«å…¥ã‚Šã®ã¤ã¶ã‚„ãを検索ã§ãã¾ã›ã‚“。" @@ -3078,7 +3343,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 "(ãªã—)" @@ -3086,10 +3351,6 @@ msgstr "(ãªã—)" msgid "All members" msgstr "å…¨ã¦ã®ãƒ¡ãƒ³ãƒãƒ¼" -#: actions/showgroup.php:429 lib/profileaction.php:174 -msgid "Statistics" -msgstr "統計データ" - #: actions/showgroup.php:432 msgid "Created" msgstr "作æˆã•ã‚Œã¾ã—ãŸ" @@ -3154,9 +3415,9 @@ msgid " tagged %s" msgstr "タグ付ã‘ã•ã‚ŒãŸ %s" #: actions/showstream.php:122 -#, fuzzy, php-format +#, php-format msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" -msgstr "%sã®%sã¨ã‚¿ã‚°ä»˜ã‘ã•ã‚ŒãŸã¤ã¶ã‚„ãフィード (RSS 1.0)" +msgstr "%1$sã®%2$sã¨ã‚¿ã‚°ä»˜ã‘ã•ã‚ŒãŸã¤ã¶ã‚„ãフィード (RSS 1.0)" #: actions/showstream.php:129 #, php-format @@ -3179,9 +3440,9 @@ msgid "FOAF for %s" msgstr "%s ã® FOAF" #: actions/showstream.php:191 -#, fuzzy, php-format +#, php-format msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet." -msgstr "ã“れ㯠%s ã®ã‚¿ã‚¤ãƒ ãƒ©ã‚¤ãƒ³ã§ã™ãŒã€%s ã¯ã¾ã ãªã«ã‚‚投稿ã—ã¦ã„ã¾ã›ã‚“。" +msgstr "ã“れ㯠%1$s ã®ã‚¿ã‚¤ãƒ ãƒ©ã‚¤ãƒ³ã§ã™ãŒã€%2$s ã¯ã¾ã ãªã«ã‚‚投稿ã—ã¦ã„ã¾ã›ã‚“。" #: actions/showstream.php:196 msgid "" @@ -3192,13 +3453,13 @@ msgstr "" "ã„ã¾ã¯å§‹ã‚る良ã„時ã§ã—ょã†:)" #: actions/showstream.php:198 -#, fuzzy, php-format +#, php-format msgid "" "You can try to nudge %1$s or [post something to his or her attention](%%%%" "action.newnotice%%%%?status_textarea=%2$s)." msgstr "" -"ã‚ãªãŸã¯ã€%s ã«åˆå›³ã™ã‚‹ã‹ã€[ã¾ãŸã¯ãã®äººå®›ã«ä½•ã‹ã‚’投稿](%%%%action.newnotice%" -"%%%?status_textarea=%s) ã—よã†ã¨ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚" +"ã‚ãªãŸã¯ã€%1$s ã«åˆå›³ã™ã‚‹ã‹ã€[ã¾ãŸã¯ãã®äººå®›ã«ä½•ã‹ã‚’投稿](%%%%action." +"newnotice%%%%?status_textarea=%2$s) ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚" #: actions/showstream.php:234 #, php-format @@ -3247,12 +3508,12 @@ msgid "Site name must have non-zero length." msgstr "サイトåã¯é•·ã•0ã§ã¯ã„ã‘ã¾ã›ã‚“。" #: 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 "ä¸æ˜Žãªè¨€èªž \"%s\"" #: actions/siteadminpanel.php:179 @@ -3437,7 +3698,7 @@ msgid "Save site settings" msgstr "サイト設定ã®ä¿å­˜" #: actions/smssettings.php:58 -msgid "SMS Settings" +msgid "SMS settings" msgstr "SMS 設定" #: actions/smssettings.php:69 @@ -3467,7 +3728,7 @@ msgid "Enter the code you received on your phone." msgstr "ã‚ãªãŸãŒã‚ãªãŸã®é›»è©±ã§å—ã‘å–ã£ãŸã‚³ãƒ¼ãƒ‰ã‚’入れã¦ãã ã•ã„。" #: actions/smssettings.php:138 -msgid "SMS Phone number" +msgid "SMS phone number" msgstr "SMS 電話番å·" #: actions/smssettings.php:140 @@ -3558,9 +3819,9 @@ msgid "%s subscribers" msgstr "フォローã•ã‚Œã¦ã„ã‚‹" #: actions/subscribers.php:52 -#, fuzzy, php-format +#, php-format msgid "%1$s subscribers, page %2$d" -msgstr "%s フォローã•ã‚Œã¦ã„ã‚‹ã€ãƒšãƒ¼ã‚¸ %d" +msgstr "%1$s フォローã•ã‚Œã¦ã„ã‚‹ã€ãƒšãƒ¼ã‚¸ %2$d" #: actions/subscribers.php:63 msgid "These are the people who listen to your notices." @@ -3599,9 +3860,9 @@ msgid "%s subscriptions" msgstr "%s フォローã—ã¦ã„ã‚‹" #: actions/subscriptions.php:54 -#, fuzzy, php-format +#, php-format msgid "%1$s subscriptions, page %2$d" -msgstr "%s フォローã—ã¦ã„ã‚‹ã€ãƒšãƒ¼ã‚¸ %d" +msgstr "%1$s フォローã—ã¦ã„ã‚‹ã€ãƒšãƒ¼ã‚¸ %2$d" #: actions/subscriptions.php:65 msgid "These are the people whose notices you listen to." @@ -3723,21 +3984,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 -#, fuzzy, php-format +#, php-format 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:321 #: lib/personalgroupnav.php:115 @@ -3893,9 +4150,9 @@ msgstr "" "ã•ã„。" #: actions/userauthorization.php:296 -#, fuzzy, php-format +#, php-format msgid "Listener URI ‘%s’ not found here." -msgstr "リスナー URI ‘%s’ ã¯ã“ã“ã§ã¯è¦‹ã¤ã‹ã‚Šã¾ã›ã‚“" +msgstr "リスナー URI ‘%s’ ã¯ã“ã“ã§ã¯è¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。" #: actions/userauthorization.php:301 #, php-format @@ -3927,10 +4184,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 "プロファイルデザイン" @@ -3963,9 +4216,9 @@ msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "[グループを探ã—ã¦](%%action.groupsearch%%)ãã‚Œã«åŠ å…¥ã—ã¦ãã ã•ã„。" #: actions/version.php:73 -#, fuzzy, php-format +#, php-format msgid "StatusNet %s" -msgstr "統計データ" +msgstr "StatusNet %s" #: actions/version.php:153 #, php-format @@ -3973,15 +4226,16 @@ msgid "" "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " "Inc. and contributors." msgstr "" +"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " +"Inc. and contributors." #: actions/version.php:157 -#, fuzzy msgid "StatusNet" -msgstr "ステータスを削除ã—ã¾ã—ãŸã€‚" +msgstr "StatusNet" #: actions/version.php:161 msgid "Contributors" -msgstr "" +msgstr "コントリビュータ" #: actions/version.php:168 msgid "" @@ -4008,28 +4262,17 @@ msgstr "" #: actions/version.php:189 msgid "Plugins" -msgstr "" - -#: actions/version.php:195 -#, fuzzy -msgid "Name" -msgstr "ニックãƒãƒ¼ãƒ " +msgstr "プラグイン" #: actions/version.php:196 lib/action.php:741 -#, fuzzy msgid "Version" -msgstr "セッション" +msgstr "ãƒãƒ¼ã‚¸ãƒ§ãƒ³" #: actions/version.php:197 -#, fuzzy msgid "Author(s)" msgstr "作者" -#: actions/version.php:198 lib/groupeditform.php:172 -msgid "Description" -msgstr "概è¦" - -#: classes/File.php:137 +#: classes/File.php:144 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " @@ -4039,18 +4282,35 @@ 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/Group_member.php:41 +msgid "Group join failed." +msgstr "グループå‚加ã«å¤±æ•—ã—ã¾ã—ãŸã€‚" + +#: classes/Group_member.php:53 +msgid "Not part of group." +msgstr "グループã®ä¸€éƒ¨ã§ã¯ã‚ã‚Šã¾ã›ã‚“。" + +#: classes/Group_member.php:60 +msgid "Group leave failed." +msgstr "グループ脱退ã«å¤±æ•—ã—ã¾ã—ãŸã€‚" + +#: classes/Login_token.php:76 +#, 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 "ã‚ãªãŸã¯ãƒ€ã‚¤ãƒ¬ã‚¯ãƒˆãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’é€ã‚‹ã®ãŒç¦æ­¢ã•ã‚Œã¦ã„ã¾ã™ã€‚" @@ -4063,26 +4323,26 @@ msgstr "メッセージを追加ã§ãã¾ã›ã‚“。" msgid "Could not update message with new URI." msgstr "æ–°ã—ã„URIã§ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’アップデートã§ãã¾ã›ã‚“ã§ã—ãŸã€‚" -#: classes/Notice.php:172 +#: classes/Notice.php:171 #, php-format msgid "DB error inserting hashtag: %s" msgstr "ãƒãƒƒã‚·ãƒ¥ã‚¿ã‚°è¿½åŠ  ＤＢ エラー: %s" -#: classes/Notice.php:226 +#: classes/Notice.php:225 msgid "Problem saving notice. Too long." msgstr "ã¤ã¶ã‚„ãã‚’ä¿å­˜ã™ã‚‹éš›ã«å•é¡ŒãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚é•·ã™ãŽã§ã™ã€‚" -#: classes/Notice.php:230 +#: classes/Notice.php:229 msgid "Problem saving notice. Unknown user." msgstr "ã¤ã¶ã‚„ãã‚’ä¿å­˜ã™ã‚‹éš›ã«å•é¡ŒãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚ä¸æ˜Žãªåˆ©ç”¨è€…ã§ã™ã€‚" -#: classes/Notice.php:235 +#: classes/Notice.php:234 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "多ã™ãŽã‚‹ã¤ã¶ã‚„ããŒé€Ÿã™ãŽã¾ã™; 数分間ã®ä¼‘ã¿ã‚’å–ã£ã¦ã‹ã‚‰å†æŠ•ç¨¿ã—ã¦ãã ã•ã„。" -#: classes/Notice.php:241 +#: classes/Notice.php:240 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4090,25 +4350,25 @@ msgstr "" "多ã™ãŽã‚‹é‡è¤‡ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ãŒé€Ÿã™ãŽã¾ã™; 数分間休ã¿ã‚’å–ã£ã¦ã‹ã‚‰å†åº¦æŠ•ç¨¿ã—ã¦ãã ã•" "ã„。" -#: classes/Notice.php:247 +#: classes/Notice.php:246 msgid "You are banned from posting notices on this site." msgstr "ã‚ãªãŸã¯ã“ã®ã‚µã‚¤ãƒˆã§ã¤ã¶ã‚„ãを投稿ã™ã‚‹ã®ãŒç¦æ­¢ã•ã‚Œã¦ã„ã¾ã™ã€‚" -#: classes/Notice.php:309 classes/Notice.php:334 +#: classes/Notice.php:305 classes/Notice.php:330 msgid "Problem saving notice." msgstr "ã¤ã¶ã‚„ãã‚’ä¿å­˜ã™ã‚‹éš›ã«å•é¡ŒãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚" -#: classes/Notice.php:1034 +#: classes/Notice.php:1052 #, php-format msgid "DB error inserting reply: %s" msgstr "返信を追加ã™ã‚‹éš›ã«ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã‚¨ãƒ©ãƒ¼ : %s" -#: classes/Notice.php:1359 +#: classes/Notice.php:1423 #, php-format msgid "RT @%1$s %2$s" msgstr "" -#: classes/User.php:368 +#: classes/User.php:382 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "よã†ã“ã %1$sã€@%2$s!" @@ -4149,6 +4409,11 @@ msgstr "ãã®ä»–" msgid "Other options" msgstr "ãã®ä»–ã®ã‚ªãƒ—ション" +#: lib/action.php:144 +#, php-format +msgid "%1$s - %2$s" +msgstr "" + #: lib/action.php:159 msgid "Untitled page" msgstr "å称未設定ページ" @@ -4165,10 +4430,6 @@ msgstr "ホーム" msgid "Personal profile and friends timeline" msgstr "パーソナルプロファイルã¨å‹äººã®ã‚¿ã‚¤ãƒ ãƒ©ã‚¤ãƒ³" -#: lib/action.php:435 -msgid "Account" -msgstr "アカウント" - #: lib/action.php:435 msgid "Change your email, avatar, password, profile" msgstr "メールアドレスã€ã‚¢ãƒã‚¿ãƒ¼ã€ãƒ‘スワードã€ãƒ—ロパティã®å¤‰æ›´" @@ -4323,18 +4584,13 @@ msgstr "<<後" msgid "Before" msgstr "å‰>>" -#: lib/action.php:1167 -msgid "There was a problem with your session token." -msgstr "ã‚ãªãŸã®ã‚»ãƒƒã‚·ãƒ§ãƒ³ãƒˆãƒ¼ã‚¯ãƒ³ã«é–¢ã™ã‚‹å•é¡ŒãŒã‚ã‚Šã¾ã—ãŸã€‚" - #: lib/adminpanelaction.php:96 msgid "You cannot make changes to this site." msgstr "ã‚ãªãŸã¯ã“ã®ã‚µã‚¤ãƒˆã¸ã®å¤‰æ›´ã‚’è¡Œã†ã“ã¨ãŒã§ãã¾ã›ã‚“。" #: lib/adminpanelaction.php:107 -#, fuzzy msgid "Changes to that panel are not allowed." -msgstr "登録ã¯è¨±å¯ã•ã‚Œã¦ã„ã¾ã›ã‚“。" +msgstr "ãã®ãƒ‘ãƒãƒ«ã¸ã®å¤‰æ›´ã¯è¨±å¯ã•ã‚Œã¦ã„ã¾ã›ã‚“。" #: lib/adminpanelaction.php:206 msgid "showForm() not implemented." @@ -4360,6 +4616,72 @@ msgstr "デザイン設定" msgid "Paths configuration" msgstr "パス設定" +#: lib/applicationeditform.php:186 +msgid "Icon for this application" +msgstr "ã“ã®ã‚¢ãƒ—リケーションã®ã‚¢ã‚¤ã‚³ãƒ³" + +#: lib/applicationeditform.php:206 +#, fuzzy, php-format +msgid "Describe your application in %d characters" +msgstr "グループやトピックを %d 字以内記述" + +#: lib/applicationeditform.php:209 +#, fuzzy +msgid "Describe your application" +msgstr "グループやトピックを記述" + +#: lib/applicationeditform.php:218 +#, fuzzy +msgid "Source URL" +msgstr "ソース" + +#: lib/applicationeditform.php:220 +#, fuzzy +msgid "URL of the homepage of this application" +msgstr "グループやトピックã®ãƒ›ãƒ¼ãƒ ãƒšãƒ¼ã‚¸ã‚„ブログ㮠URL" + +#: lib/applicationeditform.php:226 +msgid "Organization responsible for this application" +msgstr "ã“ã®ã‚¢ãƒ—リケーションã«è²¬ä»»ãŒã‚る組織" + +#: lib/applicationeditform.php:232 +msgid "URL for the homepage of the organization" +msgstr "組織ã®ãƒ›ãƒ¼ãƒ ãƒšãƒ¼ã‚¸ã®URL" + +#: lib/applicationeditform.php:238 +msgid "URL to redirect to after authentication" +msgstr "èªè¨¼ã®å¾Œã«ãƒªãƒ€ã‚¤ãƒ¬ã‚¯ãƒˆã™ã‚‹URL" + +#: lib/applicationeditform.php:260 +msgid "Browser" +msgstr "ブラウザ" + +#: lib/applicationeditform.php:276 +msgid "Desktop" +msgstr "デスクトップ" + +#: lib/applicationeditform.php:277 +msgid "Type of application, browser or desktop" +msgstr "アプリケーションã€ãƒ–ラウザã€ã¾ãŸã¯ãƒ‡ã‚¹ã‚¯ãƒˆãƒƒãƒ—ã®ã‚¿ã‚¤ãƒ—" + +#: lib/applicationeditform.php:299 +msgid "Read-only" +msgstr "リードオンリー" + +#: lib/applicationeditform.php:317 +msgid "Read-write" +msgstr "リードライト" + +#: lib/applicationeditform.php:318 +msgid "Default access for this application: read-only, or read-write" +msgstr "" +"ã“ã®ã‚¢ãƒ—リケーションã®ãŸã‚ã®ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã‚¢ã‚¯ã‚»ã‚¹: リードオンリーã€ã¾ãŸã¯ãƒªãƒ¼ãƒ‰" +"ライト" + +#: lib/applicationlist.php:154 +msgid "Revoke" +msgstr "å–消ã—" + #: lib/attachmentlist.php:87 msgid "Attachments" msgstr "添付" @@ -4380,11 +4702,11 @@ msgstr "ã“ã®æ·»ä»˜ãŒç¾ã‚Œã‚‹ã¤ã¶ã‚„ã" msgid "Tags for this attachment" msgstr "ã“ã®æ·»ä»˜ã®ã‚¿ã‚°" -#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 +#: lib/authenticationplugin.php:214 lib/authenticationplugin.php:219 msgid "Password changing failed" msgstr "パスワード変更ã«å¤±æ•—ã—ã¾ã—ãŸ" -#: lib/authenticationplugin.php:197 +#: lib/authenticationplugin.php:229 msgid "Password changing is not allowed" msgstr "パスワード変更ã¯è¨±å¯ã•ã‚Œã¦ã„ã¾ã›ã‚“" @@ -4405,8 +4727,8 @@ msgid "Sorry, this command is not yet implemented." msgstr "ã™ã¿ã¾ã›ã‚“ã€ã“ã®ã‚³ãƒžãƒ³ãƒ‰ã¯ã¾ã å®Ÿè£…ã•ã‚Œã¦ã„ã¾ã›ã‚“。" #: lib/command.php:88 -#, fuzzy, php-format -msgid "Could not find a user with nickname %s." +#, php-format +msgid "Could not find a user with nickname %s" msgstr "ユーザを更新ã§ãã¾ã›ã‚“" #: lib/command.php:92 @@ -4414,8 +4736,8 @@ msgid "It does not make a lot of sense to nudge yourself!" msgstr "ãã‚Œã¯è‡ªåˆ†è‡ªèº«ã¸ã®åˆå›³ã§å¤šãã¯æ„味ãŒã‚ã‚Šã¾ã›ã‚“!" #: lib/command.php:99 -#, fuzzy, php-format -msgid "Nudge sent to %s." +#, php-format +msgid "Nudge sent to %s" msgstr "%s ã¸åˆå›³ã‚’é€ã‚Šã¾ã—ãŸ" #: lib/command.php:126 @@ -4429,166 +4751,183 @@ msgstr "" "フォローã•ã‚Œã¦ã„ã‚‹: %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." +#: lib/command.php:152 lib/command.php:390 lib/command.php:451 +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." +#: lib/command.php:168 lib/command.php:406 lib/command.php:467 +#: lib/command.php:523 +msgid "User has no last notice" msgstr "利用者ã¯ã¾ã ã¤ã¶ã‚„ã„ã¦ã„ã¾ã›ã‚“" #: lib/command.php:190 msgid "Notice marked as fave." msgstr "ãŠæ°—ã«å…¥ã‚Šã«ã•ã‚Œã¦ã„ã‚‹ã¤ã¶ã‚„ã。" -#: lib/command.php:284 -#, fuzzy, php-format -msgid "Could not remove user %1$s to group %2$s." +#: lib/command.php:217 +msgid "You are already a member of that group" +msgstr "ã‚ãªãŸã¯æ—¢ã«ãã®ã‚°ãƒ«ãƒ¼ãƒ—ã«å‚加ã—ã¦ã„ã¾ã™ã€‚" + +#: lib/command.php:231 +#, php-format +msgid "Could not join user %s to group %s" +msgstr "利用者 %s ã¯ã‚°ãƒ«ãƒ¼ãƒ— %s ã«å‚加ã§ãã¾ã›ã‚“" + +#: lib/command.php:236 +#, php-format +msgid "%s joined group %s" +msgstr "%s ã¯ã‚°ãƒ«ãƒ¼ãƒ— %s ã«å‚加ã—ã¾ã—ãŸ" + +#: lib/command.php:275 +#, php-format +msgid "Could not remove user %s to group %s" msgstr "利用者 %s をグループ %s ã‹ã‚‰å‰Šé™¤ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“" -#: lib/command.php:318 +#: lib/command.php:280 +#, php-format +msgid "%s left group %s" +msgstr "%s ã¯ã‚°ãƒ«ãƒ¼ãƒ— %s ã«æ®‹ã‚Šã¾ã—ãŸã€‚" + +#: lib/command.php:309 #, php-format msgid "Fullname: %s" msgstr "フルãƒãƒ¼ãƒ ï¼š %s" -#: lib/command.php:321 +#: lib/command.php:312 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "場所: %s" -#: lib/command.php:324 +#: lib/command.php:315 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "ホームページ: %s" -#: lib/command.php:327 +#: lib/command.php:318 #, php-format msgid "About: %s" msgstr "About: %s" -#: lib/command.php:358 -#, fuzzy, php-format -msgid "Message too long - maximum is %1$d characters, you sent %2$d." +#: lib/command.php:349 +#, 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." +#: lib/command.php:367 +#, php-format +msgid "Direct message to %s sent" msgstr "ダイレクトメッセージを %s ã«é€ã‚Šã¾ã—ãŸ" -#: lib/command.php:378 +#: lib/command.php:369 msgid "Error sending direct message." msgstr "ダイレクトメッセージé€ä¿¡ã‚¨ãƒ©ãƒ¼ã€‚" -#: lib/command.php:435 -#, fuzzy, php-format -msgid "Notice from %s repeated." +#: lib/command.php:413 +msgid "Cannot repeat your own notice" +msgstr "自分ã®ã¤ã¶ã‚„ãã‚’ç¹°ã‚Šè¿”ã™ã“ã¨ã¯ã§ãã¾ã›ã‚“" + +#: lib/command.php:418 +msgid "Already repeated that notice" +msgstr "ã™ã§ã«ã“ã®ã¤ã¶ã‚„ãã¯ç¹°ã‚Šè¿”ã•ã‚Œã¦ã„ã¾ã™" + +#: lib/command.php:426 +#, php-format +msgid "Notice from %s repeated" msgstr "%s ã‹ã‚‰ã¤ã¶ã‚„ããŒç¹°ã‚Šè¿”ã•ã‚Œã¦ã„ã¾ã™" -#: lib/command.php:437 +#: lib/command.php:428 msgid "Error repeating notice." msgstr "ã¤ã¶ã‚„ãç¹°ã‚Šè¿”ã—エラー" -#: lib/command.php:491 -#, fuzzy, php-format -msgid "Notice too long - maximum is %1$d characters, you sent %2$d." +#: lib/command.php:482 +#, php-format +msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "ã¤ã¶ã‚„ããŒé•·ã™ãŽã¾ã™ - 最大 %d å­—ã€ã‚ãªãŸãŒé€ã£ãŸã®ã¯ %d" -#: lib/command.php:500 -#, fuzzy, php-format -msgid "Reply to %s sent." +#: lib/command.php:491 +#, php-format +msgid "Reply to %s sent" msgstr "%s ã¸è¿”ä¿¡ã‚’é€ã‚Šã¾ã—ãŸ" -#: lib/command.php:502 +#: lib/command.php:493 msgid "Error saving notice." msgstr "ã¤ã¶ã‚„ãä¿å­˜ã‚¨ãƒ©ãƒ¼ã€‚" -#: lib/command.php:556 -#, fuzzy -msgid "Specify the name of the user to subscribe to." +#: lib/command.php:547 +msgid "Specify the name of the user to subscribe to" msgstr "フォローã™ã‚‹åˆ©ç”¨è€…ã®åå‰ã‚’指定ã—ã¦ãã ã•ã„" -#: lib/command.php:563 +#: lib/command.php:554 #, php-format msgid "Subscribed to %s" msgstr "%s をフォローã—ã¾ã—ãŸ" -#: lib/command.php:584 -#, fuzzy -msgid "Specify the name of the user to unsubscribe from." +#: lib/command.php:575 +msgid "Specify the name of the user to unsubscribe from" msgstr "フォローをやã‚るユーザã®åå‰ã‚’指定ã—ã¦ãã ã•ã„" -#: lib/command.php:591 +#: lib/command.php:582 #, php-format msgid "Unsubscribed from %s" msgstr "%s ã®ãƒ•ã‚©ãƒ­ãƒ¼ã‚’ã‚„ã‚ã‚‹" -#: lib/command.php:609 lib/command.php:632 +#: lib/command.php:600 lib/command.php:623 msgid "Command not yet implemented." msgstr "コマンドã¯ã¾ã å®Ÿè£…ã•ã‚Œã¦ã„ã¾ã›ã‚“。" -#: lib/command.php:612 +#: lib/command.php:603 msgid "Notification off." msgstr "通知オフ。" -#: lib/command.php:614 +#: lib/command.php:605 msgid "Can't turn off notification." msgstr "通知をオフã§ãã¾ã›ã‚“。" -#: lib/command.php:635 +#: lib/command.php:626 msgid "Notification on." msgstr "通知オン。" -#: lib/command.php:637 +#: lib/command.php:628 msgid "Can't turn on notification." msgstr "通知をオンã§ãã¾ã›ã‚“。" -#: lib/command.php:650 -#, fuzzy -msgid "Login command is disabled." +#: lib/command.php:641 +msgid "Login command is disabled" msgstr "ログインコマンドãŒç„¡åŠ¹ã«ãªã£ã¦ã„ã¾ã™ã€‚" -#: lib/command.php:664 -#, fuzzy, php-format -msgid "Could not create login token for %s." -msgstr "%s 用ã®ãƒ­ã‚°ã‚¤ãƒ³ãƒ»ãƒˆãƒ¼ã‚¯ãƒ³ã‚’作æˆã§ãã¾ã›ã‚“ã§ã—ãŸ" - -#: lib/command.php:669 -#, fuzzy, php-format -msgid "This link is useable only once, and is good for only 2 minutes: %s." +#: lib/command.php:652 +#, 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:668 msgid "You are not subscribed to anyone." msgstr "ã‚ãªãŸã¯ã ã‚Œã«ã‚‚フォローã•ã‚Œã¦ã„ã¾ã›ã‚“。" -#: lib/command.php:687 +#: lib/command.php:670 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "ã‚ãªãŸã¯ã“ã®äººã«ãƒ•ã‚©ãƒ­ãƒ¼ã•ã‚Œã¦ã„ã¾ã™:" -#: lib/command.php:707 +#: lib/command.php:690 msgid "No one is subscribed to you." msgstr "誰もフォローã—ã¦ã„ã¾ã›ã‚“。" -#: lib/command.php:709 +#: lib/command.php:692 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "ã“ã®äººã¯ã‚ãªãŸã«ãƒ•ã‚©ãƒ­ãƒ¼ã•ã‚Œã¦ã„ã‚‹:" -#: lib/command.php:729 +#: lib/command.php:712 msgid "You are not a member of any groups." msgstr "ã‚ãªãŸã¯ã©ã®ã‚°ãƒ«ãƒ¼ãƒ—ã®ãƒ¡ãƒ³ãƒãƒ¼ã§ã‚‚ã‚ã‚Šã¾ã›ã‚“。" -#: lib/command.php:731 +#: lib/command.php:714 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:728 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4629,21 +4968,21 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:199 +#: lib/common.php:131 msgid "No configuration file found. " msgstr "コンフィギュレーションファイルãŒã‚ã‚Šã¾ã›ã‚“。 " -#: lib/common.php:200 +#: lib/common.php:132 msgid "I looked for configuration files in the following places: " msgstr "ç§ã¯ä»¥ä¸‹ã®å ´æ‰€ã§ã‚³ãƒ³ãƒ•ã‚£ã‚®ãƒ¥ãƒ¬ãƒ¼ã‚·ãƒ§ãƒ³ãƒ•ã‚¡ã‚¤ãƒ«ã‚’探ã—ã¾ã—ãŸ: " -#: lib/common.php:201 +#: lib/common.php:134 msgid "You may wish to run the installer to fix this." msgstr "" "ã‚ãªãŸã¯ã€ã“れを修ç†ã™ã‚‹ãŸã‚ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ©ã‚’å‹•ã‹ã—ãŸãŒã£ã¦ã„ã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›" "ん。" -#: lib/common.php:202 +#: lib/common.php:135 msgid "Go to the installer." msgstr "インストーラã¸ã€‚" @@ -4659,6 +4998,14 @@ msgstr "インスタントメッセンジャー(IM)ã§ã®æ›´æ–°" msgid "Updates by SMS" msgstr "SMSã§ã®æ›´æ–°" +#: lib/connectsettingsaction.php:120 +msgid "Connections" +msgstr "接続" + +#: lib/connectsettingsaction.php:121 +msgid "Authorized connected applications" +msgstr "承èªã•ã‚ŒãŸæŽ¥ç¶šã‚¢ãƒ—リケーション" + #: lib/dberroraction.php:60 msgid "Database error" msgstr "データベースエラー" @@ -4843,11 +5190,16 @@ msgstr "MB" msgid "kB" msgstr "kB" -#: lib/jabber.php:191 +#: lib/jabber.php:202 #, php-format msgid "[%s]" msgstr "" +#: lib/jabber.php:385 +#, php-format +msgid "Unknown inbox source %d." +msgstr "ä¸æ˜Žãªå—ä¿¡ç®±ã®ã‚½ãƒ¼ã‚¹ %d。" + #: lib/joinform.php:114 msgid "Join" msgstr "å‚加" @@ -4927,24 +5279,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 @@ -5158,9 +5496,9 @@ msgid "Sorry, no incoming email allowed." msgstr "ã™ã¿ã¾ã›ã‚“ã€å…¥ã£ã¦ãるメールã¯è¨±å¯ã•ã‚Œã¦ã„ã¾ã›ã‚“。" #: lib/mailhandler.php:228 -#, fuzzy, php-format +#, php-format msgid "Unsupported message type: %s" -msgstr "サãƒãƒ¼ãƒˆå¤–ã®ç”»åƒå½¢å¼ã§ã™ã€‚" +msgstr "サãƒãƒ¼ãƒˆå¤–ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚¿ã‚¤ãƒ—: %s" #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." @@ -5199,16 +5537,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 @@ -5217,7 +5555,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 "%s ã¯ã“ã®ã‚µãƒ¼ãƒã®ã‚µãƒãƒ¼ãƒˆã—ã¦ã„るファイルタイプã§ã¯ã‚ã‚Šã¾ã›ã‚“。" #: lib/messageform.php:120 @@ -5250,17 +5588,17 @@ msgid "Attach a file" msgstr "ファイル添付" #: lib/noticeform.php:212 -#, fuzzy -msgid "Share my location." -msgstr "ã‚ãªãŸã®å ´æ‰€ã‚’共有" - -#: lib/noticeform.php:214 -#, fuzzy -msgid "Do not share my location." -msgstr "ã‚ãªãŸã®å ´æ‰€ã‚’共有" +msgid "Share my location" +msgstr "ã‚ãªãŸã®å ´æ‰€ã‚’共有ã™ã‚‹" #: lib/noticeform.php:215 -msgid "Hide this info" +msgid "Do not share my location" +msgstr "ã‚ãªãŸã®å ´æ‰€ã‚’共有ã—ãªã„" + +#: lib/noticeform.php:216 +msgid "" +"Sorry, retrieving your geo location is taking longer than expected, please " +"try again later" msgstr "" #: lib/noticelist.php:428 @@ -5382,9 +5720,8 @@ msgid "Tags in %s's notices" msgstr "%s ã®ã¤ã¶ã‚„ãã®ã‚¿ã‚°" #: lib/plugin.php:114 -#, fuzzy msgid "Unknown" -msgstr "ä¸æ˜Žãªã‚¢ã‚¯ã‚·ãƒ§ãƒ³" +msgstr "ä¸æ˜Ž" #: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82 msgid "Subscriptions" @@ -5525,23 +5862,23 @@ msgstr "ã™ã§ã«ãƒ•ã‚©ãƒ­ãƒ¼ã—ã¦ã„ã¾ã™!" msgid "User has blocked you." msgstr "利用者ã¯ã‚ãªãŸã‚’ブロックã—ã¾ã—ãŸã€‚" -#: lib/subs.php:60 +#: lib/subs.php:63 msgid "Could not subscribe." msgstr "フォローã§ãã¾ã›ã‚“。" -#: lib/subs.php:79 +#: lib/subs.php:82 msgid "Could not subscribe other to you." msgstr "ä»–ã®äººãŒã‚ãªãŸã‚’フォローã§ãã¾ã›ã‚“。" -#: lib/subs.php:128 +#: lib/subs.php:137 msgid "Not subscribed!" msgstr "フォローã—ã¦ã„ã¾ã›ã‚“ï¼" -#: lib/subs.php:133 +#: lib/subs.php:142 msgid "Couldn't delete self-subscription." msgstr "自己フォローを削除ã§ãã¾ã›ã‚“。" -#: lib/subs.php:146 +#: lib/subs.php:158 msgid "Couldn't delete subscription." msgstr "フォローを削除ã§ãã¾ã›ã‚“" @@ -5555,10 +5892,6 @@ msgstr "自己タグã¥ã‘ã¨ã—ã¦ã®äººã€…タグクラウド" msgid "People Tagcloud as tagged" msgstr "タグ付ã‘ã¨ã—ã¦ã®äººã€…タグクラウド" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(ãªã—)" - #: lib/tagcloudsection.php:56 msgid "None" msgstr "ãªã—" @@ -5620,47 +5953,47 @@ msgstr "メッセージ" msgid "Moderate" msgstr "å¸ä¼š" -#: lib/util.php:837 +#: lib/util.php:875 msgid "a few seconds ago" msgstr "数秒å‰" -#: lib/util.php:839 +#: lib/util.php:877 msgid "about a minute ago" msgstr "ç´„ 1 分å‰" -#: lib/util.php:841 +#: lib/util.php:879 #, php-format msgid "about %d minutes ago" msgstr "ç´„ %d 分å‰" -#: lib/util.php:843 +#: lib/util.php:881 msgid "about an hour ago" msgstr "ç´„ 1 時間å‰" -#: lib/util.php:845 +#: lib/util.php:883 #, php-format msgid "about %d hours ago" msgstr "ç´„ %d 時間å‰" -#: lib/util.php:847 +#: lib/util.php:885 msgid "about a day ago" msgstr "ç´„ 1 æ—¥å‰" -#: lib/util.php:849 +#: lib/util.php:887 #, php-format msgid "about %d days ago" msgstr "ç´„ %d æ—¥å‰" -#: lib/util.php:851 +#: lib/util.php:889 msgid "about a month ago" msgstr "ç´„ 1 ヵ月å‰" -#: lib/util.php:853 +#: lib/util.php:891 #, php-format msgid "about %d months ago" msgstr "ç´„ %d ヵ月å‰" -#: lib/util.php:855 +#: lib/util.php:893 msgid "about a year ago" msgstr "ç´„ 1 å¹´å‰" @@ -5676,5 +6009,5 @@ msgstr "%s ã¯æœ‰åŠ¹ãªè‰²ã§ã¯ã‚ã‚Šã¾ã›ã‚“! 3ã‹6ã®16進数を使ã£ã¦ã #: scripts/xmppdaemon.php:301 #, php-format -msgid "Message too long - maximum is %d characters, you sent %d" -msgstr "メッセージãŒé•·ã™ãŽã¾ã™ - 最大 %d å­—ã€ã‚ãªãŸãŒé€ã£ãŸã®ã¯ %d" +msgid "Message too long - maximum is %1$d characters, you sent %2$d." +msgstr "メッセージãŒé•·ã™ãŽã¾ã™ - 最大 %1$d å­—ã€ã‚ãªãŸãŒé€ã£ãŸã®ã¯ %2$d。" diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po index bd5bc19d31..9c5c453525 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-10 00:46+0000\n" -"PO-Revision-Date: 2010-01-10 00:48:25+0000\n" +"POT-Creation-Date: 2010-01-15 19:15+0000\n" +"PO-Revision-Date: 2010-01-15 19:17:27+0000\n" "Language-Team: Korean\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60878); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r61101); 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" @@ -33,25 +33,30 @@ msgstr "그러한 태그가 없습니다." #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 +#: actions/apistatusesupdate.php:149 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 #: 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 #: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 -#: lib/command.php:163 lib/command.php:311 lib/command.php:364 -#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/command.php:163 lib/command.php:302 lib/command.php:355 +#: lib/command.php:401 lib/command.php:462 lib/command.php:518 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/subs.php:34 lib/subs.php:125 msgid "No such user." msgstr "그러한 사용ìžëŠ” 없습니다." +#: actions/all.php:84 +#, fuzzy, php-format +msgid "%1$s and friends, page %2$d" +msgstr "%s 와 친구들, %d 페ì´ì§€" + #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 +#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -104,7 +109,7 @@ msgstr "" msgid "You and friends" msgstr "%s ë° ì¹œêµ¬ë“¤" -#: actions/allrss.php:119 actions/apitimelinefriends.php:122 +#: actions/allrss.php:119 actions/apitimelinefriends.php:121 #: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" @@ -115,6 +120,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:155 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 메서드를 ì°¾ì„ ìˆ˜ 없습니다." @@ -129,7 +151,7 @@ msgstr "API 메서드를 ì°¾ì„ ìˆ˜ 없습니다." #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:114 +#: actions/apistatusesupdate.php:119 msgid "This method requires a POST." msgstr "ì´ ë©”ì„œë“œëŠ” 등ë¡ì„ 요구합니다." @@ -160,8 +182,9 @@ msgstr "í”„ë¡œí•„ì„ ì €ìž¥ í•  수 없습니다." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257 -#: actions/designadminpanel.php:122 actions/newnotice.php:94 +#: actions/apistatusesupdate.php:132 actions/avatarsettings.php:257 +#: actions/designadminpanel.php:122 actions/editapplication.php:118 +#: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format msgid "" @@ -173,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 #, fuzzy msgid "Unable to save your design settings." msgstr "트위터 í™˜ê²½ì„¤ì •ì„ ì €ìž¥í•  수 없습니다." @@ -216,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 "메시지 ë‚´ìš©ì´ ì—†ìŠµë‹ˆë‹¤!" @@ -260,7 +266,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 @@ -269,7 +275,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 @@ -291,8 +297,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." @@ -328,7 +335,8 @@ msgstr "ë³„ëª…ì´ ì´ë¯¸ 사용중 입니다. 다른 ë³„ëª…ì„ ì‹œë„í•´ ë³´ì‹­ msgid "Not a valid nickname." msgstr "유효한 ë³„ëª…ì´ ì•„ë‹™ë‹ˆë‹¤" -#: actions/apigroupcreate.php:196 actions/editgroup.php:195 +#: actions/apigroupcreate.php:196 actions/editapplication.php:212 +#: actions/editgroup.php:195 actions/newapplication.php:200 #: actions/newgroup.php:139 actions/profilesettings.php:222 #: actions/register.php:217 msgid "Homepage is not a valid URL." @@ -340,7 +348,8 @@ msgstr "홈페ì´ì§€ 주소형ì‹ì´ 올바르지 않습니다." msgid "Full name is too long (max 255 chars)." msgstr "ì‹¤ëª…ì´ ë„ˆë¬´ ê¹ë‹ˆë‹¤. (최대 255글ìž)" -#: actions/apigroupcreate.php:213 +#: actions/apigroupcreate.php:213 actions/editapplication.php:187 +#: actions/newapplication.php:169 #, fuzzy, php-format msgid "Description is too long (max %d chars)." msgstr "ì„¤ëª…ì´ ë„ˆë¬´ 길어요. (최대 140글ìž)" @@ -381,7 +390,7 @@ msgstr "" msgid "Group not found!" msgstr "API 메서드를 ì°¾ì„ ìˆ˜ 없습니다." -#: actions/apigroupjoin.php:110 lib/command.php:217 +#: actions/apigroupjoin.php:110 actions/joingroup.php:90 #, fuzzy msgid "You are already a member of that group." msgstr "ë‹¹ì‹ ì€ ì´ë¯¸ ì´ ê·¸ë£¹ì˜ ë©¤ë²„ìž…ë‹ˆë‹¤." @@ -390,7 +399,7 @@ msgstr "ë‹¹ì‹ ì€ ì´ë¯¸ ì´ ê·¸ë£¹ì˜ ë©¤ë²„ìž…ë‹ˆë‹¤." msgid "You have been blocked from that group by the admin." msgstr "" -#: actions/apigroupjoin.php:138 lib/command.php:234 +#: actions/apigroupjoin.php:138 actions/joingroup.php:124 #, fuzzy, php-format msgid "Could not join user %1$s to group %2$s." msgstr "그룹 %sì— %s는 가입할 수 없습니다." @@ -400,7 +409,7 @@ msgstr "그룹 %sì— %s는 가입할 수 없습니다." msgid "You are not a member of this group." msgstr "ë‹¹ì‹ ì€ í•´ë‹¹ ê·¸ë£¹ì˜ ë©¤ë²„ê°€ 아닙니다." -#: actions/apigroupleave.php:124 actions/leavegroup.php:127 +#: actions/apigroupleave.php:124 actions/leavegroup.php:119 #, fuzzy, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "그룹 %sì—ì„œ %s 사용ìžë¥¼ 제거할 수 없습니다." @@ -420,6 +429,101 @@ msgstr "%s 그룹" msgid "groups on %s" msgstr "그룹 í–‰ë™" +#: actions/apioauthauthorize.php:108 actions/apioauthauthorize.php:114 +msgid "Bad request." +msgstr "" + +#: actions/apioauthauthorize.php:134 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:115 actions/makeadmin.php:66 +#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 +#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:139 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 +#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/subscribe.php:46 actions/tagother.php:166 +#: 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 "세션토í°ì— 문제가 있습니다. 다시 ì‹œë„해주세요." + +#: actions/apioauthauthorize.php:146 +#, fuzzy +msgid "Invalid nickname / password!" +msgstr "ì‚¬ìš©ìž ì´ë¦„ì´ë‚˜ 비밀 번호가 틀렸습니다." + +#: actions/apioauthauthorize.php:170 +#, fuzzy +msgid "DB error deleting OAuth app user." +msgstr "ì‚¬ìš©ìž ì„¸íŒ… 오류" + +#: actions/apioauthauthorize.php:196 +#, fuzzy +msgid "DB error inserting OAuth app user." +msgstr "해쉬테그를 추가 í•  ë•Œì— ë°ì´íƒ€ë² ì´ìŠ¤ ì—러 : %s" + +#: actions/apioauthauthorize.php:231 +#, php-format +msgid "" +"The request token %s has been authorized. Please exchange it for an access " +"token." +msgstr "" + +#: actions/apioauthauthorize.php:241 +#, php-format +msgid "The request token %s has been denied." +msgstr "" + +#: actions/apioauthauthorize.php:246 actions/avatarsettings.php:281 +#: actions/designadminpanel.php:103 actions/editapplication.php:139 +#: actions/emailsettings.php:256 actions/grouplogo.php:319 +#: actions/imsettings.php:220 actions/newapplication.php:121 +#: actions/oauthconnectionssettings.php:151 actions/recoverpassword.php:44 +#: actions/smssettings.php:248 lib/designsettings.php:304 +msgid "Unexpected form submission." +msgstr "ìž˜ëª»ëœ í¼ ì œì¶œ" + +#: actions/apioauthauthorize.php:273 +msgid "An application would like to connect to your account" +msgstr "" + +#: actions/apioauthauthorize.php:290 +msgid "Allow or deny access" +msgstr "" + +#: actions/apioauthauthorize.php:320 lib/action.php:435 +msgid "Account" +msgstr "계정" + +#: actions/apioauthauthorize.php:323 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/apioauthauthorize.php:326 actions/login.php:233 +#: actions/register.php:429 lib/accountsettingsaction.php:116 +msgid "Password" +msgstr "비밀 번호" + +#: actions/apioauthauthorize.php:338 +msgid "Deny" +msgstr "" + +#: actions/apioauthauthorize.php:344 +#, fuzzy +msgid "Allow" +msgstr "모든 것" + +#: actions/apioauthauthorize.php:361 +msgid "Allow or deny access to your account information." +msgstr "" + #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." msgstr "ì´ ë©”ì„œë“œëŠ” ë“±ë¡ ë˜ëŠ” 삭제를 요구합니다." @@ -433,12 +537,12 @@ msgstr "ë‹¹ì‹ ì€ ë‹¤ë¥¸ 사용ìžì˜ ìƒíƒœë¥¼ 삭제하지 ì•Šì•„ë„ ëœë‹¤." msgid "No such notice." msgstr "그러한 통지는 없습니다." -#: actions/apistatusesretweet.php:83 lib/command.php:422 +#: actions/apistatusesretweet.php:83 #, fuzzy msgid "Cannot repeat your own notice." msgstr "ì•Œë¦¼ì„ ì¼¤ 수 없습니다." -#: actions/apistatusesretweet.php:91 lib/command.php:427 +#: actions/apistatusesretweet.php:91 #, fuzzy msgid "Already repeated that notice." msgstr "ì´ ê²Œì‹œê¸€ 삭제하기" @@ -452,17 +556,17 @@ msgstr "아바타가 ì—…ë°ì´íŠ¸ ë˜ì—ˆìŠµë‹ˆë‹¤." msgid "No status with that ID found." msgstr "ë°œê²¬ëœ IDì˜ ìƒíƒœê°€ 없습니다." -#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:162 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "너무 ê¹ë‹ˆë‹¤. í†µì§€ì˜ ìµœëŒ€ 길ì´ëŠ” 140ê¸€ìž ìž…ë‹ˆë‹¤." -#: actions/apistatusesupdate.php:198 +#: actions/apistatusesupdate.php:203 msgid "Not found" msgstr "찾지 못함" -#: actions/apistatusesupdate.php:221 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:226 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -548,8 +652,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 "ë³„ëª…ì´ ì—†ìŠµë‹ˆë‹¤." @@ -572,8 +679,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 "프로필 ë§¤ì¹­ì´ ì—†ëŠ” 사용ìž" @@ -605,29 +712,6 @@ 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/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 -#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 -#: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 -#: actions/subscribe.php:46 actions/tagother.php:166 -#: 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 "세션토í°ì— 문제가 있습니다. 다시 ì‹œë„해주세요." - -#: actions/avatarsettings.php:281 actions/designadminpanel.php:103 -#: actions/emailsettings.php:256 actions/grouplogo.php:319 -#: actions/imsettings.php:220 actions/recoverpassword.php:44 -#: actions/smssettings.php:248 lib/designsettings.php:304 -msgid "Unexpected form submission." -msgstr "ìž˜ëª»ëœ í¼ ì œì¶œ" - #: actions/avatarsettings.php:328 msgid "Pick a square area of the image to be your avatar" msgstr "ë‹¹ì‹ ì˜ ì•„ë°”íƒ€ê°€ ë  ì´ë¯¸ì§€ì˜ì—­ì„ 지정하세요." @@ -689,18 +773,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:260 +msgid "No such group." msgstr "그러한 ê·¸ë£¹ì´ ì—†ìŠµë‹ˆë‹¤." #: actions/blockedfromgroup.php:90 @@ -771,7 +851,8 @@ msgid "Couldn't delete email confirmation." msgstr "ì´ë©”ì¼ ìŠ¹ì¸ì„ ì‚­ì œ í•  수 없습니다." #: actions/confirmaddress.php:144 -msgid "Confirm Address" +#, fuzzy +msgid "Confirm address" msgstr "주소 ì¸ì¦" #: actions/confirmaddress.php:159 @@ -828,11 +909,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." @@ -976,7 +1052,8 @@ msgstr "" #: actions/pathsadminpanel.php:324 actions/profilesettings.php:174 #: actions/siteadminpanel.php:388 actions/smssettings.php:181 #: actions/subscriptions.php:203 actions/tagother.php:154 -#: actions/useradminpanel.php:313 lib/designsettings.php:256 +#: actions/useradminpanel.php:313 lib/applicationeditform.php:335 +#: lib/applicationeditform.php:336 lib/designsettings.php:256 #: lib/groupeditform.php:202 msgid "Save" msgstr "저장" @@ -997,6 +1074,86 @@ msgstr "좋아하는 게시글로 추가하기" msgid "No such document." msgstr "그러한 문서는 없습니다." +#: actions/editapplication.php:54 lib/applicationeditform.php:136 +msgid "Edit application" +msgstr "" + +#: actions/editapplication.php:66 +#, fuzzy +msgid "You must be logged in to edit an application." +msgstr "ê·¸ë£¹ì„ ë§Œë“¤ê¸° 위해서는 로그ì¸í•´ì•¼ 합니다." + +#: actions/editapplication.php:77 actions/showapplication.php:94 +#, fuzzy +msgid "You are not the owner of this application." +msgstr "ë‹¹ì‹ ì€ í•´ë‹¹ ê·¸ë£¹ì˜ ë©¤ë²„ê°€ 아닙니다." + +#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:163 +#: actions/showapplication.php:87 +#, fuzzy +msgid "No such application." +msgstr "그러한 통지는 없습니다." + +#: actions/editapplication.php:127 actions/newapplication.php:110 +#: actions/showapplication.php:118 lib/action.php:1167 +msgid "There was a problem with your session token." +msgstr "ë‹¹ì‹ ì˜ ì„¸ì…˜í† í°ê´€ë ¨ 문제가 있습니다." + +#: actions/editapplication.php:161 +#, fuzzy +msgid "Use this form to edit your application." +msgstr "ë‹¤ìŒ ì–‘ì‹ì„ ì´ìš©í•´ ê·¸ë£¹ì„ íŽ¸ì§‘í•˜ì‹­ì‹œì˜¤." + +#: actions/editapplication.php:177 actions/newapplication.php:159 +#, fuzzy +msgid "Name is required." +msgstr "위와 ê°™ì€ ë¹„ë°€ 번호. 필수 사항." + +#: actions/editapplication.php:180 actions/newapplication.php:162 +#, fuzzy +msgid "Name is too long (max 255 chars)." +msgstr "ì‹¤ëª…ì´ ë„ˆë¬´ ê¹ë‹ˆë‹¤. (최대 255글ìž)" + +#: actions/editapplication.php:183 actions/newapplication.php:165 +#, fuzzy +msgid "Description is required." +msgstr "설명" + +#: actions/editapplication.php:191 +msgid "Source URL is too long." +msgstr "" + +#: actions/editapplication.php:197 actions/newapplication.php:182 +#, fuzzy +msgid "Source URL is not valid." +msgstr "홈페ì´ì§€ 주소형ì‹ì´ 올바르지 않습니다." + +#: actions/editapplication.php:200 actions/newapplication.php:185 +msgid "Organization is required." +msgstr "" + +#: actions/editapplication.php:203 actions/newapplication.php:188 +#, fuzzy +msgid "Organization is too long (max 255 chars)." +msgstr "위치가 너무 ê¹ë‹ˆë‹¤. (최대 255글ìž)" + +#: actions/editapplication.php:206 actions/newapplication.php:191 +msgid "Organization homepage is required." +msgstr "" + +#: actions/editapplication.php:215 actions/newapplication.php:203 +msgid "Callback is too long." +msgstr "" + +#: actions/editapplication.php:222 actions/newapplication.php:212 +msgid "Callback URL is not valid." +msgstr "" + +#: actions/editapplication.php:255 +#, fuzzy +msgid "Could not update application." +msgstr "ê·¸ë£¹ì„ ì—…ë°ì´íŠ¸ í•  수 없습니다." + #: actions/editgroup.php:56 #, php-format msgid "Edit %s group" @@ -1008,7 +1165,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 @@ -1034,7 +1192,8 @@ msgid "Options saved." msgstr "ì˜µì…˜ë“¤ì´ ì €ìž¥ë˜ì—ˆìŠµë‹ˆë‹¤." #: actions/emailsettings.php:60 -msgid "Email Settings" +#, fuzzy +msgid "Email settings" msgstr "ì´ë©”ì¼ ì„¸íŒ…" #: actions/emailsettings.php:71 @@ -1066,12 +1225,14 @@ msgstr "" "주시기 ë°”ëžë‹ˆë‹¤." #: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 +#: actions/smssettings.php:126 lib/applicationeditform.php:333 +#: lib/applicationeditform.php:334 msgid "Cancel" msgstr "취소" #: actions/emailsettings.php:121 -msgid "Email Address" +#, fuzzy +msgid "Email address" msgstr "ì´ë©”ì¼ ì£¼ì†Œ" #: actions/emailsettings.php:123 @@ -1146,8 +1307,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 @@ -1332,13 +1494,6 @@ 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:79 #, fuzzy msgid "No such file." @@ -1357,7 +1512,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ì˜ í”„ë¡œí•„ì´ ì—†ìŠµë‹ˆë‹¤." @@ -1408,8 +1563,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 @@ -1434,13 +1590,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." @@ -1456,6 +1605,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." @@ -1581,7 +1735,8 @@ msgid "Error removing the block." msgstr "차단 제거 ì—러!" #: actions/imsettings.php:59 -msgid "IM Settings" +#, fuzzy +msgid "IM settings" msgstr "메신저 설정" #: actions/imsettings.php:70 @@ -1612,7 +1767,8 @@ msgstr "" "ëª©ì„ ì¶”ê°€í•˜ì…¨ìŠµë‹ˆê¹Œ?)" #: actions/imsettings.php:124 -msgid "IM Address" +#, fuzzy +msgid "IM address" msgstr "메신저 주소" #: actions/imsettings.php:126 @@ -1709,7 +1865,7 @@ msgstr "새 사용ìžë¥¼ 초대" msgid "You are already subscribed to these users:" msgstr "ë‹¹ì‹ ì€ ë‹¤ìŒ ì‚¬ìš©ìžë¥¼ ì´ë¯¸ 구ë…하고 있습니다." -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:315 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -1752,7 +1908,7 @@ msgstr "ê°œì¸ì ì¸ 메시지" msgid "Optionally add a personal message to the invitation." msgstr "ì´ˆëŒ€ìž¥ì— ë©”ì‹œì§€ 첨부하기." -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236 msgid "Send" msgstr "보내기" @@ -1817,16 +1973,7 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "ê·¸ë£¹ê°€ìž…ì„ ìœ„í•´ì„œëŠ” 로그ì¸ì´ 필요합니다." -#: actions/joingroup.php:90 -msgid "You are already a member of that group" -msgstr "ë‹¹ì‹ ì€ ì´ë¯¸ ì´ ê·¸ë£¹ì˜ ë©¤ë²„ìž…ë‹ˆë‹¤." - -#: actions/joingroup.php:128 -#, fuzzy, php-format -msgid "Could not join user %1$s to group %2$s" -msgstr "그룹 %sì— %s는 가입할 수 없습니다." - -#: actions/joingroup.php:135 lib/command.php:239 +#: actions/joingroup.php:131 #, fuzzy, php-format msgid "%1$s joined group %2$s" msgstr "%s 는 그룹 %sì— ê°€ìž…í–ˆìŠµë‹ˆë‹¤." @@ -1835,77 +1982,57 @@ msgstr "%s 는 그룹 %sì— ê°€ìž…í–ˆìŠµë‹ˆë‹¤." msgid "You must be logged in to leave a group." msgstr "ê·¸ë£¹ì„ ë– ë‚˜ê¸° 위해서는 로그ì¸í•´ì•¼ 합니다." -#: actions/leavegroup.php:90 lib/command.php:268 +#: actions/leavegroup.php:90 lib/command.php:265 msgid "You are not a member of that group." msgstr "ë‹¹ì‹ ì€ í•´ë‹¹ ê·¸ë£¹ì˜ ë©¤ë²„ê°€ 아닙니다." -#: actions/leavegroup.php:119 lib/command.php:278 -msgid "Could not find membership record." -msgstr "멤버십 기ë¡ì„ 발견할 수 없습니다." - -#: actions/leavegroup.php:134 lib/command.php:289 +#: actions/leavegroup.php:127 #, 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:460 +#: 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 -#: lib/groupeditform.php:152 lib/userprofile.php:131 -msgid "Nickname" -msgstr "별명" - -#: actions/login.php:253 actions/register.php:428 -#: 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]" @@ -1925,19 +2052,42 @@ 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 %1$s in group %2$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 #, fuzzy, php-format -msgid "Can't make %1$s an admin for group %2$s" +msgid "Can't make %1$s an admin for group %2$s." msgstr "관리ìžë§Œ ê·¸ë£¹ì„ íŽ¸ì§‘í•  수 있습니다." #: actions/microsummary.php:69 msgid "No current status" msgstr "현재 ìƒíƒœê°€ 없습니다." +#: actions/newapplication.php:52 +msgid "New application" +msgstr "" + +#: actions/newapplication.php:64 +#, fuzzy +msgid "You must be logged in to register an application." +msgstr "ê·¸ë£¹ì„ ë§Œë“¤ê¸° 위해서는 로그ì¸í•´ì•¼ 합니다." + +#: actions/newapplication.php:143 +#, fuzzy +msgid "Use this form to register a new application." +msgstr "새 ê·¸ë£¹ì„ ë§Œë“¤ê¸° 위해 ì´ ì–‘ì‹ì„ 사용하세요." + +#: actions/newapplication.php:173 +msgid "Source URL is required." +msgstr "" + +#: actions/newapplication.php:255 actions/newapplication.php:264 +#, fuzzy +msgid "Could not create application." +msgstr "좋아하는 ê²Œì‹œê¸€ì„ ìƒì„±í•  수 없습니다." + #: actions/newgroup.php:53 msgid "New group" msgstr "새로운 그룹" @@ -1950,12 +2100,12 @@ msgstr "새 ê·¸ë£¹ì„ ë§Œë“¤ê¸° 위해 ì´ ì–‘ì‹ì„ 사용하세요." msgid "New message" msgstr "새로운 메시지입니다." -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 msgid "You can't send a message to this user." msgstr "ë‹¹ì‹ ì€ ì´ ì‚¬ìš©ìžì—게 메시지를 보낼 수 없습니다." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:484 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 +#: lib/command.php:475 msgid "No content!" msgstr "ë‚´ìš©ì´ ì—†ìŠµë‹ˆë‹¤!" @@ -1963,7 +2113,7 @@ msgstr "ë‚´ìš©ì´ ì—†ìŠµë‹ˆë‹¤!" msgid "No recipient specified." msgstr "수신ìžë¥¼ 지정하지 않았습니다." -#: actions/newmessage.php:164 lib/command.php:370 +#: actions/newmessage.php:164 lib/command.php:361 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -1975,8 +2125,8 @@ msgid "Message sent" msgstr "메시지" #: actions/newmessage.php:185 -#, php-format -msgid "Direct message to %s sent" +#, fuzzy, php-format +msgid "Direct message to %s sent." msgstr "%sì—게 보낸 ì§ì ‘ 메시지" #: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 @@ -2047,6 +2197,51 @@ msgstr "찔러 보기를 보냈습니다." msgid "Nudge sent!" msgstr "찔러 보기를 보냈습니다!" +#: actions/oauthappssettings.php:59 +#, fuzzy +msgid "You must be logged in to list your applications." +msgstr "ê·¸ë£¹ì„ ë§Œë“¤ê¸° 위해서는 로그ì¸í•´ì•¼ 합니다." + +#: actions/oauthappssettings.php:74 +#, fuzzy +msgid "OAuth applications" +msgstr "다른 옵션들" + +#: actions/oauthappssettings.php:85 +msgid "Applications you have registered" +msgstr "" + +#: actions/oauthappssettings.php:135 +#, php-format +msgid "You have not registered any applications yet." +msgstr "" + +#: actions/oauthconnectionssettings.php:71 +msgid "Connected applications" +msgstr "" + +#: actions/oauthconnectionssettings.php:87 +msgid "You have allowed the following applications to access you account." +msgstr "" + +#: actions/oauthconnectionssettings.php:170 +#, fuzzy +msgid "You are not a user of that application." +msgstr "ë‹¹ì‹ ì€ í•´ë‹¹ ê·¸ë£¹ì˜ ë©¤ë²„ê°€ 아닙니다." + +#: actions/oauthconnectionssettings.php:180 +msgid "Unable to revoke access for app: " +msgstr "" + +#: actions/oauthconnectionssettings.php:192 +#, php-format +msgid "You have not authorized any applications to use your account." +msgstr "" + +#: actions/oauthconnectionssettings.php:205 +msgid "Developers can edit the registration settings for their applications " +msgstr "" + #: actions/oembed.php:79 actions/shownotice.php:100 msgid "Notice has no profile" msgstr "í†µì§€ì— í”„ë¡œí•„ì´ ì—†ìŠµë‹ˆë‹¤." @@ -2065,8 +2260,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:1038 +#: lib/api.php:1066 lib/api.php:1176 msgid "Not a supported data format." msgstr "지ì›í•˜ëŠ” 형ì‹ì˜ ë°ì´í„°ê°€ 아닙니다." @@ -2079,7 +2274,8 @@ msgid "Notice Search" msgstr "통지 검색" #: actions/othersettings.php:60 -msgid "Other Settings" +#, fuzzy +msgid "Other settings" msgstr "기타 설정" #: actions/othersettings.php:71 @@ -2111,6 +2307,31 @@ msgstr "" msgid "URL shortening service is too long (max 50 chars)." msgstr "URL 줄ì´ê¸° 서비스 너무 ê¹ë‹ˆë‹¤. (최대 50글ìž)" +#: 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" @@ -2145,7 +2366,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 "ì¸ì¦" @@ -2316,8 +2537,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" @@ -2379,43 +2601,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 -#: lib/groupeditform.php:161 +#: actions/profilesettings.php:115 actions/register.php:453 +#: lib/applicationeditform.php:230 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 êµ°,구), 나ë¼" @@ -2713,7 +2935,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 "죄송합니다. 단지 ì´ˆëŒ€ëœ ì‚¬ëžŒë“¤ë§Œ 등ë¡í•  수 있습니다." @@ -2726,7 +2948,7 @@ msgstr "í™•ì¸ ì½”ë“œ 오류" msgid "Registration successful" msgstr "íšŒì› ê°€ìž…ì´ ì„±ê³µì ìž…니다." -#: actions/register.php:114 actions/register.php:502 lib/action.php:457 +#: actions/register.php:114 actions/register.php:503 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "회ì›ê°€ìž…" @@ -2739,67 +2961,63 @@ 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 +#: actions/register.php:538 #, fuzzy, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -2832,7 +3050,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.)" @@ -2987,6 +3205,84 @@ msgstr "ë‹¹ì‹ ì€ ì´ ì‚¬ìš©ìžì—게 메시지를 보낼 수 없습니다." msgid "User is already sandboxed." msgstr "회ì›ì´ ë‹¹ì‹ ì„ ì°¨ë‹¨í•´ì™”ìŠµë‹ˆë‹¤." +#: actions/showapplication.php:82 +#, fuzzy +msgid "You must be logged in to view an application." +msgstr "ê·¸ë£¹ì„ ë– ë‚˜ê¸° 위해서는 로그ì¸í•´ì•¼ 합니다." + +#: actions/showapplication.php:158 +#, fuzzy +msgid "Application profile" +msgstr "í†µì§€ì— í”„ë¡œí•„ì´ ì—†ìŠµë‹ˆë‹¤." + +#: actions/showapplication.php:160 lib/applicationeditform.php:182 +msgid "Icon" +msgstr "" + +#: actions/showapplication.php:170 actions/version.php:195 +#: lib/applicationeditform.php:197 +#, fuzzy +msgid "Name" +msgstr "별명" + +#: actions/showapplication.php:179 lib/applicationeditform.php:224 +#, fuzzy +msgid "Organization" +msgstr "페ì´ì§€ìˆ˜" + +#: actions/showapplication.php:188 actions/version.php:198 +#: lib/applicationeditform.php:211 lib/groupeditform.php:172 +msgid "Description" +msgstr "설명" + +#: actions/showapplication.php:193 actions/showgroup.php:429 +#: lib/profileaction.php:174 +msgid "Statistics" +msgstr "통계" + +#: actions/showapplication.php:204 +#, php-format +msgid "created by %1$s - %2$s access by default - %3$d users" +msgstr "" + +#: actions/showapplication.php:214 +msgid "Application actions" +msgstr "" + +#: actions/showapplication.php:233 +msgid "Reset key & secret" +msgstr "" + +#: actions/showapplication.php:241 +msgid "Application info" +msgstr "" + +#: actions/showapplication.php:243 +msgid "Consumer key" +msgstr "" + +#: actions/showapplication.php:248 +msgid "Consumer secret" +msgstr "" + +#: actions/showapplication.php:253 +msgid "Request token URL" +msgstr "" + +#: actions/showapplication.php:258 +msgid "Access token URL" +msgstr "" + +#: actions/showapplication.php:263 +msgid "Authorize URL" +msgstr "" + +#: actions/showapplication.php:268 +msgid "" +"Note: We support HMAC-SHA1 signatures. We do not support the plaintext " +"signature method." +msgstr "" + #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "좋아하는 ê²Œì‹œê¸€ì„ ë³µêµ¬í•  수 없습니다." @@ -3084,7 +3380,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 "(없습니다.)" @@ -3092,10 +3388,6 @@ msgstr "(없습니다.)" msgid "All members" msgstr "모든 회ì›" -#: actions/showgroup.php:429 lib/profileaction.php:174 -msgid "Statistics" -msgstr "통계" - #: actions/showgroup.php:432 #, fuzzy msgid "Created" @@ -3242,12 +3534,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 @@ -3438,7 +3730,8 @@ msgid "Save site settings" msgstr "아바타 설정" #: actions/smssettings.php:58 -msgid "SMS Settings" +#, fuzzy +msgid "SMS settings" msgstr "SMS 세팅" #: actions/smssettings.php:69 @@ -3469,7 +3762,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 @@ -3717,10 +4011,6 @@ 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 "구ë…취소 ë˜ì—ˆìŠµë‹ˆë‹¤." @@ -3927,11 +4217,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" @@ -4010,11 +4295,6 @@ msgstr "" msgid "Plugins" msgstr "" -#: actions/version.php:195 -#, fuzzy -msgid "Name" -msgstr "별명" - #: actions/version.php:196 lib/action.php:741 #, fuzzy msgid "Version" @@ -4024,27 +4304,43 @@ msgstr "ê°œì¸ì ì¸" msgid "Author(s)" msgstr "" -#: actions/version.php:198 lib/groupeditform.php:172 -msgid "Description" -msgstr "설명" - -#: classes/File.php:137 +#: 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/Group_member.php:41 +#, fuzzy +msgid "Group join failed." +msgstr "그룹 프로필" + +#: classes/Group_member.php:53 +#, fuzzy +msgid "Not part of group." +msgstr "ê·¸ë£¹ì„ ì—…ë°ì´íŠ¸ í•  수 없습니다." + +#: classes/Group_member.php:60 +#, fuzzy +msgid "Group leave failed." +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." @@ -4058,28 +4354,28 @@ msgstr "메시지를 삽입할 수 없습니다." msgid "Could not update message with new URI." msgstr "새 URI와 함께 메시지를 ì—…ë°ì´íŠ¸í•  수 없습니다." -#: classes/Notice.php:172 +#: classes/Notice.php:171 #, php-format msgid "DB error inserting hashtag: %s" msgstr "해쉬테그를 추가 í•  ë•Œì— ë°ì´íƒ€ë² ì´ìŠ¤ ì—러 : %s" -#: classes/Notice.php:226 +#: classes/Notice.php:225 #, fuzzy msgid "Problem saving notice. Too long." msgstr "통지를 ì €ìž¥í•˜ëŠ”ë° ë¬¸ì œê°€ ë°œìƒí–ˆìŠµë‹ˆë‹¤." -#: classes/Notice.php:230 +#: classes/Notice.php:229 msgid "Problem saving notice. Unknown user." msgstr "게시글 저장문제. ì•Œë ¤ì§€ì§€ì•Šì€ íšŒì›" -#: classes/Notice.php:235 +#: classes/Notice.php:234 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "너무 ë§Žì€ ê²Œì‹œê¸€ì´ ë„ˆë¬´ 빠르게 올ë¼ì˜µë‹ˆë‹¤. 한숨고르고 ëª‡ë¶„í›„ì— ë‹¤ì‹œ í¬ìŠ¤íŠ¸ë¥¼ " "해보세요." -#: classes/Notice.php:241 +#: classes/Notice.php:240 #, fuzzy msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " @@ -4088,25 +4384,25 @@ msgstr "" "너무 ë§Žì€ ê²Œì‹œê¸€ì´ ë„ˆë¬´ 빠르게 올ë¼ì˜µë‹ˆë‹¤. 한숨고르고 ëª‡ë¶„í›„ì— ë‹¤ì‹œ í¬ìŠ¤íŠ¸ë¥¼ " "해보세요." -#: classes/Notice.php:247 +#: classes/Notice.php:246 msgid "You are banned from posting notices on this site." msgstr "ì´ ì‚¬ì´íŠ¸ì— 게시글 í¬ìŠ¤íŒ…으로부터 ë‹¹ì‹ ì€ ê¸ˆì§€ë˜ì—ˆìŠµë‹ˆë‹¤." -#: classes/Notice.php:309 classes/Notice.php:334 +#: classes/Notice.php:305 classes/Notice.php:330 msgid "Problem saving notice." msgstr "통지를 ì €ìž¥í•˜ëŠ”ë° ë¬¸ì œê°€ ë°œìƒí–ˆìŠµë‹ˆë‹¤." -#: classes/Notice.php:1034 +#: classes/Notice.php:1052 #, php-format msgid "DB error inserting reply: %s" msgstr "ë‹µì‹ ì„ ì¶”ê°€ í•  ë•Œì— ë°ì´íƒ€ë² ì´ìŠ¤ ì—러 : %s" -#: classes/Notice.php:1359 +#: classes/Notice.php:1423 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" -#: classes/User.php:368 +#: classes/User.php:382 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "%2$sì—ì„œ %1$s까지 메시지" @@ -4148,6 +4444,11 @@ msgstr "기타" msgid "Other options" msgstr "다른 옵션들" +#: lib/action.php:144 +#, fuzzy, php-format +msgid "%1$s - %2$s" +msgstr "%1$s (%2$s)" + #: lib/action.php:159 msgid "Untitled page" msgstr "제목없는 페ì´ì§€" @@ -4164,10 +4465,6 @@ msgstr "홈" msgid "Personal profile and friends timeline" msgstr "ê°œì¸ í”„ë¡œí•„ê³¼ 친구 타임ë¼ì¸" -#: lib/action.php:435 -msgid "Account" -msgstr "계정" - #: lib/action.php:435 msgid "Change your email, avatar, password, profile" msgstr "ë‹¹ì‹ ì˜ ì´ë©”ì¼, 아바타, 비밀 번호, í”„ë¡œí•„ì„ ë³€ê²½í•˜ì„¸ìš”." @@ -4326,10 +4623,6 @@ msgstr "ë’· 페ì´ì§€" msgid "Before" msgstr "ì•ž 페ì´ì§€" -#: lib/action.php:1167 -msgid "There was a problem with your session token." -msgstr "ë‹¹ì‹ ì˜ ì„¸ì…˜í† í°ê´€ë ¨ 문제가 있습니다." - #: lib/adminpanelaction.php:96 #, fuzzy msgid "You cannot make changes to this site." @@ -4370,6 +4663,72 @@ msgstr "SMS ì¸ì¦" msgid "Paths configuration" msgstr "SMS ì¸ì¦" +#: lib/applicationeditform.php:186 +msgid "Icon for this application" +msgstr "" + +#: lib/applicationeditform.php:206 +#, fuzzy, php-format +msgid "Describe your application in %d characters" +msgstr "140글ìžë¡œ 그룹ì´ë‚˜ 토픽 설명하기" + +#: lib/applicationeditform.php:209 +#, fuzzy +msgid "Describe your application" +msgstr "140글ìžë¡œ 그룹ì´ë‚˜ 토픽 설명하기" + +#: lib/applicationeditform.php:218 +#, fuzzy +msgid "Source URL" +msgstr "소스 코드" + +#: lib/applicationeditform.php:220 +#, fuzzy +msgid "URL of the homepage of this application" +msgstr "그룹 í˜¹ì€ í† í”½ì˜ í™ˆíŽ˜ì´ì§€ë‚˜ 블로그 URL" + +#: lib/applicationeditform.php:226 +msgid "Organization responsible for this application" +msgstr "" + +#: lib/applicationeditform.php:232 +#, fuzzy +msgid "URL for the homepage of the organization" +msgstr "그룹 í˜¹ì€ í† í”½ì˜ í™ˆíŽ˜ì´ì§€ë‚˜ 블로그 URL" + +#: lib/applicationeditform.php:238 +msgid "URL to redirect to after authentication" +msgstr "" + +#: lib/applicationeditform.php:260 +msgid "Browser" +msgstr "" + +#: lib/applicationeditform.php:276 +msgid "Desktop" +msgstr "" + +#: lib/applicationeditform.php:277 +msgid "Type of application, browser or desktop" +msgstr "" + +#: lib/applicationeditform.php:299 +msgid "Read-only" +msgstr "" + +#: lib/applicationeditform.php:317 +msgid "Read-write" +msgstr "" + +#: lib/applicationeditform.php:318 +msgid "Default access for this application: read-only, or read-write" +msgstr "" + +#: lib/applicationlist.php:154 +#, fuzzy +msgid "Revoke" +msgstr "ì‚­ì œ" + #: lib/attachmentlist.php:87 msgid "Attachments" msgstr "" @@ -4391,12 +4750,12 @@ msgstr "" msgid "Tags for this attachment" msgstr "" -#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 +#: lib/authenticationplugin.php:214 lib/authenticationplugin.php:219 #, fuzzy msgid "Password changing failed" msgstr "비밀번호 변경" -#: lib/authenticationplugin.php:197 +#: lib/authenticationplugin.php:229 #, fuzzy msgid "Password changing is not allowed" msgstr "비밀번호 변경" @@ -4419,7 +4778,7 @@ msgstr "죄송합니다. ì´ ëª…ë ¹ì€ ì•„ì§ ì‹¤í–‰ë˜ì§€ 않았습니다." #: lib/command.php:88 #, fuzzy, php-format -msgid "Could not find a user with nickname %s." +msgid "Could not find a user with nickname %s" msgstr "ì´ ì´ë©”ì¼ ì£¼ì†Œë¡œ 사용ìžë¥¼ ì—…ë°ì´íŠ¸ í•  수 없습니다." #: lib/command.php:92 @@ -4428,7 +4787,7 @@ msgstr "" #: lib/command.php:99 #, fuzzy, php-format -msgid "Nudge sent to %s." +msgid "Nudge sent to %s" msgstr "찔러 보기를 보냈습니다." #: lib/command.php:126 @@ -4439,170 +4798,191 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:399 lib/command.php:460 +#: lib/command.php:152 lib/command.php:390 lib/command.php:451 #, fuzzy -msgid "Notice with that id does not exist." +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." +#: lib/command.php:168 lib/command.php:406 lib/command.php:467 +#: lib/command.php:523 +msgid "User has no last notice" msgstr "ì´ìš©ìžì˜ 지ì†ì ì¸ ê²Œì‹œê¸€ì´ ì—†ìŠµë‹ˆë‹¤." #: lib/command.php:190 msgid "Notice marked as fave." msgstr "ê²Œì‹œê¸€ì´ ì¢‹ì•„í•˜ëŠ” 글로 지정ë˜ì—ˆìŠµë‹ˆë‹¤." -#: lib/command.php:284 -#, fuzzy, php-format -msgid "Could not remove user %1$s to group %2$s." +#: lib/command.php:217 +msgid "You are already a member of that group" +msgstr "ë‹¹ì‹ ì€ ì´ë¯¸ ì´ ê·¸ë£¹ì˜ ë©¤ë²„ìž…ë‹ˆë‹¤." + +#: lib/command.php:231 +#, php-format +msgid "Could not join user %s to group %s" +msgstr "그룹 %sì— %s는 가입할 수 없습니다." + +#: lib/command.php:236 +#, php-format +msgid "%s joined group %s" +msgstr "%s 는 그룹 %sì— ê°€ìž…í–ˆìŠµë‹ˆë‹¤." + +#: lib/command.php:275 +#, php-format +msgid "Could not remove user %s to group %s" msgstr "그룹 %sì—ì„œ %s 사용ìžë¥¼ 제거할 수 없습니다." -#: lib/command.php:318 +#: lib/command.php:280 +#, php-format +msgid "%s left group %s" +msgstr "%sê°€ 그룹%s를 떠났습니다." + +#: lib/command.php:309 #, php-format msgid "Fullname: %s" msgstr "ì „ì²´ì´ë¦„: %s" -#: lib/command.php:321 +#: lib/command.php:312 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "위치: %s" -#: lib/command.php:324 +#: lib/command.php:315 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "홈페ì´ì§€: %s" -#: lib/command.php:327 +#: lib/command.php:318 #, php-format msgid "About: %s" msgstr "ìžê¸°ì†Œê°œ: %s" -#: lib/command.php:358 +#: lib/command.php:349 #, fuzzy, php-format -msgid "Message too long - maximum is %1$d characters, you sent %2$d." +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." +#: lib/command.php:367 +#, php-format +msgid "Direct message to %s sent" msgstr "%sì—게 보낸 ì§ì ‘ 메시지" -#: lib/command.php:378 +#: lib/command.php:369 msgid "Error sending direct message." msgstr "ì§ì ‘ 메시지 보내기 오류." -#: lib/command.php:435 +#: lib/command.php:413 +#, fuzzy +msgid "Cannot repeat your own notice" +msgstr "ì•Œë¦¼ì„ ì¼¤ 수 없습니다." + +#: lib/command.php:418 +#, fuzzy +msgid "Already repeated that notice" +msgstr "ì´ ê²Œì‹œê¸€ 삭제하기" + +#: lib/command.php:426 #, fuzzy, php-format -msgid "Notice from %s repeated." +msgid "Notice from %s repeated" msgstr "ê²Œì‹œê¸€ì´ ë“±ë¡ë˜ì—ˆìŠµë‹ˆë‹¤." -#: lib/command.php:437 +#: lib/command.php:428 #, fuzzy msgid "Error repeating notice." msgstr "통지를 ì €ìž¥í•˜ëŠ”ë° ë¬¸ì œê°€ ë°œìƒí–ˆìŠµë‹ˆë‹¤." -#: lib/command.php:491 +#: lib/command.php:482 #, fuzzy, php-format -msgid "Notice too long - maximum is %1$d characters, you sent %2$d." +msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "ë‹¹ì‹ ì´ ë³´ë‚¸ 메시지가 너무 길어요. 최대 140글ìžê¹Œì§€ìž…니다." -#: lib/command.php:500 +#: lib/command.php:491 #, fuzzy, php-format -msgid "Reply to %s sent." +msgid "Reply to %s sent" msgstr "ì´ ê²Œì‹œê¸€ì— ëŒ€í•´ 답장하기" -#: lib/command.php:502 +#: lib/command.php:493 #, fuzzy msgid "Error saving notice." msgstr "통지를 ì €ìž¥í•˜ëŠ”ë° ë¬¸ì œê°€ ë°œìƒí–ˆìŠµë‹ˆë‹¤." -#: lib/command.php:556 -#, fuzzy -msgid "Specify the name of the user to subscribe to." +#: lib/command.php:547 +msgid "Specify the name of the user to subscribe to" msgstr "구ë…하려는 사용ìžì˜ ì´ë¦„ì„ ì§€ì •í•˜ì‹­ì‹œì˜¤." -#: lib/command.php:563 +#: lib/command.php:554 #, php-format msgid "Subscribed to %s" msgstr "%sì—게 구ë…ë˜ì—ˆìŠµë‹ˆë‹¤." -#: lib/command.php:584 -#, fuzzy -msgid "Specify the name of the user to unsubscribe from." +#: lib/command.php:575 +msgid "Specify the name of the user to unsubscribe from" msgstr "구ë…ì„ í•´ì œí•˜ë ¤ëŠ” 사용ìžì˜ ì´ë¦„ì„ ì§€ì •í•˜ì‹­ì‹œì˜¤." -#: lib/command.php:591 +#: lib/command.php:582 #, php-format msgid "Unsubscribed from %s" msgstr "%sì—ì„œ 구ë…ì„ í•´ì œí–ˆìŠµë‹ˆë‹¤." -#: lib/command.php:609 lib/command.php:632 +#: lib/command.php:600 lib/command.php:623 msgid "Command not yet implemented." msgstr "ëª…ë ¹ì´ ì•„ì§ ì‹¤í–‰ë˜ì§€ 않았습니다." -#: lib/command.php:612 +#: lib/command.php:603 msgid "Notification off." msgstr "알림ë„기." -#: lib/command.php:614 +#: lib/command.php:605 msgid "Can't turn off notification." msgstr "ì•Œë¦¼ì„ ëŒ ìˆ˜ 없습니다." -#: lib/command.php:635 +#: lib/command.php:626 msgid "Notification on." msgstr "ì•Œë¦¼ì´ ì¼œì¡ŒìŠµë‹ˆë‹¤." -#: lib/command.php:637 +#: lib/command.php:628 msgid "Can't turn on notification." msgstr "ì•Œë¦¼ì„ ì¼¤ 수 없습니다." -#: lib/command.php:650 -msgid "Login command is disabled." +#: lib/command.php:641 +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:652 #, php-format -msgid "This link is useable only once, and is good for only 2 minutes: %s." +msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:685 +#: lib/command.php:668 #, fuzzy msgid "You are not subscribed to anyone." msgstr "ë‹¹ì‹ ì€ ì´ í”„ë¡œí•„ì— êµ¬ë…ë˜ì§€ 않고있습니다." -#: lib/command.php:687 +#: lib/command.php:670 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "ë‹¹ì‹ ì€ ë‹¤ìŒ ì‚¬ìš©ìžë¥¼ ì´ë¯¸ 구ë…하고 있습니다." -#: lib/command.php:707 +#: lib/command.php:690 #, fuzzy msgid "No one is subscribed to you." msgstr "다른 ì‚¬ëžŒì„ êµ¬ë… í•˜ì‹¤ 수 없습니다." -#: lib/command.php:709 +#: lib/command.php:692 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "다른 ì‚¬ëžŒì„ êµ¬ë… í•˜ì‹¤ 수 없습니다." -#: lib/command.php:729 +#: lib/command.php:712 #, fuzzy msgid "You are not a member of any groups." msgstr "ë‹¹ì‹ ì€ í•´ë‹¹ ê·¸ë£¹ì˜ ë©¤ë²„ê°€ 아닙니다." -#: lib/command.php:731 +#: lib/command.php:714 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:728 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4643,20 +5023,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:199 +#: lib/common.php:131 #, fuzzy msgid "No configuration file found. " msgstr "í™•ì¸ ì½”ë“œê°€ 없습니다." -#: lib/common.php:200 +#: lib/common.php:132 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:201 +#: lib/common.php:134 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:202 +#: lib/common.php:135 #, fuzzy msgid "Go to the installer." msgstr "ì´ ì‚¬ì´íŠ¸ 로그ì¸" @@ -4673,6 +5053,15 @@ msgstr "ì¸ìŠ¤í„´íŠ¸ ë©”ì‹ ì €ì— ì˜í•œ ì—…ë°ì´íŠ¸" msgid "Updates by SMS" msgstr "SMSì— ì˜í•œ ì—…ë°ì´íŠ¸" +#: lib/connectsettingsaction.php:120 +#, fuzzy +msgid "Connections" +msgstr "ì—°ê²°" + +#: lib/connectsettingsaction.php:121 +msgid "Authorized connected applications" +msgstr "" + #: lib/dberroraction.php:60 msgid "Database error" msgstr "" @@ -4860,11 +5249,16 @@ msgstr "" msgid "kB" msgstr "" -#: lib/jabber.php:191 +#: lib/jabber.php:202 #, php-format msgid "[%s]" msgstr "" +#: lib/jabber.php:385 +#, php-format +msgid "Unknown inbox source %d." +msgstr "" + #: lib/joinform.php:114 msgid "Join" msgstr "가입" @@ -4926,21 +5320,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" @@ -5132,7 +5514,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 @@ -5140,7 +5522,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 @@ -5150,7 +5533,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 @@ -5184,16 +5567,18 @@ msgstr "" #: lib/noticeform.php:212 #, fuzzy -msgid "Share my location." -msgstr "태그를 저장할 수 없습니다." - -#: lib/noticeform.php:214 -#, fuzzy -msgid "Do not share my location." +msgid "Share my location" msgstr "태그를 저장할 수 없습니다." #: lib/noticeform.php:215 -msgid "Hide this info" +#, fuzzy +msgid "Do not share my location" +msgstr "태그를 저장할 수 없습니다." + +#: lib/noticeform.php:216 +msgid "" +"Sorry, retrieving your geo location is taking longer than expected, please " +"try again later" msgstr "" #: lib/noticelist.php:428 @@ -5470,25 +5855,25 @@ msgstr "" msgid "User has blocked you." msgstr "회ì›ì´ ë‹¹ì‹ ì„ ì°¨ë‹¨í•´ì™”ìŠµë‹ˆë‹¤." -#: lib/subs.php:60 +#: lib/subs.php:63 msgid "Could not subscribe." msgstr "êµ¬ë… í•˜ì‹¤ 수 없습니다." -#: lib/subs.php:79 +#: lib/subs.php:82 msgid "Could not subscribe other to you." msgstr "다른 ì‚¬ëžŒì„ êµ¬ë… í•˜ì‹¤ 수 없습니다." -#: lib/subs.php:128 +#: lib/subs.php:137 #, fuzzy msgid "Not subscribed!" msgstr "구ë…하고 있지 않습니다!" -#: lib/subs.php:133 +#: lib/subs.php:142 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "예약 구ë…ì„ ì‚­ì œ í•  수 없습니다." -#: lib/subs.php:146 +#: lib/subs.php:158 msgid "Couldn't delete subscription." msgstr "예약 구ë…ì„ ì‚­ì œ í•  수 없습니다." @@ -5502,10 +5887,6 @@ msgstr "" msgid "People Tagcloud as tagged" msgstr "" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(없습니다)" - #: lib/tagcloudsection.php:56 msgid "None" msgstr "ì—†ìŒ" @@ -5570,47 +5951,47 @@ msgstr "메시지" msgid "Moderate" msgstr "" -#: lib/util.php:837 +#: lib/util.php:875 msgid "a few seconds ago" msgstr "몇 ì´ˆ ì „" -#: lib/util.php:839 +#: lib/util.php:877 msgid "about a minute ago" msgstr "1분 ì „" -#: lib/util.php:841 +#: lib/util.php:879 #, php-format msgid "about %d minutes ago" msgstr "%d분 ì „" -#: lib/util.php:843 +#: lib/util.php:881 msgid "about an hour ago" msgstr "1시간 ì „" -#: lib/util.php:845 +#: lib/util.php:883 #, php-format msgid "about %d hours ago" msgstr "%d시간 ì „" -#: lib/util.php:847 +#: lib/util.php:885 msgid "about a day ago" msgstr "하루 ì „" -#: lib/util.php:849 +#: lib/util.php:887 #, php-format msgid "about %d days ago" msgstr "%dì¼ ì „" -#: lib/util.php:851 +#: lib/util.php:889 msgid "about a month ago" msgstr "1달 ì „" -#: lib/util.php:853 +#: lib/util.php:891 #, php-format msgid "about %d months ago" msgstr "%d달 ì „" -#: lib/util.php:855 +#: lib/util.php:893 msgid "about a year ago" msgstr "1ë…„ ì „" @@ -5626,5 +6007,5 @@ msgstr "" #: scripts/xmppdaemon.php:301 #, fuzzy, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "ë‹¹ì‹ ì´ ë³´ë‚¸ 메시지가 너무 길어요. 최대 140글ìžê¹Œì§€ìž…니다." diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po index 0109a9ae2d..30b7170566 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-10 00:46+0000\n" -"PO-Revision-Date: 2010-01-10 00:48:29+0000\n" +"POT-Creation-Date: 2010-01-15 19:15+0000\n" +"PO-Revision-Date: 2010-01-16 17:52:38+0000\n" "Language-Team: Macedonian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60878); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r61138); 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" @@ -34,25 +34,30 @@ msgstr "Ðема таква Ñтраница" #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 +#: actions/apistatusesupdate.php:149 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 #: 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 #: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 -#: lib/command.php:163 lib/command.php:311 lib/command.php:364 -#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/command.php:163 lib/command.php:302 lib/command.php:355 +#: lib/command.php:401 lib/command.php:462 lib/command.php:518 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/subs.php:34 lib/subs.php:125 msgid "No such user." msgstr "Ðема таков кориÑник." +#: actions/all.php:84 +#, php-format +msgid "%1$s and friends, page %2$d" +msgstr "%1$s и пријателите, ÑÑ‚Ñ€. %2$d" + #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 +#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -90,14 +95,14 @@ msgstr "" "groups%%) или објавете нешто Ñамите." #: actions/all.php:134 -#, fuzzy, php-format +#, php-format msgid "" "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 @@ -113,7 +118,7 @@ msgstr "" msgid "You and friends" msgstr "Вие и пријателите" -#: actions/allrss.php:119 actions/apitimelinefriends.php:122 +#: actions/allrss.php:119 actions/apitimelinefriends.php:121 #: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" @@ -124,6 +129,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:155 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 методот не е пронајден." @@ -137,7 +159,7 @@ msgstr "API методот не е пронајден." #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:114 +#: actions/apistatusesupdate.php:119 msgid "This method requires a POST." msgstr "Овој метод бара POST." @@ -168,8 +190,9 @@ msgstr "Ðе може да Ñе зачува профил." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257 -#: actions/designadminpanel.php:122 actions/newnotice.php:94 +#: actions/apistatusesupdate.php:132 actions/avatarsettings.php:257 +#: actions/designadminpanel.php:122 actions/editapplication.php:118 +#: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format msgid "" @@ -183,6 +206,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 +249,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,16 +273,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." @@ -297,8 +303,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." @@ -331,7 +337,8 @@ msgstr "Тој прекар е во употреба. Одберете друг. msgid "Not a valid nickname." msgstr "Ðеправилен прекар." -#: actions/apigroupcreate.php:196 actions/editgroup.php:195 +#: actions/apigroupcreate.php:196 actions/editapplication.php:212 +#: actions/editgroup.php:195 actions/newapplication.php:200 #: actions/newgroup.php:139 actions/profilesettings.php:222 #: actions/register.php:217 msgid "Homepage is not a valid URL." @@ -343,7 +350,8 @@ msgstr "Главната Ñтраница не е важечка URL-Ð°Ð´Ñ€ÐµÑ msgid "Full name is too long (max 255 chars)." msgstr "Целото име е предолго (макÑимум 255 знаци)" -#: actions/apigroupcreate.php:213 +#: actions/apigroupcreate.php:213 actions/editapplication.php:187 +#: actions/newapplication.php:169 #, php-format msgid "Description is too long (max %d chars)." msgstr "ОпиÑот е предолг (дозволено е највеќе %d знаци)." @@ -383,7 +391,7 @@ msgstr "ÐлијаÑот не може да биде иÑÑ‚ како прека msgid "Group not found!" msgstr "Групата не е пронајдена!" -#: actions/apigroupjoin.php:110 lib/command.php:217 +#: actions/apigroupjoin.php:110 actions/joingroup.php:90 msgid "You are already a member of that group." msgstr "Веќе членувате во таа група." @@ -391,19 +399,19 @@ msgstr "Веќе членувате во таа група." msgid "You have been blocked from that group by the admin." msgstr "Блокирани Ñте од таа група од админиÑтраторот." -#: actions/apigroupjoin.php:138 lib/command.php:234 -#, fuzzy, php-format +#: actions/apigroupjoin.php:138 actions/joingroup.php:124 +#, php-format msgid "Could not join user %1$s to group %2$s." -msgstr "Ðе може да Ñе придружи кориÑник %s на група %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/leavegroup.php:127 -#, fuzzy, php-format +#: actions/apigroupleave.php:124 actions/leavegroup.php:119 +#, php-format msgid "Could not remove user %1$s from group %2$s." -msgstr "Ðе може да Ñе избрише кориÑник %s од група %s." +msgstr "Ðе можев да го отÑтранам кориÑникот %1$s од групата %2$s." #: actions/apigrouplist.php:95 #, php-format @@ -420,6 +428,99 @@ msgstr "%s групи" msgid "groups on %s" msgstr "групи на %s" +#: actions/apioauthauthorize.php:108 actions/apioauthauthorize.php:114 +msgid "Bad request." +msgstr "Лошо барање." + +#: actions/apioauthauthorize.php:134 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:115 actions/makeadmin.php:66 +#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 +#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:139 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 +#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/subscribe.php:46 actions/tagother.php:166 +#: 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 "Се поајви проблем Ñо Вашиот ÑеÑиÑки жетон. Обидете Ñе повторно." + +#: actions/apioauthauthorize.php:146 +msgid "Invalid nickname / password!" +msgstr "Погрешен прекар / лозинка!" + +#: actions/apioauthauthorize.php:170 +msgid "DB error deleting OAuth app user." +msgstr "Грешка при бришењето на кориÑникот на OAuth-програмот." + +#: actions/apioauthauthorize.php:196 +msgid "DB error inserting OAuth app user." +msgstr "" +"Грешка во базата на податоци при вметнувањето на кориÑникот на OAuth-" +"програмот." + +#: actions/apioauthauthorize.php:231 +#, php-format +msgid "" +"The request token %s has been authorized. Please exchange it for an access " +"token." +msgstr "Жетонот на барањето %s е одобрен. Заменете го Ñо жетон за приÑтап." + +#: actions/apioauthauthorize.php:241 +#, php-format +msgid "The request token %s has been denied." +msgstr "Жетонот на барањето %s е одбиен." + +#: actions/apioauthauthorize.php:246 actions/avatarsettings.php:281 +#: actions/designadminpanel.php:103 actions/editapplication.php:139 +#: actions/emailsettings.php:256 actions/grouplogo.php:319 +#: actions/imsettings.php:220 actions/newapplication.php:121 +#: actions/oauthconnectionssettings.php:151 actions/recoverpassword.php:44 +#: actions/smssettings.php:248 lib/designsettings.php:304 +msgid "Unexpected form submission." +msgstr "Ðеочекувано поднеÑување на образец." + +#: actions/apioauthauthorize.php:273 +msgid "An application would like to connect to your account" +msgstr "Има програм кој Ñака да Ñе поврзе Ñо Вашата Ñметка" + +#: actions/apioauthauthorize.php:290 +msgid "Allow or deny access" +msgstr "Дозволи или одбиј приÑтап" + +#: actions/apioauthauthorize.php:320 lib/action.php:435 +msgid "Account" +msgstr "Сметка" + +#: actions/apioauthauthorize.php:323 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/apioauthauthorize.php:326 actions/login.php:233 +#: actions/register.php:429 lib/accountsettingsaction.php:116 +msgid "Password" +msgstr "Лозинка" + +#: actions/apioauthauthorize.php:338 +msgid "Deny" +msgstr "Одбиј" + +#: actions/apioauthauthorize.php:344 +msgid "Allow" +msgstr "Дозволи" + +#: actions/apioauthauthorize.php:361 +msgid "Allow or deny access to your account information." +msgstr "Дозволете или одбијте приÑтап до податоците за Вашата Ñметка." + #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." msgstr "Методот бара POST или DELETE." @@ -433,11 +534,11 @@ msgstr "Ðе можете да избришете ÑÑ‚Ð°Ñ‚ÑƒÑ Ð½Ð° друг к msgid "No such notice." msgstr "Ðема таква забелешка." -#: actions/apistatusesretweet.php:83 lib/command.php:422 +#: actions/apistatusesretweet.php:83 msgid "Cannot repeat your own notice." msgstr "Ðе можете да ја повторувате ÑопÑтвената забелешка." -#: actions/apistatusesretweet.php:91 lib/command.php:427 +#: actions/apistatusesretweet.php:91 msgid "Already repeated that notice." msgstr "Забелешката е веќе повторена." @@ -449,17 +550,17 @@ msgstr "СтатуÑот е избришан." msgid "No status with that ID found." msgstr "Ðема пронајдено ÑÑ‚Ð°Ñ‚ÑƒÑ Ñо тој ID." -#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:162 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Ова е предолго. МакÑималната дозволена должина изнеÑува %d знаци." -#: actions/apistatusesupdate.php:198 +#: actions/apistatusesupdate.php:203 msgid "Not found" msgstr "Ðе е пронајдено" -#: actions/apistatusesupdate.php:221 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:226 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -471,14 +572,14 @@ msgid "Unsupported format." msgstr "Ðеподдржан формат." #: actions/apitimelinefavorites.php:108 -#, fuzzy, php-format +#, php-format msgid "%1$s / Favorites from %2$s" -msgstr "%s / Омилени од %s" +msgstr "%1$s / Омилени од %2$s" #: actions/apitimelinefavorites.php:120 -#, fuzzy, php-format +#, php-format msgid "%1$s updates favorited by %2$s / %2$s." -msgstr "Подновувања на %s омилени на %s / %s." +msgstr "Подновувања на %1$s омилени на %2$s / %2$s." #: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 #: actions/grouprss.php:131 actions/userrss.php:90 @@ -545,8 +646,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 +675,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 "КориÑник без Ñоодветен профил" @@ -604,29 +708,6 @@ 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/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 -#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 -#: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 -#: actions/subscribe.php:46 actions/tagother.php:166 -#: 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 "Се поајви проблем Ñо Вашиот ÑеÑиÑки жетон. Обидете Ñе повторно." - -#: actions/avatarsettings.php:281 actions/designadminpanel.php:103 -#: actions/emailsettings.php:256 actions/grouplogo.php:319 -#: actions/imsettings.php:220 actions/recoverpassword.php:44 -#: actions/smssettings.php:248 lib/designsettings.php:304 -msgid "Unexpected form submission." -msgstr "Ðеочекувано поднеÑување на образец." - #: actions/avatarsettings.php:328 msgid "Pick a square area of the image to be your avatar" msgstr "Одберете квадратна површина од Ñликата за аватар" @@ -689,19 +770,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:260 +msgid "No such group." +msgstr "Ðема таква група." #: actions/blockedfromgroup.php:90 #, php-format @@ -709,9 +786,9 @@ msgid "%s blocked profiles" msgstr "%s блокирани профили" #: actions/blockedfromgroup.php:93 -#, fuzzy, php-format +#, php-format msgid "%1$s blocked profiles, page %2$d" -msgstr "%s блокирани профили, Ñтраница %d" +msgstr "%1$s блокирани профили, ÑÑ‚Ñ€. %2$d" #: actions/blockedfromgroup.php:108 msgid "A list of the users blocked from joining this group." @@ -768,8 +845,8 @@ msgid "Couldn't delete email confirmation." msgstr "Ðе можев да ја избришам потврдата по е-пошта." #: actions/confirmaddress.php:144 -msgid "Confirm Address" -msgstr "Потврди ја адреÑата" +msgid "Confirm address" +msgstr "Потврди адреÑа" #: actions/confirmaddress.php:159 #, php-format @@ -823,10 +900,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 "Ðе можете да бришете кориÑници." @@ -960,7 +1033,8 @@ msgstr "Врати по оÑновно" #: actions/pathsadminpanel.php:324 actions/profilesettings.php:174 #: actions/siteadminpanel.php:388 actions/smssettings.php:181 #: actions/subscriptions.php:203 actions/tagother.php:154 -#: actions/useradminpanel.php:313 lib/designsettings.php:256 +#: actions/useradminpanel.php:313 lib/applicationeditform.php:335 +#: lib/applicationeditform.php:336 lib/designsettings.php:256 #: lib/groupeditform.php:202 msgid "Save" msgstr "Зачувај" @@ -981,6 +1055,76 @@ msgstr "Додај во омилени" msgid "No such document." msgstr "Ðема таков документ." +#: actions/editapplication.php:54 lib/applicationeditform.php:136 +msgid "Edit application" +msgstr "Уреди програм" + +#: actions/editapplication.php:66 +msgid "You must be logged in to edit an application." +msgstr "Мора да Ñте најавени за да можете да уредувате програми." + +#: actions/editapplication.php:77 actions/showapplication.php:94 +msgid "You are not the owner of this application." +msgstr "Ðе Ñте ÑопÑтвеник на овој програм." + +#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:163 +#: actions/showapplication.php:87 +msgid "No such application." +msgstr "Ðема таков програм." + +#: actions/editapplication.php:127 actions/newapplication.php:110 +#: actions/showapplication.php:118 lib/action.php:1167 +msgid "There was a problem with your session token." +msgstr "Се појави проблем Ñо Вашиот ÑеÑиÑки жетон." + +#: actions/editapplication.php:161 +msgid "Use this form to edit your application." +msgstr "Образецов Ñлужи за уредување на програмот." + +#: actions/editapplication.php:177 actions/newapplication.php:159 +msgid "Name is required." +msgstr "Треба име." + +#: actions/editapplication.php:180 actions/newapplication.php:162 +msgid "Name is too long (max 255 chars)." +msgstr "Името е предолго (макÑимум 255 знаци)." + +#: actions/editapplication.php:183 actions/newapplication.php:165 +msgid "Description is required." +msgstr "Треба опиÑ." + +#: actions/editapplication.php:191 +msgid "Source URL is too long." +msgstr "Изворната URL-адреÑа е предолга." + +#: actions/editapplication.php:197 actions/newapplication.php:182 +msgid "Source URL is not valid." +msgstr "Изворната URL-адреÑа е неважечка." + +#: actions/editapplication.php:200 actions/newapplication.php:185 +msgid "Organization is required." +msgstr "Треба организација." + +#: actions/editapplication.php:203 actions/newapplication.php:188 +msgid "Organization is too long (max 255 chars)." +msgstr "Организацијата е предолга (макÑимумот е 255 знаци)." + +#: actions/editapplication.php:206 actions/newapplication.php:191 +msgid "Organization homepage is required." +msgstr "Треба домашна Ñтраница на организацијата." + +#: actions/editapplication.php:215 actions/newapplication.php:203 +msgid "Callback is too long." +msgstr "Повикувањето е предолго." + +#: actions/editapplication.php:222 actions/newapplication.php:212 +msgid "Callback URL is not valid." +msgstr "URL-адреÑата за повикување е неважечка." + +#: actions/editapplication.php:255 +msgid "Could not update application." +msgstr "Ðе можев да го подновам програмот." + #: actions/editgroup.php:56 #, php-format msgid "Edit %s group" @@ -992,8 +1136,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." @@ -1017,8 +1161,8 @@ msgid "Options saved." msgstr "Ðагодувањата Ñе зачувани." #: actions/emailsettings.php:60 -msgid "Email Settings" -msgstr "Ðагодувња за е-пошта" +msgid "Email settings" +msgstr "Ðагодувања за е-пошта" #: actions/emailsettings.php:71 #, php-format @@ -1049,12 +1193,13 @@ msgstr "" "Ñандачето за Ñпам!). Во пиÑмото ќе Ñледат понатамошни напатÑтвија." #: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 +#: actions/smssettings.php:126 lib/applicationeditform.php:333 +#: lib/applicationeditform.php:334 msgid "Cancel" msgstr "Откажи" #: actions/emailsettings.php:121 -msgid "Email Address" +msgid "Email address" msgstr "Е-поштенÑка адреÑа" #: actions/emailsettings.php:123 @@ -1131,9 +1276,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,13 +1462,6 @@ 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:79 msgid "No such file." msgstr "Ðема таква податотека." @@ -1339,7 +1478,7 @@ msgstr "Ðема назначено профил." #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 -#: lib/profileformaction.php:77 +#: actions/unsubscribe.php:84 lib/profileformaction.php:77 msgid "No profile with that ID." msgstr "Ðема профил Ñо тоа ID." @@ -1365,14 +1504,14 @@ msgid "Block user from group" msgstr "Блокирај кориÑник од група" #: actions/groupblock.php:162 -#, fuzzy, php-format +#, php-format msgid "" "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " "will be removed from the group, unable to post, and unable to subscribe to " "the group in the future." msgstr "" -"Дали Ñте Ñигурни дека Ñакате да го блокирате кориÑникот „%s“ од групата „%" -"s“? КориÑникот ќе биде отÑтранет од групата, и во иднина нема да може да " +"Дали Ñте Ñигурни дека Ñакате да го блокирате кориÑникот „%1$s“ од групата „%2" +"$s“? КориÑникот ќе биде отÑтранет од групата, и во иднина нема да може да " "објавува во таа група и да Ñе претплаќа на неа." #: actions/groupblock.php:178 @@ -1389,9 +1528,9 @@ 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." @@ -1414,12 +1553,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 "Ðагодувањата Ñе зачувани." @@ -1436,6 +1569,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 "Одберете квадратен проÑтор на Ñликата за лого." @@ -1454,9 +1591,9 @@ msgid "%s group members" msgstr "Членови на групата %s" #: actions/groupmembers.php:96 -#, fuzzy, php-format +#, php-format msgid "%1$s group members, page %2$d" -msgstr "Членови на групата %s, ÑÑ‚Ñ€. %d" +msgstr "Членови на групата %1$s, ÑÑ‚Ñ€. %2$d" #: actions/groupmembers.php:111 msgid "A list of the users in this group." @@ -1566,7 +1703,7 @@ msgid "Error removing the block." msgstr "Грешка при отÑтранување на блокот." #: actions/imsettings.php:59 -msgid "IM Settings" +msgid "IM settings" msgstr "Ðагодувања за IM" #: actions/imsettings.php:70 @@ -1597,7 +1734,7 @@ msgstr "" "пријатели?)" #: actions/imsettings.php:124 -msgid "IM Address" +msgid "IM address" msgstr "IM адреÑа" #: actions/imsettings.php:126 @@ -1697,7 +1834,7 @@ msgstr "Покани нови кориÑници" msgid "You are already subscribed to these users:" msgstr "Веќе Ñте претплатени на овие кориÑници:" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:315 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -1743,7 +1880,7 @@ msgstr "Лична порака" msgid "Optionally add a personal message to the invitation." msgstr "Можете да додадете и лична порака во поканата." -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236 msgid "Send" msgstr "ИÑпрати" @@ -1813,87 +1950,59 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "Мора да Ñте најавени за да можете да Ñе зачлените во група." -#: actions/joingroup.php:90 -msgid "You are already a member of that group" -msgstr "Веќе членувате во таа група" - -#: actions/joingroup.php:128 -#, fuzzy, php-format -msgid "Could not join user %1$s to group %2$s" -msgstr "Ðе можев да го зачленам кориÑникот %s во групата %s" - -#: actions/joingroup.php:135 lib/command.php:239 -#, fuzzy, php-format +#: actions/joingroup.php:131 +#, php-format msgid "%1$s joined group %2$s" -msgstr "%s Ñе зачлени во групата %s" +msgstr "%1$s Ñе зачлени во групата %2$s" #: actions/leavegroup.php:60 msgid "You must be logged in to leave a group." msgstr "Мора да Ñте најавени за да можете да ја напуштите групата." -#: actions/leavegroup.php:90 lib/command.php:268 +#: actions/leavegroup.php:90 lib/command.php:265 msgid "You are not a member of that group." msgstr "Ðе членувате во таа група." -#: actions/leavegroup.php:119 lib/command.php:278 -msgid "Could not find membership record." -msgstr "Ðе можам да ја пронајдам членÑката евиденција." - -#: actions/leavegroup.php:134 lib/command.php:289 -#, fuzzy, php-format +#: actions/leavegroup.php:127 +#, php-format msgid "%1$s left group %2$s" -msgstr "%s ја напушти групата %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:460 +#: 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 -#: lib/groupeditform.php:152 lib/userprofile.php:131 -msgid "Nickname" -msgstr "Прекар" - -#: actions/login.php:253 actions/register.php:428 -#: 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." @@ -1901,7 +2010,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]" @@ -1915,24 +2024,44 @@ msgid "Only an admin can make another user an admin." msgstr "Само админиÑтратор може да направи друг кориÑник админиÑтратор." #: actions/makeadmin.php:95 -#, fuzzy, php-format +#, php-format msgid "%1$s is already an admin for group \"%2$s\"." -msgstr "%s веќе е админиÑтратор на групата „%s“." +msgstr "%1$s веќе е админиÑтратор на групата „%2$s“." #: actions/makeadmin.php:132 -#, fuzzy, php-format -msgid "Can't get membership record for %1$s in group %2$s" -msgstr "Ðе можам да добијам евиденција за членÑтво за %s во групата %s" +#, php-format +msgid "Can't get membership record for %1$s in group %2$s." +msgstr "Ðе можам да добијам евиденција за членÑтво на %1$s во групата %2$s." #: actions/makeadmin.php:145 -#, fuzzy, php-format -msgid "Can't make %1$s an admin for group %2$s" -msgstr "Ðе можам да го направам кориÑниокт %s админиÑтратор на групата %s" +#, php-format +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 "Ðема тековен ÑтатуÑ" +#: actions/newapplication.php:52 +msgid "New application" +msgstr "Ðов програм" + +#: actions/newapplication.php:64 +msgid "You must be logged in to register an application." +msgstr "Мора да Ñте најавени за да можете да региÑтрирате програм." + +#: actions/newapplication.php:143 +msgid "Use this form to register a new application." +msgstr "Овој образец Ñлужи за региÑтрирање на нов програм." + +#: actions/newapplication.php:173 +msgid "Source URL is required." +msgstr "Треба изворна URL-адреÑа." + +#: actions/newapplication.php:255 actions/newapplication.php:264 +msgid "Could not create application." +msgstr "Ðе можеше да Ñе Ñоздаде програмот." + #: actions/newgroup.php:53 msgid "New group" msgstr "Ðова група" @@ -1945,12 +2074,12 @@ msgstr "Овој образец Ñлужи за Ñоздавање нова гр msgid "New message" msgstr "Ðова порака" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 msgid "You can't send a message to this user." msgstr "Ðе можете да иÑпратите порака до овојо кориÑник." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:484 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 +#: lib/command.php:475 msgid "No content!" msgstr "Ðема Ñодржина!" @@ -1958,7 +2087,7 @@ msgstr "Ðема Ñодржина!" msgid "No recipient specified." msgstr "Ðема назначено примач." -#: actions/newmessage.php:164 lib/command.php:370 +#: actions/newmessage.php:164 lib/command.php:361 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -1971,8 +2100,8 @@ msgstr "Пораката е иÑпратена" #: 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" @@ -2000,9 +2129,9 @@ msgid "Text search" msgstr "ТекÑтуално пребарување" #: actions/noticesearch.php:91 -#, fuzzy, php-format +#, php-format msgid "Search results for \"%1$s\" on %2$s" -msgstr "Резултати од пребарувањето за „%s“ на %s" +msgstr "Резултати од пребарувањето за „%1$s“ на %2$s" #: actions/noticesearch.php:121 #, php-format @@ -2048,6 +2177,49 @@ msgstr "Подбуцнувањето е иÑпратено" msgid "Nudge sent!" msgstr "Подбуцнувањето е иÑпратено!" +#: actions/oauthappssettings.php:59 +msgid "You must be logged in to list your applications." +msgstr "Мора да Ñте најавени за да можете да ги наведете програмите." + +#: actions/oauthappssettings.php:74 +msgid "OAuth applications" +msgstr "OAuth програми" + +#: actions/oauthappssettings.php:85 +msgid "Applications you have registered" +msgstr "Програми што ги имате региÑтрирано" + +#: actions/oauthappssettings.php:135 +#, php-format +msgid "You have not registered any applications yet." +msgstr "Сè уште немате региÑтрирано ниеден програм," + +#: actions/oauthconnectionssettings.php:71 +msgid "Connected applications" +msgstr "Поврзани програми" + +#: actions/oauthconnectionssettings.php:87 +msgid "You have allowed the following applications to access you account." +msgstr "Им имате дозволено приÑтап до Вашата Ñметка на Ñледните програми." + +#: actions/oauthconnectionssettings.php:170 +msgid "You are not a user of that application." +msgstr "Ðе Ñте кориÑник на тој програм." + +#: actions/oauthconnectionssettings.php:180 +msgid "Unable to revoke access for app: " +msgstr "Ðе можам да му го одземам приÑтапот на програмот: " + +#: actions/oauthconnectionssettings.php:192 +#, php-format +msgid "You have not authorized any applications to use your account." +msgstr "Му немате дозволено приÑтап до Вашата Ñметка на ниеден програм." + +#: actions/oauthconnectionssettings.php:205 +msgid "Developers can edit the registration settings for their applications " +msgstr "" +"Развивачите можат да ги нагодат региÑтрациÑките поÑтавки за нивните програми " + #: actions/oembed.php:79 actions/shownotice.php:100 msgid "Notice has no profile" msgstr "Забелешката нема профил" @@ -2065,8 +2237,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:1038 +#: lib/api.php:1066 lib/api.php:1176 msgid "Not a supported data format." msgstr "Ова не е поддржан формат на податотека." @@ -2079,7 +2251,7 @@ msgid "Notice Search" msgstr "Пребарување на забелешки" #: actions/othersettings.php:60 -msgid "Other Settings" +msgid "Other settings" msgstr "Други нагодувања" #: actions/othersettings.php:71 @@ -2110,6 +2282,26 @@ msgstr "Прикажи или Ñокриј профилни изгледи." msgid "URL shortening service is too long (max 50 chars)." msgstr "УÑлугата за Ñкратување на URL-адреÑи е предолга (највеќе до 50 знаци)." +#: actions/otp.php:69 +msgid "No user ID specified." +msgstr "Ðема назначено кориÑнички ID." + +#: 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 #, php-format msgid "Outbox for %s" @@ -2118,7 +2310,7 @@ msgstr "Излезно Ñандаче за %s" #: actions/outbox.php:116 msgid "This is your outbox, which lists private messages you have sent." msgstr "" -"Ова е вашето излезно Ñандче, во кое Ñе наведени приватните пораки кои ги " +"Ова е Вашето излезно Ñандче, во кое Ñе наведени приватните пораки кои ги " "имате иÑпратено." #: actions/passwordsettings.php:58 @@ -2146,7 +2338,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 "Потврди" @@ -2308,7 +2500,7 @@ msgid "When to use SSL" msgstr "Кога Ñе кориÑти SSL" #: actions/pathsadminpanel.php:308 -msgid "SSL Server" +msgid "SSL server" msgstr "SSL-Ñервер" #: actions/pathsadminpanel.php:309 @@ -2339,20 +2531,20 @@ msgid "Not a valid people tag: %s" msgstr "Ðе е важечка ознака за луѓе: %s" #: actions/peopletag.php:144 -#, fuzzy, php-format +#, php-format msgid "Users self-tagged with %1$s - page %2$d" -msgstr "КориÑтници Ñамоозначени Ñо %s - ÑÑ‚Ñ€. %d" +msgstr "КориÑтници Ñамоозначени Ñо %1$s - ÑÑ‚Ñ€. %2$d" #: actions/postnotice.php:84 msgid "Invalid notice content" msgstr "Ðеважечка Ñодржина на забелешката" #: actions/postnotice.php:90 -#, fuzzy, php-format +#, php-format msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" -"Лиценцата на забелешката „%s“ не е компатибилна Ñо лиценцата на веб-" -"Ñтраницата „%s“." +"Лиценцата на забелешката „%1$s“ не е компатибилна Ñо лиценцата на веб-" +"Ñтраницата „%2$s“." #: actions/profilesettings.php:60 msgid "Profile settings" @@ -2373,42 +2565,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 -#: lib/groupeditform.php:161 +#: actions/profilesettings.php:115 actions/register.php:453 +#: lib/applicationeditform.php:230 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 "Каде Ñе наоѓате, на пр. „Град, ОблаÑÑ‚, Земја“." @@ -2722,7 +2914,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 "Жалиме, региÑтрацијата е Ñамо Ñо покана." @@ -2734,7 +2926,7 @@ msgstr "Жалиме, неважечки код за поканата." msgid "Registration successful" msgstr "РегиÑтрацијата е уÑпешна" -#: actions/register.php:114 actions/register.php:502 lib/action.php:457 +#: actions/register.php:114 actions/register.php:503 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "РегиÑтрирај Ñе" @@ -2747,19 +2939,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. " @@ -2767,42 +2955,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 "Creative Commons Ðаведи извор 3.0" -#: actions/register.php:496 +#: actions/register.php:497 msgid "" " except this private data: password, email address, IM address, and phone " "number." @@ -2810,8 +2998,8 @@ msgstr "" " оÑвен овие приватни податоци: лозинка, е-пошта, IM-адреÑа и телефонÑки " "број." -#: actions/register.php:537 -#, fuzzy, php-format +#: actions/register.php:538 +#, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " "want to...\n" @@ -2828,10 +3016,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%%%%) кои можеби ги знаете или " @@ -2844,7 +3032,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.)" @@ -2957,13 +3145,13 @@ msgid "Replies feed for %s (Atom)" msgstr "Канал Ñо одговори за %s (Atom)" #: actions/replies.php:198 -#, fuzzy, php-format +#, php-format msgid "" "This is the timeline showing replies to %1$s but %2$s hasn't received a " "notice to his attention yet." msgstr "" -"Ова е иÑторијата на која Ñе прикажани одговорите на %s, но %s Ñè уште нема " -"добиено порака од некој што Ñака да ја прочита." +"Ова е иÑторијата на која Ñе прикажани одговорите на %1$s, но %2$s Ñè уште " +"нема добиено порака од некој што Ñака да ја прочита." #: actions/replies.php:203 #, php-format @@ -2975,13 +3163,13 @@ msgstr "" "други луѓе или да [Ñе зачленувате во групи](%%action.groups%%)." #: actions/replies.php:205 -#, fuzzy, php-format +#, php-format msgid "" "You can try to [nudge %1$s](../%2$s) or [post something to his or her " "attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" -"Можете да го [подбуцнете кориÑникот %s](../%s) или да [објавите нешто што " -"Ñакате да го прочита](%%%%action.newnotice%%%%?status_textarea=%s)." +"Можете да го [подбуцнете кориÑникот 1$s](../%2$s) или да [објавите нешто што " +"Ñакате тој да го прочита](%%%%action.newnotice%%%%?status_textarea=%3$s)." #: actions/repliesrss.php:72 #, php-format @@ -2996,6 +3184,82 @@ msgstr "Ðе можете да Ñтавате кориÑници во пеÑоч msgid "User is already sandboxed." msgstr "КориÑникот е веќе во пеÑочен режим." +#: actions/showapplication.php:82 +msgid "You must be logged in to view an application." +msgstr "Мора да Ñте најавени за да можете да го видите програмот." + +#: actions/showapplication.php:158 +msgid "Application profile" +msgstr "Профил на програмот" + +#: actions/showapplication.php:160 lib/applicationeditform.php:182 +msgid "Icon" +msgstr "Икона" + +#: actions/showapplication.php:170 actions/version.php:195 +#: lib/applicationeditform.php:197 +msgid "Name" +msgstr "Име" + +#: actions/showapplication.php:179 lib/applicationeditform.php:224 +msgid "Organization" +msgstr "Организација" + +#: actions/showapplication.php:188 actions/version.php:198 +#: lib/applicationeditform.php:211 lib/groupeditform.php:172 +msgid "Description" +msgstr "ОпиÑ" + +#: actions/showapplication.php:193 actions/showgroup.php:429 +#: lib/profileaction.php:174 +msgid "Statistics" +msgstr "СтатиÑтики" + +#: actions/showapplication.php:204 +#, php-format +msgid "created by %1$s - %2$s access by default - %3$d users" +msgstr "Ñоздал: %1$s - оÑновен приÑтап: %2$s - %3$d кориÑници" + +#: actions/showapplication.php:214 +msgid "Application actions" +msgstr "ДејÑтва на програмот" + +#: actions/showapplication.php:233 +msgid "Reset key & secret" +msgstr "Клуч за промена и тајна" + +#: actions/showapplication.php:241 +msgid "Application info" +msgstr "Инфо за програмот" + +#: actions/showapplication.php:243 +msgid "Consumer key" +msgstr "Потрошувачки клуч" + +#: actions/showapplication.php:248 +msgid "Consumer secret" +msgstr "Потрошувачка тајна" + +#: actions/showapplication.php:253 +msgid "Request token URL" +msgstr "URL на жетонот на барањето" + +#: actions/showapplication.php:258 +msgid "Access token URL" +msgstr "URL на приÑтапниот жетон" + +#: actions/showapplication.php:263 +msgid "Authorize URL" +msgstr "Одобри URL" + +#: actions/showapplication.php:268 +msgid "" +"Note: We support HMAC-SHA1 signatures. We do not support the plaintext " +"signature method." +msgstr "" +"Ðапомена: Поддржуваме HMAC-SHA1 потпиÑи. Ðе поддржуваме потпишување Ñо проÑÑ‚ " +"текÑÑ‚." + #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "Ðе можев да ги вратам омилените забелешки." @@ -3101,7 +3365,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 "(Ðема)" @@ -3109,10 +3373,6 @@ msgstr "(Ðема)" msgid "All members" msgstr "Сите членови" -#: actions/showgroup.php:429 lib/profileaction.php:174 -msgid "Statistics" -msgstr "СтатиÑтики" - #: actions/showgroup.php:432 msgid "Created" msgstr "Создадено" @@ -3178,9 +3438,9 @@ msgid " tagged %s" msgstr " означено Ñо %s" #: actions/showstream.php:122 -#, fuzzy, php-format +#, php-format msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" -msgstr "Канал Ñо забелешки за %s означен Ñо %s (RSS 1.0)" +msgstr "Канал Ñо забелешки за %1$s означен Ñо %2$s (RSS 1.0)" #: actions/showstream.php:129 #, php-format @@ -3203,9 +3463,9 @@ msgid "FOAF for %s" msgstr "FOAF за %s" #: actions/showstream.php:191 -#, fuzzy, php-format +#, php-format msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet." -msgstr "Ова е иÑторијата за %s, но %s Ñè уште нема објавено ништо." +msgstr "Ова е иÑторијата за %1$s, но %2$s Ñè уште нема објавено ништо." #: actions/showstream.php:196 msgid "" @@ -3216,13 +3476,13 @@ msgstr "" "ниедна забелешка, но Ñега е добро време за да почнете :)" #: actions/showstream.php:198 -#, fuzzy, php-format +#, php-format msgid "" "You can try to nudge %1$s or [post something to his or her attention](%%%%" "action.newnotice%%%%?status_textarea=%2$s)." msgstr "" -"Можете да пробате да го подбуцнете кориÑникот %s или [да објавите нешто што " -"Ñакате да го прочита](%%%%action.newnotice%%%%?status_textarea=%s)." +"Можете да го подбуцнете кориÑникот %1$s или [да објавите нешто што Ñакате да " +"го прочита](%%%%action.newnotice%%%%?status_textarea=%2$s)." #: actions/showstream.php:234 #, php-format @@ -3271,12 +3531,12 @@ 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\"" +msgid "Unknown language \"%s\"." msgstr "Ðепознат јазик „%s“" #: actions/siteadminpanel.php:179 @@ -3464,7 +3724,7 @@ msgid "Save site settings" msgstr "Зачувај нагодувања на веб-Ñтраницата" #: actions/smssettings.php:58 -msgid "SMS Settings" +msgid "SMS settings" msgstr "Ðагодувања за СМС" #: actions/smssettings.php:69 @@ -3493,7 +3753,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 @@ -3515,11 +3775,11 @@ 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." @@ -3539,7 +3799,7 @@ msgstr "Ова е погрешен потврден број." #: actions/smssettings.php:405 msgid "That is not your phone number." -msgstr "Тоа не е вашиот телефонÑки број." +msgstr "Тоа не е Вашиот телефонÑки број." #: actions/smssettings.php:465 msgid "Mobile carrier" @@ -3584,9 +3844,9 @@ msgid "%s subscribers" msgstr "Претплатници на %s" #: actions/subscribers.php:52 -#, fuzzy, php-format +#, php-format msgid "%1$s subscribers, page %2$d" -msgstr "%s претплатници, ÑÑ‚Ñ€. %d" +msgstr "Претплатници на %1$s, ÑÑ‚Ñ€. %2$d" #: actions/subscribers.php:63 msgid "These are the people who listen to your notices." @@ -3625,9 +3885,9 @@ msgid "%s subscriptions" msgstr "Претплати на %s" #: actions/subscriptions.php:54 -#, fuzzy, php-format +#, php-format msgid "%1$s subscriptions, page %2$d" -msgstr "Претплати на %s, ÑÑ‚Ñ€. %d" +msgstr "Претплати на %1$s, ÑÑ‚Ñ€. %2$d" #: actions/subscriptions.php:65 msgid "These are the people whose notices you listen to." @@ -3749,21 +4009,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 -#, fuzzy, php-format +#, php-format 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:321 #: lib/personalgroupnav.php:115 @@ -3920,9 +4176,9 @@ msgstr "" "потполноÑÑ‚." #: actions/userauthorization.php:296 -#, fuzzy, php-format +#, php-format msgid "Listener URI ‘%s’ not found here." -msgstr "Следечкиот URI на „%s“ не е пронајден тука" +msgstr "URI-то на Ñледачот „%s“ не е пронајдено тука." #: actions/userauthorization.php:301 #, php-format @@ -3954,10 +4210,6 @@ msgstr "Ðе можам да ја прочитам URL на аватарот „ 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 "Изглед на профилот" @@ -3991,9 +4243,9 @@ msgstr "" "Ñе." #: actions/version.php:73 -#, fuzzy, php-format +#, php-format msgid "StatusNet %s" -msgstr "СтатиÑтики" +msgstr "StatusNet %s" #: actions/version.php:153 #, php-format @@ -4001,15 +4253,16 @@ 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 -#, fuzzy msgid "StatusNet" -msgstr "СтатуÑот е избришан." +msgstr "StatusNet" #: actions/version.php:161 msgid "Contributors" -msgstr "" +msgstr "УчеÑници" #: actions/version.php:168 msgid "" @@ -4018,6 +4271,10 @@ msgid "" "Software Foundation, either version 3 of the License, or (at your option) " "any later version. " msgstr "" +"StatusNet е Ñлободен ÑофтверÑки програм: можете да го редиÑтрибуирате и/или " +"менувате под уÑловите на Општата јавна лиценца ГÐУ Ðферо Ñпоред одредбите на " +"Фондацијата за Ñлободен Ñофтвер, верзија 3 на лиценцата, или (по Ваш избор) " +"било која подоцнежна верзија. " #: actions/version.php:174 msgid "" @@ -4026,6 +4283,10 @@ msgid "" "FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License " "for more details. " msgstr "" +"Овој програм е диÑтрибуиран Ñо надеж дека ќе биде од кориÑÑ‚, но БЕЗ БИЛО " +"КÐКВРГÐРÐÐЦИЈÐ; дури и без подразбирливата гаранција за ПÐЗÐРÐРПРОДÐЖÐОСТ " +"или ПОГОДÐОСТ ЗРОПРЕДЕЛЕÐРЦЕЛ. Погледајте ја Општата јавна лиценца ГÐУ " +"Ðферо за повеќе подробноÑти. " #: actions/version.php:180 #, php-format @@ -4033,31 +4294,22 @@ 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 -#, fuzzy -msgid "Name" -msgstr "Прекар" +msgstr "Приклучоци" #: actions/version.php:196 lib/action.php:741 -#, fuzzy msgid "Version" -msgstr "СеÑии" +msgstr "Верзија" #: actions/version.php:197 -#, fuzzy msgid "Author(s)" -msgstr "Ðвтор" +msgstr "Ðвтор(и)" -#: actions/version.php:198 lib/groupeditform.php:172 -msgid "Description" -msgstr "ОпиÑ" - -#: classes/File.php:137 +#: classes/File.php:144 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " @@ -4066,17 +4318,34 @@ 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/Group_member.php:41 +msgid "Group join failed." +msgstr "Зачленувањето во групата не уÑпеа." + +#: classes/Group_member.php:53 +msgid "Not part of group." +msgstr "Ðе е дел од групата." + +#: classes/Group_member.php:60 +msgid "Group leave failed." +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 "Забрането Ви е иÑпраќање на директни пораки." @@ -4089,27 +4358,27 @@ msgstr "Ðе можев да ја иÑпратам пораката." msgid "Could not update message with new URI." msgstr "Ðе можев да ја подновам пораката Ñо нов URI." -#: classes/Notice.php:172 +#: classes/Notice.php:171 #, php-format msgid "DB error inserting hashtag: %s" msgstr "Грешка во базата на податоци при вметнувањето на хеш-ознака: %s" -#: classes/Notice.php:226 +#: classes/Notice.php:225 msgid "Problem saving notice. Too long." msgstr "Проблем Ñо зачувувањето на белешката. Премногу долго." -#: classes/Notice.php:230 +#: classes/Notice.php:229 msgid "Problem saving notice. Unknown user." msgstr "Проблем Ñо зачувувањето на белешката. Ðепознат кориÑник." -#: classes/Notice.php:235 +#: classes/Notice.php:234 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Премногу забелњшки за прекратко време; здивнете малку и продолжете за " "неколку минути." -#: classes/Notice.php:241 +#: classes/Notice.php:240 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4117,25 +4386,25 @@ msgstr "" "Премногу дуплирани пораки во прекратко време; здивнете малку и продолжете за " "неколку минути." -#: classes/Notice.php:247 +#: classes/Notice.php:246 msgid "You are banned from posting notices on this site." msgstr "Забрането Ви е да објавувате забелешки на оваа веб-Ñтраница." -#: classes/Notice.php:309 classes/Notice.php:334 +#: classes/Notice.php:305 classes/Notice.php:330 msgid "Problem saving notice." msgstr "Проблем во зачувувањето на белешката." -#: classes/Notice.php:1034 +#: classes/Notice.php:1052 #, php-format msgid "DB error inserting reply: %s" msgstr "Одговор од внеÑот во базата: %s" -#: classes/Notice.php:1359 +#: classes/Notice.php:1423 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" -#: classes/User.php:368 +#: classes/User.php:382 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Добредојдовте на %1$s, @%2$s!" @@ -4176,6 +4445,11 @@ msgstr "Друго" msgid "Other options" msgstr "Други нагодувања" +#: lib/action.php:144 +#, php-format +msgid "%1$s - %2$s" +msgstr "%1$s - %2$s" + #: lib/action.php:159 msgid "Untitled page" msgstr "Страница без наÑлов" @@ -4192,10 +4466,6 @@ msgstr "Дома" msgid "Personal profile and friends timeline" msgstr "Личен профил и иÑторија на пријатели" -#: lib/action.php:435 -msgid "Account" -msgstr "Сметка" - #: lib/action.php:435 msgid "Change your email, avatar, password, profile" msgstr "Промена на е-пошта, аватар, лозинка, профил" @@ -4350,18 +4620,13 @@ msgstr "По" msgid "Before" msgstr "Пред" -#: lib/action.php:1167 -msgid "There was a problem with your session token." -msgstr "Се појави проблем Ñо Вашиот ÑеÑиÑки жетон." - #: lib/adminpanelaction.php:96 msgid "You cannot make changes to this site." msgstr "Ðе можете да ја менувате оваа веб-Ñтраница." #: lib/adminpanelaction.php:107 -#, fuzzy msgid "Changes to that panel are not allowed." -msgstr "РегиÑтрирањето не е дозволено." +msgstr "Менувањето на тој алатник не е дозволено." #: lib/adminpanelaction.php:206 msgid "showForm() not implemented." @@ -4387,6 +4652,68 @@ msgstr "Конфигурација на изгледот" msgid "Paths configuration" msgstr "Конфигурација на патеки" +#: lib/applicationeditform.php:186 +msgid "Icon for this application" +msgstr "Икона за овој програм" + +#: lib/applicationeditform.php:206 +#, php-format +msgid "Describe your application in %d characters" +msgstr "Опишете го програмот Ñо %d знаци" + +#: lib/applicationeditform.php:209 +msgid "Describe your application" +msgstr "Опишете го Вашиот програм" + +#: lib/applicationeditform.php:218 +msgid "Source URL" +msgstr "Изворна URL-адреÑа" + +#: lib/applicationeditform.php:220 +msgid "URL of the homepage of this application" +msgstr "URL на Ñтраницата на програмот" + +#: lib/applicationeditform.php:226 +msgid "Organization responsible for this application" +msgstr "Организацијата одговорна за овој програм" + +#: lib/applicationeditform.php:232 +msgid "URL for the homepage of the organization" +msgstr "URL на Ñтраницата на организацијата" + +#: lib/applicationeditform.php:238 +msgid "URL to redirect to after authentication" +msgstr "URL за пренаÑочување по заверката" + +#: lib/applicationeditform.php:260 +msgid "Browser" +msgstr "ПрелиÑтувач" + +#: lib/applicationeditform.php:276 +msgid "Desktop" +msgstr "Работна површина" + +#: lib/applicationeditform.php:277 +msgid "Type of application, browser or desktop" +msgstr "Тип на програм, прелиÑтувач или работна површина" + +#: lib/applicationeditform.php:299 +msgid "Read-only" +msgstr "Само читање" + +#: lib/applicationeditform.php:317 +msgid "Read-write" +msgstr "Читање-пишување" + +#: lib/applicationeditform.php:318 +msgid "Default access for this application: read-only, or read-write" +msgstr "" +"ОÑновно-зададен приÑтап за овој програм: Ñамо читање, или читање-пишување" + +#: lib/applicationlist.php:154 +msgid "Revoke" +msgstr "Одземи" + #: lib/attachmentlist.php:87 msgid "Attachments" msgstr "Прилози" @@ -4407,11 +4734,11 @@ msgstr "Забелешки кадешто Ñе јавува овој прило msgid "Tags for this attachment" msgstr "Ознаки за овој прилог" -#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 +#: lib/authenticationplugin.php:214 lib/authenticationplugin.php:219 msgid "Password changing failed" msgstr "Менувањето на лозинката не уÑпеа" -#: lib/authenticationplugin.php:197 +#: lib/authenticationplugin.php:229 msgid "Password changing is not allowed" msgstr "Менувањето на лозинка не е дозволено" @@ -4432,8 +4759,8 @@ msgid "Sorry, this command is not yet implemented." msgstr "Жалиме, оваа наредба Ñè уште не е имплементирана." #: lib/command.php:88 -#, fuzzy, php-format -msgid "Could not find a user with nickname %s." +#, php-format +msgid "Could not find a user with nickname %s" msgstr "Ðе можев да пронајдам кориÑник Ñо прекар %s" #: lib/command.php:92 @@ -4441,8 +4768,8 @@ msgid "It does not make a lot of sense to nudge yourself!" msgstr "Ðема баш логика да Ñе подбуцнувате Ñами ÑебеÑи." #: lib/command.php:99 -#, fuzzy, php-format -msgid "Nudge sent to %s." +#, php-format +msgid "Nudge sent to %s" msgstr "ИÑпратено подбуцнување на %s" #: lib/command.php:126 @@ -4456,172 +4783,189 @@ msgstr "" "Претплатници: %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." +#: lib/command.php:152 lib/command.php:390 lib/command.php:451 +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." +#: lib/command.php:168 lib/command.php:406 lib/command.php:467 +#: lib/command.php:523 +msgid "User has no last notice" msgstr "КориÑникот нема поÑледна забелешка" #: lib/command.php:190 msgid "Notice marked as fave." msgstr "Забелешката е обележана како омилена." -#: lib/command.php:284 -#, fuzzy, php-format -msgid "Could not remove user %1$s to group %2$s." +#: lib/command.php:217 +msgid "You are already a member of that group" +msgstr "Веќе членувате во таа група" + +#: lib/command.php:231 +#, php-format +msgid "Could not join user %s to group %s" +msgstr "Ðе можев да го зачленам кориÑникот %s во групата %s" + +#: lib/command.php:236 +#, php-format +msgid "%s joined group %s" +msgstr "%s Ñе зачлени во групата %s" + +#: lib/command.php:275 +#, php-format +msgid "Could not remove user %s to group %s" msgstr "Ðе можев да го отÑтранам кориÑникот %s од групата %s" -#: lib/command.php:318 +#: lib/command.php:280 +#, php-format +msgid "%s left group %s" +msgstr "%s ја напушти групата %s" + +#: lib/command.php:309 #, php-format msgid "Fullname: %s" msgstr "Име и презиме: %s" -#: lib/command.php:321 +#: lib/command.php:312 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "Локација: %s" -#: lib/command.php:324 +#: lib/command.php:315 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "Домашна Ñтраница: %s" -#: lib/command.php:327 +#: lib/command.php:318 #, php-format msgid "About: %s" msgstr "За: %s" -#: lib/command.php:358 -#, fuzzy, php-format -msgid "Message too long - maximum is %1$d characters, you sent %2$d." +#: lib/command.php:349 +#, 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." +#: lib/command.php:367 +#, php-format +msgid "Direct message to %s sent" msgstr "Директната порака до %s е иÑпратена" -#: lib/command.php:378 +#: lib/command.php:369 msgid "Error sending direct message." msgstr "Грашка при иÑпаќањето на директната порака." -#: lib/command.php:435 -#, fuzzy, php-format -msgid "Notice from %s repeated." +#: lib/command.php:413 +msgid "Cannot repeat your own notice" +msgstr "Ðе можете да повторувате ÑопÑтвени забалешки" + +#: lib/command.php:418 +msgid "Already repeated that notice" +msgstr "Оваа забелешка е веќе повторена" + +#: lib/command.php:426 +#, php-format +msgid "Notice from %s repeated" msgstr "Забелешката од %s е повторена" -#: lib/command.php:437 +#: lib/command.php:428 msgid "Error repeating notice." msgstr "Грешка при повторувањето на белешката." -#: lib/command.php:491 -#, fuzzy, php-format -msgid "Notice too long - maximum is %1$d characters, you sent %2$d." +#: lib/command.php:482 +#, php-format +msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" "Забелешката е предолга - треба да нема повеќе од %d знаци, а Вие иÑпративте %" "d" -#: lib/command.php:500 -#, fuzzy, php-format -msgid "Reply to %s sent." +#: lib/command.php:491 +#, php-format +msgid "Reply to %s sent" msgstr "Одговорот на %s е иÑпратен" -#: lib/command.php:502 +#: lib/command.php:493 msgid "Error saving notice." msgstr "Грешка при зачувувањето на белешката." -#: lib/command.php:556 -#, fuzzy -msgid "Specify the name of the user to subscribe to." +#: lib/command.php:547 +msgid "Specify the name of the user to subscribe to" msgstr "Ðазначете го името на кориÑникот на којшто Ñакате да Ñе претплатите" -#: lib/command.php:563 +#: lib/command.php:554 #, php-format msgid "Subscribed to %s" msgstr "Претплатено на %s" -#: lib/command.php:584 -#, fuzzy -msgid "Specify the name of the user to unsubscribe from." +#: lib/command.php:575 +msgid "Specify the name of the user to unsubscribe from" msgstr "Ðазначете го името на кориÑникот од кого откажувате претплата." -#: lib/command.php:591 +#: lib/command.php:582 #, php-format msgid "Unsubscribed from %s" msgstr "Претплатата на %s е откажана" -#: lib/command.php:609 lib/command.php:632 +#: lib/command.php:600 lib/command.php:623 msgid "Command not yet implemented." msgstr "Ðаредбата Ñè уште не е имплементирана." -#: lib/command.php:612 +#: lib/command.php:603 msgid "Notification off." msgstr "ИзвеÑтувањето е иÑклучено." -#: lib/command.php:614 +#: lib/command.php:605 msgid "Can't turn off notification." msgstr "Ðе можам да иÑклучам извеÑтување." -#: lib/command.php:635 +#: lib/command.php:626 msgid "Notification on." msgstr "ИзвеÑтувањето е вклучено." -#: lib/command.php:637 +#: lib/command.php:628 msgid "Can't turn on notification." msgstr "Ðе можам да вклучам извеÑтување." -#: lib/command.php:650 -#, fuzzy -msgid "Login command is disabled." +#: lib/command.php:641 +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 -#, fuzzy, php-format -msgid "This link is useable only once, and is good for only 2 minutes: %s." +#: lib/command.php:652 +#, 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:668 msgid "You are not subscribed to anyone." msgstr "Ðе Ñте претплатени никому." -#: lib/command.php:687 +#: lib/command.php:670 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:690 msgid "No one is subscribed to you." msgstr "Ðикој не е претплатен на ВаÑ." -#: lib/command.php:709 +#: lib/command.php:692 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:712 msgid "You are not a member of any groups." msgstr "Ðе членувате во ниедна група." -#: lib/command.php:731 +#: lib/command.php:714 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:728 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4699,19 +5043,19 @@ msgstr "" "tracks - Ñè уште не е имплементирано.\n" "tracking - Ñè уште не е имплементирано.\n" -#: lib/common.php:199 +#: lib/common.php:131 msgid "No configuration file found. " msgstr "Ðема пронајдено конфигурациÑка податотека. " -#: lib/common.php:200 +#: lib/common.php:132 msgid "I looked for configuration files in the following places: " msgstr "Побарав конфигурациони податотеки на Ñледниве меÑта: " -#: lib/common.php:201 +#: lib/common.php:134 msgid "You may wish to run the installer to fix this." msgstr "Препорачуваме да го пуштите инÑталатерот за да го поправите ова." -#: lib/common.php:202 +#: lib/common.php:135 msgid "Go to the installer." msgstr "Оди на инÑталаторот." @@ -4727,6 +5071,14 @@ msgstr "Подновувања преку инÑтант-пораки (IM)" msgid "Updates by SMS" msgstr "Подновувања по СМС" +#: lib/connectsettingsaction.php:120 +msgid "Connections" +msgstr "Сврзувања" + +#: lib/connectsettingsaction.php:121 +msgid "Authorized connected applications" +msgstr "ОвлаÑтени поврзани програми" + #: lib/dberroraction.php:60 msgid "Database error" msgstr "Грешка во базата на податоци" @@ -4913,11 +5265,16 @@ msgstr "МБ" msgid "kB" msgstr "кб" -#: lib/jabber.php:191 +#: lib/jabber.php:202 #, php-format msgid "[%s]" msgstr "[%s]" +#: lib/jabber.php:385 +#, php-format +msgid "Unknown inbox source %d." +msgstr "Ðепознат извор на приемна пошта %d." + #: lib/joinform.php:114 msgid "Join" msgstr "Придружи Ñе" @@ -4999,24 +5356,10 @@ msgstr "" "Изменете Ñи ја е-поштенÑката адреÑа или ги нагодувањата за извеÑтувања на %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 @@ -5231,9 +5574,9 @@ msgid "Sorry, no incoming email allowed." msgstr "Жалиме, приемната пошта не е дозволена." #: lib/mailhandler.php:228 -#, fuzzy, php-format +#, php-format msgid "Unsupported message type: %s" -msgstr "Ðеподдржан фомрат на Ñлики." +msgstr "Ðеподдржан формат на порака: %s" #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." @@ -5272,16 +5615,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 @@ -5290,7 +5633,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 "%s не е поддржан тип на податотека на овој Ñервер." #: lib/messageform.php:120 @@ -5323,18 +5666,20 @@ msgid "Attach a file" msgstr "Прикажи податотека" #: lib/noticeform.php:212 -#, fuzzy -msgid "Share my location." -msgstr "Споделете ја Вашата локација" - -#: lib/noticeform.php:214 -#, fuzzy -msgid "Do not share my location." -msgstr "Споделете ја Вашата локација" +msgid "Share my location" +msgstr "Споделете ја мојата локација." #: lib/noticeform.php:215 -msgid "Hide this info" +msgid "Do not share my location" +msgstr "Ðе ја прикажувај мојата локација" + +#: lib/noticeform.php:216 +msgid "" +"Sorry, retrieving your geo location is taking longer than expected, please " +"try again later" msgstr "" +"Жалиме, но добивањето на Вашата меÑтоположба трае подолго од очекуваното. " +"Обидете Ñе подоцна." #: lib/noticelist.php:428 #, php-format @@ -5451,9 +5796,8 @@ msgid "Tags in %s's notices" msgstr "Ознаки во забелешките на %s" #: lib/plugin.php:114 -#, fuzzy msgid "Unknown" -msgstr "Ðепознато дејÑтво" +msgstr "Ðепознато" #: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82 msgid "Subscriptions" @@ -5594,24 +5938,24 @@ msgstr "Веќе претплатено!" msgid "User has blocked you." msgstr "КориÑникот Ве има блокирано." -#: lib/subs.php:60 +#: lib/subs.php:63 msgid "Could not subscribe." msgstr "Претплатата е неуÑпешна." -#: lib/subs.php:79 +#: lib/subs.php:82 msgid "Could not subscribe other to you." msgstr "Ðе можев да прептлатам друг кориÑник на ВаÑ." -#: lib/subs.php:128 +#: lib/subs.php:137 #, fuzzy msgid "Not subscribed!" msgstr "Ðе Ñте претплатени!" -#: lib/subs.php:133 +#: lib/subs.php:142 msgid "Couldn't delete self-subscription." msgstr "Ðе можам да ја избришам Ñамопретплатата." -#: lib/subs.php:146 +#: lib/subs.php:158 msgid "Couldn't delete subscription." msgstr "Претплата не може да Ñе избрише." @@ -5625,10 +5969,6 @@ msgstr "Облак од Ñамоозначени ознаки за луѓе" msgid "People Tagcloud as tagged" msgstr "Облак од ознаки за луѓе" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(нема)" - #: lib/tagcloudsection.php:56 msgid "None" msgstr "Без ознаки" @@ -5689,47 +6029,47 @@ msgstr "Порака" msgid "Moderate" msgstr "Модерирај" -#: lib/util.php:837 +#: lib/util.php:875 msgid "a few seconds ago" msgstr "пред неколку Ñекунди" -#: lib/util.php:839 +#: lib/util.php:877 msgid "about a minute ago" msgstr "пред една минута" -#: lib/util.php:841 +#: lib/util.php:879 #, php-format msgid "about %d minutes ago" msgstr "пред %d минути" -#: lib/util.php:843 +#: lib/util.php:881 msgid "about an hour ago" msgstr "пред еден чаÑ" -#: lib/util.php:845 +#: lib/util.php:883 #, php-format msgid "about %d hours ago" msgstr "пред %d чаÑа" -#: lib/util.php:847 +#: lib/util.php:885 msgid "about a day ago" msgstr "пред еден ден" -#: lib/util.php:849 +#: lib/util.php:887 #, php-format msgid "about %d days ago" msgstr "пред %d денови" -#: lib/util.php:851 +#: lib/util.php:889 msgid "about a month ago" msgstr "пред еден меÑец" -#: lib/util.php:853 +#: lib/util.php:891 #, php-format msgid "about %d months ago" msgstr "пред %d меÑеца" -#: lib/util.php:855 +#: lib/util.php:893 msgid "about a year ago" msgstr "пред една година" @@ -5745,6 +6085,6 @@ msgstr "%s не е важечка боја! КориÑтете 3 или 6 ÑˆÐµÑ #: scripts/xmppdaemon.php:301 #, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" -"Пораката е предолга - дозволени Ñе највеќе %d знаци, а вие иÑпративте %d" +"Пораката е предолга - дозволени Ñе највеќе %1$d знаци, а вие иÑпративте %2$d." diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po index 69f6d79da3..a0e92f8fdb 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-10 00:46+0000\n" -"PO-Revision-Date: 2010-01-10 00:48:33+0000\n" +"POT-Creation-Date: 2010-01-15 19:15+0000\n" +"PO-Revision-Date: 2010-01-15 19:17: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 (r60878); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r61101); 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" @@ -33,25 +33,30 @@ msgstr "Ingen slik side" #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 +#: actions/apistatusesupdate.php:149 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 #: 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 #: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 -#: lib/command.php:163 lib/command.php:311 lib/command.php:364 -#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/command.php:163 lib/command.php:302 lib/command.php:355 +#: lib/command.php:401 lib/command.php:462 lib/command.php:518 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/subs.php:34 lib/subs.php:125 msgid "No such user." msgstr "Ingen slik bruker" +#: actions/all.php:84 +#, fuzzy, php-format +msgid "%1$s and friends, page %2$d" +msgstr "%s og venner" + #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 +#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -110,7 +115,7 @@ msgstr "" msgid "You and friends" msgstr "Du og venner" -#: actions/allrss.php:119 actions/apitimelinefriends.php:122 +#: actions/allrss.php:119 actions/apitimelinefriends.php:121 #: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" @@ -121,6 +126,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:155 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!" @@ -135,7 +157,7 @@ msgstr "API-metode ikke funnet!" #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:114 +#: actions/apistatusesupdate.php:119 msgid "This method requires a POST." msgstr "Denne metoden krever en POST." @@ -166,8 +188,9 @@ msgstr "Klarte ikke Ã¥ lagre profil." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257 -#: actions/designadminpanel.php:122 actions/newnotice.php:94 +#: actions/apistatusesupdate.php:132 actions/avatarsettings.php:257 +#: actions/designadminpanel.php:122 actions/editapplication.php:118 +#: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format msgid "" @@ -181,6 +204,9 @@ msgstr "" #: actions/apiaccountupdateprofilebackgroundimage.php:146 #: actions/apiaccountupdateprofilecolors.php:164 #: actions/apiaccountupdateprofilecolors.php:174 +#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 +#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 +#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 msgid "Unable to save your design settings." msgstr "Kunne ikke lagre dine innstillinger for utseende." @@ -222,26 +248,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!" @@ -265,7 +271,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 @@ -273,7 +280,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 @@ -294,7 +302,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 @@ -329,7 +338,8 @@ msgstr "Det nicket er allerede i bruk. Prøv et annet." msgid "Not a valid nickname." msgstr "Ugyldig nick." -#: actions/apigroupcreate.php:196 actions/editgroup.php:195 +#: actions/apigroupcreate.php:196 actions/editapplication.php:212 +#: actions/editgroup.php:195 actions/newapplication.php:200 #: actions/newgroup.php:139 actions/profilesettings.php:222 #: actions/register.php:217 msgid "Homepage is not a valid URL." @@ -341,7 +351,8 @@ msgstr "Hjemmesiden er ikke en gyldig URL." msgid "Full name is too long (max 255 chars)." msgstr "Beklager, navnet er for langt (max 250 tegn)." -#: actions/apigroupcreate.php:213 +#: actions/apigroupcreate.php:213 actions/editapplication.php:187 +#: actions/newapplication.php:169 #, php-format msgid "Description is too long (max %d chars)." msgstr "Beskrivelsen er for lang (maks %d tegn)." @@ -382,7 +393,7 @@ msgstr "" msgid "Group not found!" msgstr "API-metode ikke funnet!" -#: actions/apigroupjoin.php:110 lib/command.php:217 +#: 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." @@ -390,7 +401,7 @@ msgstr "Du er allerede medlem av den gruppen." msgid "You have been blocked from that group by the admin." msgstr "" -#: actions/apigroupjoin.php:138 lib/command.php:234 +#: actions/apigroupjoin.php:138 actions/joingroup.php:124 #, fuzzy, php-format msgid "Could not join user %1$s to group %2$s." msgstr "Klarte ikke Ã¥ oppdatere bruker." @@ -400,7 +411,7 @@ 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/leavegroup.php:127 +#: actions/apigroupleave.php:124 actions/leavegroup.php:119 #, fuzzy, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "Klarte ikke Ã¥ oppdatere bruker." @@ -420,6 +431,99 @@ msgstr "" msgid "groups on %s" msgstr "" +#: actions/apioauthauthorize.php:108 actions/apioauthauthorize.php:114 +msgid "Bad request." +msgstr "" + +#: actions/apioauthauthorize.php:134 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:115 actions/makeadmin.php:66 +#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 +#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:139 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 +#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/subscribe.php:46 actions/tagother.php:166 +#: 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 "" + +#: actions/apioauthauthorize.php:146 +#, fuzzy +msgid "Invalid nickname / password!" +msgstr "Ugyldig brukernavn eller passord" + +#: actions/apioauthauthorize.php:170 +msgid "DB error deleting OAuth app user." +msgstr "" + +#: actions/apioauthauthorize.php:196 +msgid "DB error inserting OAuth app user." +msgstr "" + +#: actions/apioauthauthorize.php:231 +#, php-format +msgid "" +"The request token %s has been authorized. Please exchange it for an access " +"token." +msgstr "" + +#: actions/apioauthauthorize.php:241 +#, php-format +msgid "The request token %s has been denied." +msgstr "" + +#: actions/apioauthauthorize.php:246 actions/avatarsettings.php:281 +#: actions/designadminpanel.php:103 actions/editapplication.php:139 +#: actions/emailsettings.php:256 actions/grouplogo.php:319 +#: actions/imsettings.php:220 actions/newapplication.php:121 +#: actions/oauthconnectionssettings.php:151 actions/recoverpassword.php:44 +#: actions/smssettings.php:248 lib/designsettings.php:304 +msgid "Unexpected form submission." +msgstr "" + +#: actions/apioauthauthorize.php:273 +msgid "An application would like to connect to your account" +msgstr "" + +#: actions/apioauthauthorize.php:290 +msgid "Allow or deny access" +msgstr "" + +#: actions/apioauthauthorize.php:320 lib/action.php:435 +#, fuzzy +msgid "Account" +msgstr "Om" + +#: actions/apioauthauthorize.php:323 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/apioauthauthorize.php:326 actions/login.php:233 +#: actions/register.php:429 lib/accountsettingsaction.php:116 +msgid "Password" +msgstr "Passord" + +#: actions/apioauthauthorize.php:338 +msgid "Deny" +msgstr "" + +#: actions/apioauthauthorize.php:344 +msgid "Allow" +msgstr "" + +#: actions/apioauthauthorize.php:361 +msgid "Allow or deny access to your account information." +msgstr "" + #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." msgstr "" @@ -433,12 +537,12 @@ msgstr "" msgid "No such notice." msgstr "" -#: actions/apistatusesretweet.php:83 lib/command.php:422 +#: actions/apistatusesretweet.php:83 #, fuzzy msgid "Cannot repeat your own notice." msgstr "Kan ikke slette notisen." -#: actions/apistatusesretweet.php:91 lib/command.php:427 +#: actions/apistatusesretweet.php:91 #, fuzzy msgid "Already repeated that notice." msgstr "Kan ikke slette notisen." @@ -451,17 +555,17 @@ msgstr "" msgid "No status with that ID found." msgstr "" -#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:162 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" -#: actions/apistatusesupdate.php:198 +#: actions/apistatusesupdate.php:203 msgid "Not found" msgstr "" -#: actions/apistatusesupdate.php:221 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:226 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -546,8 +650,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 "" @@ -570,8 +677,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 "" @@ -605,29 +712,6 @@ 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/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 -#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 -#: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 -#: actions/subscribe.php:46 actions/tagother.php:166 -#: 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 "" - -#: actions/avatarsettings.php:281 actions/designadminpanel.php:103 -#: actions/emailsettings.php:256 actions/grouplogo.php:319 -#: actions/imsettings.php:220 actions/recoverpassword.php:44 -#: actions/smssettings.php:248 lib/designsettings.php:304 -msgid "Unexpected form submission." -msgstr "" - #: actions/avatarsettings.php:328 msgid "Pick a square area of the image to be your avatar" msgstr "" @@ -689,20 +773,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:260 #, fuzzy -msgid "No such group" +msgid "No such group." msgstr "Klarte ikke Ã¥ lagre profil." #: actions/blockedfromgroup.php:90 @@ -770,7 +849,8 @@ msgid "Couldn't delete email confirmation." msgstr "" #: actions/confirmaddress.php:144 -msgid "Confirm Address" +#, fuzzy +msgid "Confirm address" msgstr "Bekreft adresse" #: actions/confirmaddress.php:159 @@ -825,10 +905,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." @@ -968,7 +1044,8 @@ msgstr "" #: actions/pathsadminpanel.php:324 actions/profilesettings.php:174 #: actions/siteadminpanel.php:388 actions/smssettings.php:181 #: actions/subscriptions.php:203 actions/tagother.php:154 -#: actions/useradminpanel.php:313 lib/designsettings.php:256 +#: actions/useradminpanel.php:313 lib/applicationeditform.php:335 +#: lib/applicationeditform.php:336 lib/designsettings.php:256 #: lib/groupeditform.php:202 msgid "Save" msgstr "Lagre" @@ -989,6 +1066,84 @@ msgstr "" msgid "No such document." msgstr "" +#: actions/editapplication.php:54 lib/applicationeditform.php:136 +msgid "Edit application" +msgstr "" + +#: actions/editapplication.php:66 +#, fuzzy +msgid "You must be logged in to edit an application." +msgstr "Gjør brukeren til en administrator for gruppen" + +#: actions/editapplication.php:77 actions/showapplication.php:94 +#, fuzzy +msgid "You are not the owner of this application." +msgstr "Du er allerede logget inn!" + +#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:163 +#: actions/showapplication.php:87 +#, fuzzy +msgid "No such application." +msgstr "Ingen slik side" + +#: actions/editapplication.php:127 actions/newapplication.php:110 +#: actions/showapplication.php:118 lib/action.php:1167 +msgid "There was a problem with your session token." +msgstr "" + +#: actions/editapplication.php:161 +msgid "Use this form to edit your application." +msgstr "" + +#: actions/editapplication.php:177 actions/newapplication.php:159 +msgid "Name is required." +msgstr "" + +#: actions/editapplication.php:180 actions/newapplication.php:162 +#, fuzzy +msgid "Name is too long (max 255 chars)." +msgstr "Beklager, navnet er for langt (max 250 tegn)." + +#: actions/editapplication.php:183 actions/newapplication.php:165 +#, fuzzy +msgid "Description is required." +msgstr "Alle abonnementer" + +#: actions/editapplication.php:191 +msgid "Source URL is too long." +msgstr "" + +#: actions/editapplication.php:197 actions/newapplication.php:182 +#, fuzzy +msgid "Source URL is not valid." +msgstr "Hjemmesiden er ikke en gyldig URL." + +#: actions/editapplication.php:200 actions/newapplication.php:185 +msgid "Organization is required." +msgstr "" + +#: actions/editapplication.php:203 actions/newapplication.php:188 +#, fuzzy +msgid "Organization is too long (max 255 chars)." +msgstr "Beskrivelsen er for lang (maks %d tegn)." + +#: actions/editapplication.php:206 actions/newapplication.php:191 +msgid "Organization homepage is required." +msgstr "" + +#: actions/editapplication.php:215 actions/newapplication.php:203 +msgid "Callback is too long." +msgstr "" + +#: actions/editapplication.php:222 actions/newapplication.php:212 +msgid "Callback URL is not valid." +msgstr "" + +#: actions/editapplication.php:255 +#, fuzzy +msgid "Could not update application." +msgstr "Klarte ikke Ã¥ oppdatere bruker." + #: actions/editgroup.php:56 #, php-format msgid "Edit %s group" @@ -1000,8 +1155,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." @@ -1027,7 +1183,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 @@ -1059,12 +1216,14 @@ msgstr "" "melding med videre veiledning." #: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 +#: actions/smssettings.php:126 lib/applicationeditform.php:333 +#: lib/applicationeditform.php:334 msgid "Cancel" msgstr "Avbryt" #: actions/emailsettings.php:121 -msgid "Email Address" +#, fuzzy +msgid "Email address" msgstr "E-postadresse" #: actions/emailsettings.php:123 @@ -1138,9 +1297,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." @@ -1319,14 +1479,6 @@ 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:79 #, fuzzy msgid "No such file." @@ -1345,7 +1497,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 "" @@ -1391,9 +1543,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." @@ -1415,12 +1568,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 "" @@ -1435,6 +1582,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 "" @@ -1556,7 +1708,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 @@ -1584,7 +1737,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 @@ -1678,7 +1832,7 @@ msgstr "" msgid "You are already subscribed to these users:" msgstr "" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:315 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 #, php-format msgid "%1$s (%2$s)" msgstr "" @@ -1719,7 +1873,7 @@ msgstr "" msgid "Optionally add a personal message to the invitation." msgstr "" -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236 msgid "Send" msgstr "Send" @@ -1784,17 +1938,7 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "" -#: actions/joingroup.php:90 -#, fuzzy -msgid "You are already a member of that group" -msgstr "Du er allerede logget inn!" - -#: actions/joingroup.php:128 -#, fuzzy, php-format -msgid "Could not join user %1$s to group %2$s" -msgstr "Klarte ikke Ã¥ oppdatere bruker." - -#: actions/joingroup.php:135 lib/command.php:239 +#: actions/joingroup.php:131 #, php-format msgid "%1$s joined group %2$s" msgstr "" @@ -1803,76 +1947,57 @@ msgstr "" msgid "You must be logged in to leave a group." msgstr "" -#: actions/leavegroup.php:90 lib/command.php:268 +#: actions/leavegroup.php:90 lib/command.php:265 msgid "You are not a member of that group." msgstr "" -#: actions/leavegroup.php:119 lib/command.php:278 -msgid "Could not find membership record." -msgstr "" - -#: actions/leavegroup.php:134 lib/command.php:289 +#: actions/leavegroup.php:127 #, fuzzy, php-format msgid "%1$s left group %2$s" msgstr "%1$s sin status pÃ¥ %2$s" -#: actions/login.php:83 actions/register.php:137 +#: 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:460 +#: 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 -#: lib/groupeditform.php:152 lib/userprofile.php:131 -msgid "Nickname" -msgstr "Nick" - -#: actions/login.php:253 actions/register.php:428 -#: 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]" @@ -1889,19 +2014,40 @@ 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 %1$s in group %2$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 #, fuzzy, php-format -msgid "Can't make %1$s an admin for group %2$s" +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" msgstr "" +#: actions/newapplication.php:52 +msgid "New application" +msgstr "" + +#: actions/newapplication.php:64 +msgid "You must be logged in to register an application." +msgstr "" + +#: actions/newapplication.php:143 +msgid "Use this form to register a new application." +msgstr "" + +#: actions/newapplication.php:173 +msgid "Source URL is required." +msgstr "" + +#: actions/newapplication.php:255 actions/newapplication.php:264 +#, fuzzy +msgid "Could not create application." +msgstr "Klarte ikke Ã¥ lagre avatar-informasjonen" + #: actions/newgroup.php:53 msgid "New group" msgstr "" @@ -1914,12 +2060,12 @@ msgstr "" msgid "New message" msgstr "" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 msgid "You can't send a message to this user." msgstr "" -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:484 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 +#: lib/command.php:475 msgid "No content!" msgstr "" @@ -1927,7 +2073,7 @@ msgstr "" msgid "No recipient specified." msgstr "" -#: actions/newmessage.php:164 lib/command.php:370 +#: actions/newmessage.php:164 lib/command.php:361 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -1937,9 +2083,9 @@ msgid "Message sent" msgstr "" #: actions/newmessage.php:185 -#, php-format -msgid "Direct message to %s sent" -msgstr "" +#, fuzzy, php-format +msgid "Direct message to %s sent." +msgstr "Direktemeldinger til %s" #: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 msgid "Ajax Error" @@ -2006,6 +2152,49 @@ msgstr "" msgid "Nudge sent!" msgstr "" +#: actions/oauthappssettings.php:59 +msgid "You must be logged in to list your applications." +msgstr "" + +#: actions/oauthappssettings.php:74 +msgid "OAuth applications" +msgstr "" + +#: actions/oauthappssettings.php:85 +msgid "Applications you have registered" +msgstr "" + +#: actions/oauthappssettings.php:135 +#, php-format +msgid "You have not registered any applications yet." +msgstr "" + +#: actions/oauthconnectionssettings.php:71 +msgid "Connected applications" +msgstr "" + +#: actions/oauthconnectionssettings.php:87 +msgid "You have allowed the following applications to access you account." +msgstr "" + +#: actions/oauthconnectionssettings.php:170 +#, fuzzy +msgid "You are not a user of that application." +msgstr "Du er allerede logget inn!" + +#: actions/oauthconnectionssettings.php:180 +msgid "Unable to revoke access for app: " +msgstr "" + +#: actions/oauthconnectionssettings.php:192 +#, php-format +msgid "You have not authorized any applications to use your account." +msgstr "" + +#: actions/oauthconnectionssettings.php:205 +msgid "Developers can edit the registration settings for their applications " +msgstr "" + #: actions/oembed.php:79 actions/shownotice.php:100 msgid "Notice has no profile" msgstr "" @@ -2023,8 +2212,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:1038 +#: lib/api.php:1066 lib/api.php:1176 msgid "Not a supported data format." msgstr "" @@ -2038,7 +2227,7 @@ msgstr "" #: actions/othersettings.php:60 #, fuzzy -msgid "Other Settings" +msgid "Other settings" msgstr "Innstillinger for IM" #: actions/othersettings.php:71 @@ -2070,6 +2259,29 @@ msgstr "" msgid "URL shortening service is too long (max 50 chars)." msgstr "Bioen er for lang (max 140 tegn)" +#: 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 #, php-format msgid "Outbox for %s" @@ -2106,7 +2318,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" @@ -2273,8 +2485,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" @@ -2331,43 +2544,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 -#: lib/groupeditform.php:161 +#: actions/profilesettings.php:115 actions/register.php:453 +#: lib/applicationeditform.php:230 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 "" @@ -2664,7 +2877,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 "" @@ -2676,7 +2889,7 @@ msgstr "" msgid "Registration successful" msgstr "" -#: actions/register.php:114 actions/register.php:502 lib/action.php:457 +#: actions/register.php:114 actions/register.php:503 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "" @@ -2689,59 +2902,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 " @@ -2750,7 +2959,7 @@ msgstr "" "utenom disse private dataene: passord, epost, adresse, lynmeldingsadresse og " "telefonnummer." -#: actions/register.php:537 +#: actions/register.php:538 #, fuzzy, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -2783,7 +2992,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.)" @@ -2932,6 +3141,83 @@ msgstr "Du er allerede logget inn!" msgid "User is already sandboxed." msgstr "Du er allerede logget inn!" +#: actions/showapplication.php:82 +msgid "You must be logged in to view an application." +msgstr "" + +#: actions/showapplication.php:158 +msgid "Application profile" +msgstr "" + +#: actions/showapplication.php:160 lib/applicationeditform.php:182 +msgid "Icon" +msgstr "" + +#: actions/showapplication.php:170 actions/version.php:195 +#: lib/applicationeditform.php:197 +#, fuzzy +msgid "Name" +msgstr "Nick" + +#: actions/showapplication.php:179 lib/applicationeditform.php:224 +#, fuzzy +msgid "Organization" +msgstr "Bekreftelseskode" + +#: actions/showapplication.php:188 actions/version.php:198 +#: lib/applicationeditform.php:211 lib/groupeditform.php:172 +#, fuzzy +msgid "Description" +msgstr "Alle abonnementer" + +#: actions/showapplication.php:193 actions/showgroup.php:429 +#: lib/profileaction.php:174 +msgid "Statistics" +msgstr "Statistikk" + +#: actions/showapplication.php:204 +#, php-format +msgid "created by %1$s - %2$s access by default - %3$d users" +msgstr "" + +#: actions/showapplication.php:214 +msgid "Application actions" +msgstr "" + +#: actions/showapplication.php:233 +msgid "Reset key & secret" +msgstr "" + +#: actions/showapplication.php:241 +msgid "Application info" +msgstr "" + +#: actions/showapplication.php:243 +msgid "Consumer key" +msgstr "" + +#: actions/showapplication.php:248 +msgid "Consumer secret" +msgstr "" + +#: actions/showapplication.php:253 +msgid "Request token URL" +msgstr "" + +#: actions/showapplication.php:258 +msgid "Access token URL" +msgstr "" + +#: actions/showapplication.php:263 +msgid "Authorize URL" +msgstr "" + +#: actions/showapplication.php:268 +msgid "" +"Note: We support HMAC-SHA1 signatures. We do not support the plaintext " +"signature method." +msgstr "" + #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "" @@ -3031,7 +3317,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 "" @@ -3039,10 +3325,6 @@ msgstr "" msgid "All members" msgstr "" -#: actions/showgroup.php:429 lib/profileaction.php:174 -msgid "Statistics" -msgstr "Statistikk" - #: actions/showgroup.php:432 #, fuzzy msgid "Created" @@ -3185,12 +3467,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 @@ -3373,7 +3655,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 @@ -3402,7 +3685,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 @@ -3648,10 +3932,6 @@ 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 "" @@ -3848,11 +4128,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" @@ -3930,11 +4205,6 @@ msgstr "" msgid "Plugins" msgstr "" -#: actions/version.php:195 -#, fuzzy -msgid "Name" -msgstr "Nick" - #: actions/version.php:196 lib/action.php:741 #, fuzzy msgid "Version" @@ -3944,28 +4214,43 @@ msgstr "Personlig" msgid "Author(s)" msgstr "" -#: actions/version.php:198 lib/groupeditform.php:172 -#, fuzzy -msgid "Description" -msgstr "Alle abonnementer" - -#: classes/File.php:137 +#: 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/Group_member.php:41 +#, fuzzy +msgid "Group join failed." +msgstr "Klarte ikke Ã¥ lagre profil." + +#: classes/Group_member.php:53 +#, fuzzy +msgid "Not part of group." +msgstr "Klarte ikke Ã¥ oppdatere bruker." + +#: classes/Group_member.php:60 +#, fuzzy +msgid "Group leave failed." +msgstr "Klarte ikke Ã¥ lagre profil." + +#: 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 "" @@ -3978,49 +4263,49 @@ msgstr "" msgid "Could not update message with new URI." msgstr "" -#: classes/Notice.php:172 +#: classes/Notice.php:171 #, php-format msgid "DB error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:226 +#: classes/Notice.php:225 msgid "Problem saving notice. Too long." msgstr "" -#: classes/Notice.php:230 +#: classes/Notice.php:229 msgid "Problem saving notice. Unknown user." msgstr "" -#: classes/Notice.php:235 +#: classes/Notice.php:234 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:241 +#: classes/Notice.php:240 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:247 +#: classes/Notice.php:246 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:309 classes/Notice.php:334 +#: classes/Notice.php:305 classes/Notice.php:330 msgid "Problem saving notice." msgstr "" -#: classes/Notice.php:1034 +#: classes/Notice.php:1052 #, php-format msgid "DB error inserting reply: %s" msgstr "" -#: classes/Notice.php:1359 +#: classes/Notice.php:1423 #, php-format msgid "RT @%1$s %2$s" msgstr "" -#: classes/User.php:368 +#: classes/User.php:382 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" @@ -4064,6 +4349,11 @@ msgstr "" msgid "Other options" msgstr "" +#: lib/action.php:144 +#, fuzzy, php-format +msgid "%1$s - %2$s" +msgstr "%1$s sin status pÃ¥ %2$s" + #: lib/action.php:159 msgid "Untitled page" msgstr "" @@ -4080,11 +4370,6 @@ msgstr "Hjem" msgid "Personal profile and friends timeline" msgstr "" -#: lib/action.php:435 -#, fuzzy -msgid "Account" -msgstr "Om" - #: lib/action.php:435 msgid "Change your email, avatar, password, profile" msgstr "" @@ -4239,10 +4524,6 @@ msgstr "" msgid "Before" msgstr "Tidligere »" -#: lib/action.php:1167 -msgid "There was a problem with your session token." -msgstr "" - #: lib/adminpanelaction.php:96 msgid "You cannot make changes to this site." msgstr "" @@ -4275,6 +4556,72 @@ msgstr "" msgid "Paths configuration" msgstr "" +#: lib/applicationeditform.php:186 +msgid "Icon for this application" +msgstr "" + +#: lib/applicationeditform.php:206 +#, fuzzy, php-format +msgid "Describe your application in %d characters" +msgstr "Beskriv degselv og dine interesser med 140 tegn" + +#: lib/applicationeditform.php:209 +#, fuzzy +msgid "Describe your application" +msgstr "Beskriv degselv og dine interesser med 140 tegn" + +#: lib/applicationeditform.php:218 +#, fuzzy +msgid "Source URL" +msgstr "Kilde" + +#: lib/applicationeditform.php:220 +#, fuzzy +msgid "URL of the homepage of this application" +msgstr "URL til din hjemmeside, blogg, eller profil pÃ¥ annen nettside." + +#: lib/applicationeditform.php:226 +msgid "Organization responsible for this application" +msgstr "" + +#: lib/applicationeditform.php:232 +#, fuzzy +msgid "URL for the homepage of the organization" +msgstr "URL til din hjemmeside, blogg, eller profil pÃ¥ annen nettside." + +#: lib/applicationeditform.php:238 +msgid "URL to redirect to after authentication" +msgstr "" + +#: lib/applicationeditform.php:260 +msgid "Browser" +msgstr "" + +#: lib/applicationeditform.php:276 +msgid "Desktop" +msgstr "" + +#: lib/applicationeditform.php:277 +msgid "Type of application, browser or desktop" +msgstr "" + +#: lib/applicationeditform.php:299 +msgid "Read-only" +msgstr "" + +#: lib/applicationeditform.php:317 +msgid "Read-write" +msgstr "" + +#: lib/applicationeditform.php:318 +msgid "Default access for this application: read-only, or read-write" +msgstr "" + +#: lib/applicationlist.php:154 +#, fuzzy +msgid "Revoke" +msgstr "Fjern" + #: lib/attachmentlist.php:87 msgid "Attachments" msgstr "" @@ -4296,12 +4643,12 @@ msgstr "" msgid "Tags for this attachment" msgstr "" -#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 +#: lib/authenticationplugin.php:214 lib/authenticationplugin.php:219 #, fuzzy msgid "Password changing failed" msgstr "Passordet ble lagret" -#: lib/authenticationplugin.php:197 +#: lib/authenticationplugin.php:229 #, fuzzy msgid "Password changing is not allowed" msgstr "Passordet ble lagret" @@ -4324,7 +4671,7 @@ msgstr "" #: lib/command.php:88 #, fuzzy, php-format -msgid "Could not find a user with nickname %s." +msgid "Could not find a user with nickname %s" msgstr "Klarte ikke Ã¥ oppdatere bruker med bekreftet e-post." #: lib/command.php:92 @@ -4332,9 +4679,9 @@ msgid "It does not make a lot of sense to nudge yourself!" msgstr "" #: lib/command.php:99 -#, php-format -msgid "Nudge sent to %s." -msgstr "" +#, fuzzy, php-format +msgid "Nudge sent to %s" +msgstr "Svar til %s" #: lib/command.php:126 #, php-format @@ -4344,168 +4691,192 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:399 lib/command.php:460 -msgid "Notice with that id does not exist." +#: lib/command.php:152 lib/command.php:390 lib/command.php:451 +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 +#: lib/command.php:168 lib/command.php:406 lib/command.php:467 +#: lib/command.php:523 #, fuzzy -msgid "User has no last notice." +msgid "User has no last notice" msgstr "Brukeren har ingen profil." #: lib/command.php:190 msgid "Notice marked as fave." msgstr "" -#: lib/command.php:284 +#: lib/command.php:217 +msgid "You are already a member of that group" +msgstr "Du er allerede medlem av den gruppen." + +#: lib/command.php:231 #, fuzzy, php-format -msgid "Could not remove user %1$s to group %2$s." +msgid "Could not join user %s to group %s" msgstr "Klarte ikke Ã¥ oppdatere bruker." -#: lib/command.php:318 -#, php-format -msgid "Fullname: %s" -msgstr "" +#: lib/command.php:236 +#, fuzzy, php-format +msgid "%s joined group %s" +msgstr "%1$s sin status pÃ¥ %2$s" -#: lib/command.php:321 +#: lib/command.php:275 +#, fuzzy, php-format +msgid "Could not remove user %s to group %s" +msgstr "Klarte ikke Ã¥ oppdatere bruker." + +#: lib/command.php:280 +#, fuzzy, php-format +msgid "%s left group %s" +msgstr "%1$s sin status pÃ¥ %2$s" + +#: lib/command.php:309 +#, fuzzy, php-format +msgid "Fullname: %s" +msgstr "Fullt navn" + +#: lib/command.php:312 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "" -#: lib/command.php:324 +#: lib/command.php:315 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "" -#: lib/command.php:327 +#: lib/command.php:318 #, php-format msgid "About: %s" msgstr "" -#: lib/command.php:358 +#: lib/command.php:349 #, php-format -msgid "Message too long - maximum is %1$d characters, you sent %2$d." +msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:376 +#: lib/command.php:367 #, fuzzy, php-format -msgid "Direct message to %s sent." +msgid "Direct message to %s sent" msgstr "Direktemeldinger til %s" -#: lib/command.php:378 +#: lib/command.php:369 msgid "Error sending direct message." msgstr "" -#: lib/command.php:435 +#: lib/command.php:413 +#, fuzzy +msgid "Cannot repeat your own notice" +msgstr "Kan ikke slette notisen." + +#: lib/command.php:418 +#, fuzzy +msgid "Already repeated that notice" +msgstr "Kan ikke slette notisen." + +#: lib/command.php:426 #, fuzzy, php-format -msgid "Notice from %s repeated." +msgid "Notice from %s repeated" msgstr "Nytt nick" -#: lib/command.php:437 +#: lib/command.php:428 msgid "Error repeating notice." msgstr "" -#: lib/command.php:491 +#: lib/command.php:482 #, php-format -msgid "Notice too long - maximum is %1$d characters, you sent %2$d." +msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:500 +#: lib/command.php:491 #, fuzzy, php-format -msgid "Reply to %s sent." +msgid "Reply to %s sent" msgstr "Svar til %s" -#: lib/command.php:502 +#: lib/command.php:493 msgid "Error saving notice." msgstr "" -#: lib/command.php:556 -msgid "Specify the name of the user to subscribe to." +#: lib/command.php:547 +msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:563 +#: lib/command.php:554 #, php-format msgid "Subscribed to %s" msgstr "" -#: lib/command.php:584 -msgid "Specify the name of the user to unsubscribe from." +#: lib/command.php:575 +msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:591 +#: lib/command.php:582 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:609 lib/command.php:632 +#: lib/command.php:600 lib/command.php:623 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:612 +#: lib/command.php:603 msgid "Notification off." msgstr "" -#: lib/command.php:614 +#: lib/command.php:605 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:635 +#: lib/command.php:626 msgid "Notification on." msgstr "" -#: lib/command.php:637 +#: lib/command.php:628 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:650 -msgid "Login command is disabled." +#: lib/command.php:641 +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:652 #, php-format -msgid "This link is useable only once, and is good for only 2 minutes: %s." +msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:685 +#: lib/command.php:668 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Ikke autorisert." -#: lib/command.php:687 +#: lib/command.php:670 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:690 #, fuzzy msgid "No one is subscribed to you." msgstr "Svar til %s" -#: lib/command.php:709 +#: lib/command.php:692 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:712 #, fuzzy msgid "You are not a member of any groups." msgstr "Du er allerede logget inn!" -#: lib/command.php:731 +#: lib/command.php:714 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:728 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4546,20 +4917,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:199 +#: lib/common.php:131 #, fuzzy msgid "No configuration file found. " msgstr "Fant ikke bekreftelseskode." -#: lib/common.php:200 +#: lib/common.php:132 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:201 +#: lib/common.php:134 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:202 +#: lib/common.php:135 msgid "Go to the installer." msgstr "" @@ -4575,6 +4946,15 @@ msgstr "" msgid "Updates by SMS" msgstr "" +#: lib/connectsettingsaction.php:120 +#, fuzzy +msgid "Connections" +msgstr "Koble til" + +#: lib/connectsettingsaction.php:121 +msgid "Authorized connected applications" +msgstr "" + #: lib/dberroraction.php:60 msgid "Database error" msgstr "" @@ -4764,11 +5144,16 @@ msgstr "" msgid "kB" msgstr "" -#: lib/jabber.php:191 +#: lib/jabber.php:202 #, php-format msgid "[%s]" msgstr "" +#: lib/jabber.php:385 +#, php-format +msgid "Unknown inbox source %d." +msgstr "" + #: lib/joinform.php:114 #, fuzzy msgid "Join" @@ -4836,22 +5221,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 @@ -5038,7 +5411,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 @@ -5046,8 +5419,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 @@ -5056,7 +5430,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 @@ -5091,16 +5465,18 @@ msgstr "" #: lib/noticeform.php:212 #, fuzzy -msgid "Share my location." -msgstr "Klarte ikke Ã¥ lagre profil." - -#: lib/noticeform.php:214 -#, fuzzy -msgid "Do not share my location." +msgid "Share my location" msgstr "Klarte ikke Ã¥ lagre profil." #: lib/noticeform.php:215 -msgid "Hide this info" +#, fuzzy +msgid "Do not share my location" +msgstr "Klarte ikke Ã¥ lagre profil." + +#: lib/noticeform.php:216 +msgid "" +"Sorry, retrieving your geo location is taking longer than expected, please " +"try again later" msgstr "" #: lib/noticelist.php:428 @@ -5372,25 +5748,25 @@ msgstr "" msgid "User has blocked you." msgstr "" -#: lib/subs.php:60 +#: lib/subs.php:63 msgid "Could not subscribe." msgstr "" -#: lib/subs.php:79 +#: lib/subs.php:82 msgid "Could not subscribe other to you." msgstr "" -#: lib/subs.php:128 +#: lib/subs.php:137 #, fuzzy msgid "Not subscribed!" msgstr "Alle abonnementer" -#: lib/subs.php:133 +#: lib/subs.php:142 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "Klarte ikke Ã¥ lagre avatar-informasjonen" -#: lib/subs.php:146 +#: lib/subs.php:158 msgid "Couldn't delete subscription." msgstr "" @@ -5404,10 +5780,6 @@ msgstr "" msgid "People Tagcloud as tagged" msgstr "" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "" - #: lib/tagcloudsection.php:56 msgid "None" msgstr "" @@ -5472,47 +5844,47 @@ msgstr "" msgid "Moderate" msgstr "" -#: lib/util.php:837 +#: lib/util.php:875 msgid "a few seconds ago" msgstr "noen fÃ¥ sekunder siden" -#: lib/util.php:839 +#: lib/util.php:877 msgid "about a minute ago" msgstr "omtrent ett minutt siden" -#: lib/util.php:841 +#: lib/util.php:879 #, php-format msgid "about %d minutes ago" msgstr "omtrent %d minutter siden" -#: lib/util.php:843 +#: lib/util.php:881 msgid "about an hour ago" msgstr "omtrent én time siden" -#: lib/util.php:845 +#: lib/util.php:883 #, php-format msgid "about %d hours ago" msgstr "omtrent %d timer siden" -#: lib/util.php:847 +#: lib/util.php:885 msgid "about a day ago" msgstr "omtrent én dag siden" -#: lib/util.php:849 +#: lib/util.php:887 #, php-format msgid "about %d days ago" msgstr "omtrent %d dager siden" -#: lib/util.php:851 +#: lib/util.php:889 msgid "about a month ago" msgstr "omtrent én mÃ¥ned siden" -#: lib/util.php:853 +#: lib/util.php:891 #, php-format msgid "about %d months ago" msgstr "omtrent %d mÃ¥neder siden" -#: lib/util.php:855 +#: lib/util.php:893 msgid "about a year ago" msgstr "omtrent ett Ã¥r siden" @@ -5528,5 +5900,5 @@ msgstr "" #: scripts/xmppdaemon.php:301 #, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po index d35f8de278..ff28d0c757 100644 --- a/locale/nl/LC_MESSAGES/statusnet.po +++ b/locale/nl/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-10 00:46+0000\n" -"PO-Revision-Date: 2010-01-10 00:48:40+0000\n" +"POT-Creation-Date: 2010-01-15 19:15+0000\n" +"PO-Revision-Date: 2010-01-16 17:52:50+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60878); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r61138); 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" @@ -35,25 +35,30 @@ msgstr "Deze pagina bestaat niet" #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 +#: actions/apistatusesupdate.php:149 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 #: 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 #: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 -#: lib/command.php:163 lib/command.php:311 lib/command.php:364 -#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/command.php:163 lib/command.php:302 lib/command.php:355 +#: lib/command.php:401 lib/command.php:462 lib/command.php:518 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/subs.php:34 lib/subs.php:125 msgid "No such user." msgstr "Onbekende gebruiker." +#: actions/all.php:84 +#, php-format +msgid "%1$s and friends, page %2$d" +msgstr "%1$s en vrienden, pagina %2$d" + #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 +#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -92,14 +97,14 @@ msgstr "" "groups%%) of plaats zelf berichten." #: actions/all.php:134 -#, fuzzy, php-format +#, php-format msgid "" "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 @@ -114,7 +119,7 @@ msgstr "" msgid "You and friends" msgstr "U en vrienden" -#: actions/allrss.php:119 actions/apitimelinefriends.php:122 +#: actions/allrss.php:119 actions/apitimelinefriends.php:121 #: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" @@ -125,6 +130,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:155 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." @@ -138,7 +160,7 @@ msgstr "De API-functie is niet aangetroffen." #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:114 +#: actions/apistatusesupdate.php:119 msgid "This method requires a POST." msgstr "Deze methode vereist een POST." @@ -169,8 +191,9 @@ msgstr "Het was niet mogelijk het profiel op te slaan." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257 -#: actions/designadminpanel.php:122 actions/newnotice.php:94 +#: actions/apistatusesupdate.php:132 actions/avatarsettings.php:257 +#: actions/designadminpanel.php:122 actions/editapplication.php:118 +#: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format msgid "" @@ -184,6 +207,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 "Het was niet mogelijk om uw ontwerpinstellingen op te slaan." @@ -224,26 +250,6 @@ msgstr "Privéberichten aan %s" msgid "All the direct messages sent to %s" msgstr "Alle privéberichten 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!" - #: actions/apidirectmessagenew.php:126 msgid "No message text!" msgstr "Het bericht is leeg!" @@ -269,16 +275,16 @@ 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 mededeling staat reeds in uw favorietenlijst!" +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 mededeling staat niet in uw favorietenlijst!" +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." @@ -301,7 +307,7 @@ 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 @@ -337,7 +343,8 @@ msgstr "" msgid "Not a valid nickname." msgstr "Ongeldige gebruikersnaam!" -#: actions/apigroupcreate.php:196 actions/editgroup.php:195 +#: actions/apigroupcreate.php:196 actions/editapplication.php:212 +#: actions/editgroup.php:195 actions/newapplication.php:200 #: actions/newgroup.php:139 actions/profilesettings.php:222 #: actions/register.php:217 msgid "Homepage is not a valid URL." @@ -349,7 +356,8 @@ msgstr "De thuispagina is geen geldige URL." msgid "Full name is too long (max 255 chars)." msgstr "De volledige naam is te lang (maximaal 255 tekens)." -#: actions/apigroupcreate.php:213 +#: actions/apigroupcreate.php:213 actions/editapplication.php:187 +#: actions/newapplication.php:169 #, php-format msgid "Description is too long (max %d chars)." msgstr "De beschrijving is te lang (maximaal %d tekens)." @@ -389,7 +397,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 lib/command.php:217 +#: 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." @@ -397,19 +405,19 @@ 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 lib/command.php:234 -#, fuzzy, php-format +#: actions/apigroupjoin.php:138 actions/joingroup.php:124 +#, php-format msgid "Could not join user %1$s to group %2$s." -msgstr "Het was niet mogelijk gebruiker %s toe te voegen aan de groep %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/leavegroup.php:127 -#, fuzzy, php-format +#: actions/apigroupleave.php:124 actions/leavegroup.php:119 +#, php-format msgid "Could not remove user %1$s from group %2$s." -msgstr "Het was niet mogelijk gebruiker %s uit de group %s te verwijderen." +msgstr "Het was niet mogelijk gebruiker %1$s uit de group %2$s te verwijderen." #: actions/apigrouplist.php:95 #, php-format @@ -426,6 +434,105 @@ msgstr "%s groepen" msgid "groups on %s" msgstr "groepen op %s" +#: actions/apioauthauthorize.php:108 actions/apioauthauthorize.php:114 +msgid "Bad request." +msgstr "Ongeldig verzoek." + +#: actions/apioauthauthorize.php:134 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:115 actions/makeadmin.php:66 +#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 +#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:139 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 +#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/subscribe.php:46 actions/tagother.php:166 +#: 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 "" +"Er is een probleem ontstaan met uw sessie. Probeer het nog een keer, " +"alstublieft." + +#: actions/apioauthauthorize.php:146 +msgid "Invalid nickname / password!" +msgstr "Ongeldige gebruikersnaam of wachtwoord." + +#: actions/apioauthauthorize.php:170 +msgid "DB error deleting OAuth app user." +msgstr "" +"Er is een databasefout opgetreden tijdens het verwijderen van de OAuth " +"applicatiegebruiker." + +#: actions/apioauthauthorize.php:196 +msgid "DB error inserting OAuth app user." +msgstr "" +"Er is een databasefout opgetreden tijdens het toevoegen van de OAuth " +"applicatiegebruiker." + +#: actions/apioauthauthorize.php:231 +#, php-format +msgid "" +"The request token %s has been authorized. Please exchange it for an access " +"token." +msgstr "" +"Het verzoektoken %s is geautoriseerd. Wissel het alstublieft uit voor een " +"toegangstoken." + +#: actions/apioauthauthorize.php:241 +#, php-format +msgid "The request token %s has been denied." +msgstr "Het verzoektoken %s is geweigerd." + +#: actions/apioauthauthorize.php:246 actions/avatarsettings.php:281 +#: actions/designadminpanel.php:103 actions/editapplication.php:139 +#: actions/emailsettings.php:256 actions/grouplogo.php:319 +#: actions/imsettings.php:220 actions/newapplication.php:121 +#: actions/oauthconnectionssettings.php:151 actions/recoverpassword.php:44 +#: actions/smssettings.php:248 lib/designsettings.php:304 +msgid "Unexpected form submission." +msgstr "Het formulier is onverwacht ingezonden." + +#: actions/apioauthauthorize.php:273 +msgid "An application would like to connect to your account" +msgstr "Een applicatie vraagt toegang tot uw gebruikersgegevens" + +#: actions/apioauthauthorize.php:290 +msgid "Allow or deny access" +msgstr "Toegang toestaan of ontzeggen" + +#: actions/apioauthauthorize.php:320 lib/action.php:435 +msgid "Account" +msgstr "Gebruiker" + +#: actions/apioauthauthorize.php:323 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/apioauthauthorize.php:326 actions/login.php:233 +#: actions/register.php:429 lib/accountsettingsaction.php:116 +msgid "Password" +msgstr "Wachtwoord" + +#: actions/apioauthauthorize.php:338 +msgid "Deny" +msgstr "Ontzeggen" + +#: actions/apioauthauthorize.php:344 +msgid "Allow" +msgstr "Toestaan" + +#: actions/apioauthauthorize.php:361 +msgid "Allow or deny access to your account information." +msgstr "Toegang tot uw gebruikersgegevens toestaan of ontzeggen." + #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." msgstr "Deze methode vereist een POST of DELETE." @@ -439,11 +546,11 @@ msgstr "U kunt de status van een andere gebruiker niet verwijderen." msgid "No such notice." msgstr "De mededeling bestaat niet." -#: actions/apistatusesretweet.php:83 lib/command.php:422 +#: actions/apistatusesretweet.php:83 msgid "Cannot repeat your own notice." msgstr "U kunt uw eigen mededeling niet herhalen." -#: actions/apistatusesretweet.php:91 lib/command.php:427 +#: actions/apistatusesretweet.php:91 msgid "Already repeated that notice." msgstr "U hebt die mededeling al herhaald." @@ -455,17 +562,17 @@ msgstr "De status is verwijderd." msgid "No status with that ID found." msgstr "Er is geen status gevonden met dit ID." -#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:162 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "De mededeling is te lang. Gebruik maximaal %d tekens." -#: actions/apistatusesupdate.php:198 +#: actions/apistatusesupdate.php:203 msgid "Not found" msgstr "Niet gevonden" -#: actions/apistatusesupdate.php:221 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:226 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -477,14 +584,14 @@ msgid "Unsupported format." msgstr "Niet-ondersteund bestandsformaat." #: actions/apitimelinefavorites.php:108 -#, fuzzy, php-format +#, php-format msgid "%1$s / Favorites from %2$s" -msgstr "%s / Favorieten van %s" +msgstr "%1$s / Favorieten van %2$s" #: actions/apitimelinefavorites.php:120 -#, fuzzy, php-format +#, php-format msgid "%1$s updates favorited by %2$s / %2$s." -msgstr "%s updates op de favorietenlijst geplaatst door %s / %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 @@ -551,8 +658,11 @@ msgstr "Niet aangetroffen." msgid "No such attachment." 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." @@ -576,8 +686,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" @@ -609,31 +719,6 @@ 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/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 -#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 -#: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 -#: actions/subscribe.php:46 actions/tagother.php:166 -#: 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 "" -"Er is een probleem ontstaan met uw sessie. Probeer het nog een keer, " -"alstublieft." - -#: actions/avatarsettings.php:281 actions/designadminpanel.php:103 -#: actions/emailsettings.php:256 actions/grouplogo.php:319 -#: actions/imsettings.php:220 actions/recoverpassword.php:44 -#: actions/smssettings.php:248 lib/designsettings.php:304 -msgid "Unexpected form submission." -msgstr "Het formulier is onverwacht ingezonden." - #: actions/avatarsettings.php:328 msgid "Pick a square area of the image to be your avatar" msgstr "" @@ -696,19 +781,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:260 +msgid "No such group." +msgstr "De opgegeven groep bestaat niet." #: actions/blockedfromgroup.php:90 #, php-format @@ -716,9 +797,9 @@ msgid "%s blocked profiles" msgstr "%s geblokkeerde profielen" #: actions/blockedfromgroup.php:93 -#, fuzzy, php-format +#, php-format msgid "%1$s blocked profiles, page %2$d" -msgstr "%s geblokkeerde profielen, pagina %d" +msgstr "%1$s geblokkeerde profielen, pagina %2$d" #: actions/blockedfromgroup.php:108 msgid "A list of the users blocked from joining this group." @@ -775,7 +856,7 @@ msgid "Couldn't delete email confirmation." msgstr "De e-mailbevestiging kon niet verwijderd worden." #: actions/confirmaddress.php:144 -msgid "Confirm Address" +msgid "Confirm address" msgstr "Adres bevestigen" #: actions/confirmaddress.php:159 @@ -830,11 +911,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." @@ -863,7 +939,7 @@ msgstr "Gebruiker verwijderen" #: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 #: lib/adminpanelaction.php:316 lib/groupnav.php:119 msgid "Design" -msgstr "Ontwerp" +msgstr "Uiterlijk" #: actions/designadminpanel.php:73 msgid "Design settings for this StatusNet site." @@ -969,7 +1045,8 @@ msgstr "Standaardinstellingen toepassen" #: actions/pathsadminpanel.php:324 actions/profilesettings.php:174 #: actions/siteadminpanel.php:388 actions/smssettings.php:181 #: actions/subscriptions.php:203 actions/tagother.php:154 -#: actions/useradminpanel.php:313 lib/designsettings.php:256 +#: actions/useradminpanel.php:313 lib/applicationeditform.php:335 +#: lib/applicationeditform.php:336 lib/designsettings.php:256 #: lib/groupeditform.php:202 msgid "Save" msgstr "Opslaan" @@ -990,6 +1067,76 @@ msgstr "Aan favorieten toevoegen" msgid "No such document." msgstr "Onbekend document." +#: actions/editapplication.php:54 lib/applicationeditform.php:136 +msgid "Edit application" +msgstr "Applicatie bewerken" + +#: actions/editapplication.php:66 +msgid "You must be logged in to edit an application." +msgstr "U moet aangemeld zijn om een applicatie te kunnen bewerken." + +#: actions/editapplication.php:77 actions/showapplication.php:94 +msgid "You are not the owner of this application." +msgstr "U bent niet de eigenaar van deze applicatie." + +#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:163 +#: actions/showapplication.php:87 +msgid "No such application." +msgstr "De applicatie bestaat niet." + +#: actions/editapplication.php:127 actions/newapplication.php:110 +#: actions/showapplication.php:118 lib/action.php:1167 +msgid "There was a problem with your session token." +msgstr "Er is een probleem met uw sessietoken." + +#: actions/editapplication.php:161 +msgid "Use this form to edit your application." +msgstr "Gebruik dit formulier om uw applicatiegegevens te bewerken." + +#: actions/editapplication.php:177 actions/newapplication.php:159 +msgid "Name is required." +msgstr "Een naam is verplicht." + +#: actions/editapplication.php:180 actions/newapplication.php:162 +msgid "Name is too long (max 255 chars)." +msgstr "De naam is te lang (maximaal 255 tekens)." + +#: actions/editapplication.php:183 actions/newapplication.php:165 +msgid "Description is required." +msgstr "Een beschrijving is verplicht" + +#: actions/editapplication.php:191 +msgid "Source URL is too long." +msgstr "De bron-URL is te lang." + +#: actions/editapplication.php:197 actions/newapplication.php:182 +msgid "Source URL is not valid." +msgstr "De bron-URL is niet geldig." + +#: actions/editapplication.php:200 actions/newapplication.php:185 +msgid "Organization is required." +msgstr "Organisatie is verplicht." + +#: actions/editapplication.php:203 actions/newapplication.php:188 +msgid "Organization is too long (max 255 chars)." +msgstr "De organisatienaam is te lang (maximaal 255 tekens)." + +#: actions/editapplication.php:206 actions/newapplication.php:191 +msgid "Organization homepage is required." +msgstr "De homepage voor een organisatie is verplicht." + +#: actions/editapplication.php:215 actions/newapplication.php:203 +msgid "Callback is too long." +msgstr "De callback is te lang." + +#: actions/editapplication.php:222 actions/newapplication.php:212 +msgid "Callback URL is not valid." +msgstr "De callback-URL is niet geldig." + +#: actions/editapplication.php:255 +msgid "Could not update application." +msgstr "Het was niet mogelijk de applicatie bij te werken." + #: actions/editgroup.php:56 #, php-format msgid "Edit %s group" @@ -1001,8 +1148,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." @@ -1026,13 +1173,13 @@ msgid "Options saved." msgstr "De instellingen zijn opgeslagen." #: actions/emailsettings.php:60 -msgid "Email Settings" +msgid "Email settings" msgstr "E-mailvoorkeuren" #: actions/emailsettings.php:71 #, php-format msgid "Manage how you get email from %%site.name%%." -msgstr "E-mail ontvangen van %%site.name%% beheren." +msgstr "Uw e-mailinstellingen op %%site.name%% beheren." #: actions/emailsettings.php:100 actions/imsettings.php:100 #: actions/smssettings.php:104 @@ -1058,13 +1205,14 @@ msgstr "" "ongewenste berichten/spam) voor een bericht met nadere instructies." #: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 +#: actions/smssettings.php:126 lib/applicationeditform.php:333 +#: lib/applicationeditform.php:334 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\"" @@ -1086,8 +1234,8 @@ msgstr "Stuur een email naar dit adres om een nieuw bericht te posten" #: actions/emailsettings.php:145 actions/smssettings.php:162 msgid "Make a new email address for posting to; cancels the old one." msgstr "" -"Stelt een nieuw e-mailadres in voor het plaatsen van berichten; verwijdert " -"het oude." +"Stelt een nieuw e-mailadres in voor het ontvangen van berichten. Het " +"bestaande e-mailadres wordt verwijderd." #: actions/emailsettings.php:148 actions/smssettings.php:164 msgid "New" @@ -1139,8 +1287,9 @@ 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 @@ -1329,13 +1478,6 @@ 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:79 msgid "No such file." msgstr "Het bestand bestaat niet." @@ -1352,7 +1494,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." @@ -1378,13 +1520,13 @@ msgid "Block user from group" msgstr "Gebruiker toegang tot de groep blokkeren" #: actions/groupblock.php:162 -#, fuzzy, php-format +#, php-format msgid "" "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " "will be removed from the group, unable to post, and unable to subscribe to " "the group in the future." msgstr "" -"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." @@ -1402,9 +1544,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." @@ -1427,12 +1569,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." @@ -1449,6 +1585,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." @@ -1467,9 +1607,9 @@ msgid "%s group members" msgstr "leden van de groep %s" #: actions/groupmembers.php:96 -#, fuzzy, php-format +#, php-format msgid "%1$s group members, page %2$d" -msgstr "% groeps leden, pagina %d" +msgstr "%1$s groeps leden, pagina %2$d" #: actions/groupmembers.php:111 msgid "A list of the users in this group." @@ -1580,7 +1720,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 @@ -1611,7 +1751,7 @@ msgstr "" "contactenlijst toegevoegd?" #: actions/imsettings.php:124 -msgid "IM Address" +msgid "IM address" msgstr "IM-adres" #: actions/imsettings.php:126 @@ -1710,7 +1850,7 @@ 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 lib/command.php:315 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -1758,7 +1898,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:234 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236 msgid "Send" msgstr "Verzenden" @@ -1828,88 +1968,60 @@ 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 -msgid "You are already a member of that group" -msgstr "U bent al lid van deze groep" - -#: actions/joingroup.php:128 -#, fuzzy, php-format -msgid "Could not join user %1$s to group %2$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 -#, fuzzy, php-format +#: actions/joingroup.php:131 +#, php-format msgid "%1$s joined group %2$s" -msgstr "%s is lid geworden van de groep %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." msgstr "U moet aangemeld zijn om een groep te kunnen verlaten." -#: actions/leavegroup.php:90 lib/command.php:268 +#: actions/leavegroup.php:90 lib/command.php:265 msgid "You are not a member of that group." msgstr "U bent geen lid van deze groep" -#: actions/leavegroup.php:119 lib/command.php:278 -msgid "Could not find membership record." -msgstr "Er is geen groepslidmaatschap aangetroffen." - -#: actions/leavegroup.php:134 lib/command.php:289 -#, fuzzy, php-format +#: actions/leavegroup.php:127 +#, php-format msgid "%1$s left group %2$s" -msgstr "%s heeft de groep %s verlaten" +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:460 +#: 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 -#: lib/groupeditform.php:152 lib/userprofile.php:131 -msgid "Nickname" -msgstr "Gebruikersnaam" - -#: actions/login.php:253 actions/register.php:428 -#: 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." @@ -1917,7 +2029,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]" @@ -1931,24 +2043,44 @@ msgid "Only an admin can make another user an admin." msgstr "Alleen beheerders kunnen andere gebruikers beheerder maken." #: actions/makeadmin.php:95 -#, fuzzy, php-format +#, php-format msgid "%1$s is already an admin for group \"%2$s\"." -msgstr "%s is al beheerder van de groep \"%s\"" +msgstr "%1$s is al beheerder van de groep \"%2$s\"" #: actions/makeadmin.php:132 -#, fuzzy, php-format -msgid "Can't get membership record for %1$s in group %2$s" -msgstr "Het was niet mogelijk te bevestigen dat %s lid is van de groep %s" +#, php-format +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 -#, fuzzy, php-format -msgid "Can't make %1$s an admin for group %2$s" -msgstr "Het is niet mogelijk %s beheerder te maken van de groep %s" +#, php-format +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" msgstr "Geen huidige status" +#: actions/newapplication.php:52 +msgid "New application" +msgstr "Nieuwe applicatie" + +#: actions/newapplication.php:64 +msgid "You must be logged in to register an application." +msgstr "U moet aangemeld zijn om een applicatie te kunnen registreren." + +#: actions/newapplication.php:143 +msgid "Use this form to register a new application." +msgstr "Gebruik dit formulier om een nieuwe applicatie te registreren." + +#: actions/newapplication.php:173 +msgid "Source URL is required." +msgstr "Een bron-URL is verplicht." + +#: actions/newapplication.php:255 actions/newapplication.php:264 +msgid "Could not create application." +msgstr "Het was niet mogelijk de applicatie aan te maken." + #: actions/newgroup.php:53 msgid "New group" msgstr "Nieuwe groep" @@ -1961,12 +2093,12 @@ msgstr "Gebruik dit formulier om een nieuwe groep aan te maken." msgid "New message" msgstr "Nieuw bericht" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 msgid "You can't send a message to this user." msgstr "U kunt geen bericht naar deze gebruiker zenden." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:484 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 +#: lib/command.php:475 msgid "No content!" msgstr "Geen inhoud!" @@ -1974,7 +2106,7 @@ msgstr "Geen inhoud!" msgid "No recipient specified." msgstr "Er is geen ontvanger aangegeven." -#: actions/newmessage.php:164 lib/command.php:370 +#: actions/newmessage.php:164 lib/command.php:361 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "Stuur geen berichten naar uzelf. Zeg het gewoon in uw hoofd." @@ -1985,8 +2117,8 @@ msgstr "Bericht verzonden." #: 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" @@ -2014,9 +2146,9 @@ msgid "Text search" msgstr "Tekst doorzoeken" #: actions/noticesearch.php:91 -#, fuzzy, php-format +#, php-format msgid "Search results for \"%1$s\" on %2$s" -msgstr "Zoekresultaten voor \"%s\" op %s" +msgstr "Zoekresultaten voor \"%1$s\" op %2$s" #: actions/noticesearch.php:121 #, php-format @@ -2062,6 +2194,54 @@ msgstr "De por is verzonden" msgid "Nudge sent!" msgstr "De por is verzonden!" +#: actions/oauthappssettings.php:59 +msgid "You must be logged in to list your applications." +msgstr "" +"U moet aangemeld zijn om een lijst met uw applicaties te kunnen bekijken." + +#: actions/oauthappssettings.php:74 +msgid "OAuth applications" +msgstr "Overige instellingen" + +#: actions/oauthappssettings.php:85 +msgid "Applications you have registered" +msgstr "Door u geregistreerde applicaties" + +#: actions/oauthappssettings.php:135 +#, php-format +msgid "You have not registered any applications yet." +msgstr "U hebt nog geen applicaties geregistreerd." + +#: actions/oauthconnectionssettings.php:71 +msgid "Connected applications" +msgstr "Verbonden applicaties" + +#: actions/oauthconnectionssettings.php:87 +msgid "You have allowed the following applications to access you account." +msgstr "" +"U hebt de volgende applicaties toegang gegeven tot uw gebruikersgegevens." + +#: actions/oauthconnectionssettings.php:170 +msgid "You are not a user of that application." +msgstr "U bent geen gebruiker van die applicatie." + +#: actions/oauthconnectionssettings.php:180 +msgid "Unable to revoke access for app: " +msgstr "" +"Het was niet mogelijk de toegang te ontzeggen voor de volgende applicatie: " + +#: actions/oauthconnectionssettings.php:192 +#, php-format +msgid "You have not authorized any applications to use your account." +msgstr "" +"U hebt geen enkele applicatie geautoriseerd voor toegang tot uw " +"gebruikersgegevens." + +#: actions/oauthconnectionssettings.php:205 +msgid "Developers can edit the registration settings for their applications " +msgstr "" +"Ontwikkelaars kunnen de registratiegegevens voor hun applicaties bewerken " + #: actions/oembed.php:79 actions/shownotice.php:100 msgid "Notice has no profile" msgstr "Mededeling heeft geen profiel" @@ -2079,8 +2259,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:1038 +#: lib/api.php:1066 lib/api.php:1176 msgid "Not a supported data format." msgstr "Geen ondersteund gegevensformaat." @@ -2093,7 +2273,7 @@ msgid "Notice Search" msgstr "Mededeling zoeken" #: actions/othersettings.php:60 -msgid "Other Settings" +msgid "Other settings" msgstr "Overige instellingen" #: actions/othersettings.php:71 @@ -2124,6 +2304,26 @@ 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/otp.php:69 +msgid "No user ID specified." +msgstr "Er is geen ID opgegeven." + +#: actions/otp.php:83 +msgid "No login token specified." +msgstr "Er is geen token opgegeven." + +#: actions/otp.php:90 +msgid "No login token requested." +msgstr "Er is niet om een aanmeldtoken gevraagd." + +#: actions/otp.php:95 +msgid "Invalid login token specified." +msgstr "Het opgegeven token is ongeldig." + +#: actions/otp.php:104 +msgid "Login token expired." +msgstr "Het aanmeldtoken is verlopen." + #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" @@ -2158,7 +2358,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" @@ -2320,7 +2520,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 @@ -2351,20 +2551,20 @@ msgid "Not a valid people tag: %s" msgstr "Geen geldig gebruikerslabel: %s" #: actions/peopletag.php:144 -#, fuzzy, php-format +#, php-format msgid "Users self-tagged with %1$s - page %2$d" -msgstr "Gebruikers die zichzelf met %s hebben gelabeld - pagina %d" +msgstr "Gebruikers die zichzelf met %1$s hebben gelabeld - pagina %2$d" #: actions/postnotice.php:84 msgid "Invalid notice content" msgstr "Ongeldige mededelinginhoud" #: actions/postnotice.php:90 -#, fuzzy, php-format +#, php-format 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" @@ -2385,42 +2585,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 -#: lib/groupeditform.php:161 +#: actions/profilesettings.php:115 actions/register.php:453 +#: lib/applicationeditform.php:230 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\"" @@ -2740,7 +2940,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." @@ -2752,7 +2952,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:457 +#: actions/register.php:114 actions/register.php:503 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Registreren" @@ -2765,19 +2965,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. " @@ -2785,40 +2981,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." @@ -2826,8 +3022,8 @@ msgstr "" " behalve de volgende privégegevens: wachtwoord, e-mailadres, IM-adres, " "telefoonnummer." -#: actions/register.php:537 -#, fuzzy, php-format +#: actions/register.php:538 +#, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " "want to...\n" @@ -2844,10 +3040,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 " @@ -2860,7 +3056,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.)" @@ -2973,12 +3169,12 @@ msgid "Replies feed for %s (Atom)" msgstr "Antwoordenfeed voor %s (Atom)" #: actions/replies.php:198 -#, fuzzy, php-format +#, php-format msgid "" "This is the timeline showing replies to %1$s but %2$s hasn't received a " "notice to his attention yet." msgstr "" -"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 @@ -2991,13 +3187,13 @@ msgstr "" "abonneren of [lid worden van groepen](%%action.groups%%)." #: actions/replies.php:205 -#, fuzzy, php-format +#, php-format msgid "" "You can try to [nudge %1$s](../%2$s) or [post something to his or her " "attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" -"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 @@ -3012,6 +3208,82 @@ 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/showapplication.php:82 +msgid "You must be logged in to view an application." +msgstr "U moet aangemeld zijn om een applicatie te kunnen bekijken." + +#: actions/showapplication.php:158 +msgid "Application profile" +msgstr "Applicatieprofiel" + +#: actions/showapplication.php:160 lib/applicationeditform.php:182 +msgid "Icon" +msgstr "Icoon" + +#: actions/showapplication.php:170 actions/version.php:195 +#: lib/applicationeditform.php:197 +msgid "Name" +msgstr "Naam" + +#: actions/showapplication.php:179 lib/applicationeditform.php:224 +msgid "Organization" +msgstr "Organisatie" + +#: actions/showapplication.php:188 actions/version.php:198 +#: lib/applicationeditform.php:211 lib/groupeditform.php:172 +msgid "Description" +msgstr "Beschrijving" + +#: actions/showapplication.php:193 actions/showgroup.php:429 +#: lib/profileaction.php:174 +msgid "Statistics" +msgstr "Statistieken" + +#: actions/showapplication.php:204 +#, php-format +msgid "created by %1$s - %2$s access by default - %3$d users" +msgstr "aangemaakt door %1$s - standaardtoegang \"%2$s\" - %3$d gebruikers" + +#: actions/showapplication.php:214 +msgid "Application actions" +msgstr "Applicatiehandelingen" + +#: actions/showapplication.php:233 +msgid "Reset key & secret" +msgstr "Sleutel en wachtwoord op nieuw instellen" + +#: actions/showapplication.php:241 +msgid "Application info" +msgstr "Applicatieinformatie" + +#: actions/showapplication.php:243 +msgid "Consumer key" +msgstr "Gebruikerssleutel" + +#: actions/showapplication.php:248 +msgid "Consumer secret" +msgstr "Gebruikerswachtwoord" + +#: actions/showapplication.php:253 +msgid "Request token URL" +msgstr "URL voor verzoektoken" + +#: actions/showapplication.php:258 +msgid "Access token URL" +msgstr "URL voor toegangstoken" + +#: actions/showapplication.php:263 +msgid "Authorize URL" +msgstr "Autorisatie-URL" + +#: actions/showapplication.php:268 +msgid "" +"Note: We support HMAC-SHA1 signatures. We do not support the plaintext " +"signature method." +msgstr "" +"Opmerking: HMAC-SHA1 ondertekening wordt ondersteund. Ondertekening in " +"platte tekst is niet mogelijk." + #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "Het was niet mogelijk de favoriete mededelingen op te halen." @@ -3118,7 +3390,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)" @@ -3126,10 +3398,6 @@ msgstr "(geen)" msgid "All members" msgstr "Alle leden" -#: actions/showgroup.php:429 lib/profileaction.php:174 -msgid "Statistics" -msgstr "Statistieken" - #: actions/showgroup.php:432 msgid "Created" msgstr "Aangemaakt" @@ -3195,9 +3463,9 @@ msgid " tagged %s" msgstr " met het label %s" #: actions/showstream.php:122 -#, fuzzy, php-format +#, php-format msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" -msgstr "Mededelingenfeed voor %s met het label %s (RSS 1.0)" +msgstr "Mededelingenfeed voor %1$s met het label %2$s (RSS 1.0)" #: actions/showstream.php:129 #, php-format @@ -3220,10 +3488,10 @@ msgid "FOAF for %s" msgstr "Vriend van een vriend (FOAF) voor %s" #: actions/showstream.php:191 -#, fuzzy, php-format +#, php-format 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 "" @@ -3234,13 +3502,13 @@ msgstr "" "verstuurd, dus dit is een ideaal moment om daarmee te beginnen!" #: actions/showstream.php:198 -#, fuzzy, php-format +#, php-format msgid "" "You can try to nudge %1$s or [post something to his or her attention](%%%%" "action.newnotice%%%%?status_textarea=%2$s)." msgstr "" -"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 @@ -3289,14 +3557,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." @@ -3482,7 +3750,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 @@ -3511,7 +3779,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 @@ -3602,9 +3870,9 @@ msgid "%s subscribers" msgstr "%s abonnees" #: actions/subscribers.php:52 -#, fuzzy, php-format +#, php-format msgid "%1$s subscribers, page %2$d" -msgstr "%s abonnees, pagina %d" +msgstr "%1$s abonnees, pagina %2$d" #: actions/subscribers.php:63 msgid "These are the people who listen to your notices." @@ -3643,9 +3911,9 @@ msgid "%s subscriptions" msgstr "%s abonnementen" #: actions/subscriptions.php:54 -#, fuzzy, php-format +#, php-format msgid "%1$s subscriptions, page %2$d" -msgstr "%s abonnementen, pagina %d" +msgstr "%1$s abonnementen, pagina %2$d" #: actions/subscriptions.php:65 msgid "These are the people whose notices you listen to." @@ -3770,21 +4038,17 @@ 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 -#, fuzzy, php-format +#, php-format 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:321 #: lib/personalgroupnav.php:115 @@ -3942,9 +4206,9 @@ msgstr "" "afwijzen van een abonnement." #: actions/userauthorization.php:296 -#, fuzzy, php-format +#, php-format msgid "Listener URI ‘%s’ not found here." -msgstr "De abonnee-URI \"%s\" is hier niet te vinden" +msgstr "De abonnee-URI \"%s\" is hier niet te vinden." #: actions/userauthorization.php:301 #, php-format @@ -3976,10 +4240,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" @@ -4022,6 +4282,8 @@ 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" @@ -4038,6 +4300,10 @@ msgid "" "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 "" @@ -4046,6 +4312,10 @@ msgid "" "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 @@ -4053,15 +4323,13 @@ 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" @@ -4070,11 +4338,7 @@ msgstr "Versie" msgid "Author(s)" msgstr "Auteur(s)" -#: actions/version.php:198 lib/groupeditform.php:172 -msgid "Description" -msgstr "Beschrijving" - -#: classes/File.php:137 +#: classes/File.php:144 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " @@ -4083,18 +4347,35 @@ 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/Group_member.php:41 +msgid "Group join failed." +msgstr "Groepslidmaatschap toevoegen is mislukt." + +#: classes/Group_member.php:53 +msgid "Not part of group." +msgstr "Geen lid van groep." + +#: classes/Group_member.php:60 +msgid "Group leave failed." +msgstr "Groepslidmaatschap opzeggen is mislukt." + +#: classes/Login_token.php:76 +#, 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." @@ -4107,31 +4388,31 @@ msgstr "Het was niet mogelijk het bericht in te voegen." msgid "Could not update message with new URI." msgstr "Het was niet mogelijk het bericht bij te werken met de nieuwe URI." -#: classes/Notice.php:172 +#: classes/Notice.php:171 #, php-format msgid "DB error inserting hashtag: %s" msgstr "Er is een databasefout opgetreden bij de invoer van de hashtag: %s" -#: classes/Notice.php:226 +#: classes/Notice.php:225 msgid "Problem saving notice. Too long." msgstr "" "Er is een probleem opgetreden bij het opslaan van de mededeling. Deze is te " "lang." -#: classes/Notice.php:230 +#: classes/Notice.php:229 msgid "Problem saving notice. Unknown user." msgstr "" "Er was een probleem bij het opslaan van de mededeling. De gebruiker is " "onbekend." -#: classes/Notice.php:235 +#: classes/Notice.php:234 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "U hebt te snel te veel mededelingen verstuurd. Kom even op adem en probeer " "het over enige tijd weer." -#: classes/Notice.php:241 +#: classes/Notice.php:240 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4139,27 +4420,27 @@ msgstr "" "Te veel duplicaatberichten te snel achter elkaar. Neem een adempauze en " "plaats over een aantal minuten pas weer een bericht." -#: classes/Notice.php:247 +#: classes/Notice.php:246 msgid "You are banned from posting notices on this site." msgstr "" "U bent geblokkeerd en mag geen mededelingen meer achterlaten op deze site." -#: classes/Notice.php:309 classes/Notice.php:334 +#: classes/Notice.php:305 classes/Notice.php:330 msgid "Problem saving notice." msgstr "Er is een probleem opgetreden bij het opslaan van de mededeling." -#: classes/Notice.php:1034 +#: classes/Notice.php:1052 #, php-format msgid "DB error inserting reply: %s" msgstr "" "Er is een databasefout opgetreden bij het invoegen van het antwoord: %s" -#: classes/Notice.php:1359 +#: classes/Notice.php:1423 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" -#: classes/User.php:368 +#: classes/User.php:382 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Welkom bij %1$s, @%2$s!" @@ -4200,6 +4481,11 @@ msgstr "Overige" msgid "Other options" msgstr "Overige instellingen" +#: lib/action.php:144 +#, php-format +msgid "%1$s - %2$s" +msgstr "%1$s - %2$s" + #: lib/action.php:159 msgid "Untitled page" msgstr "Naamloze pagina" @@ -4216,10 +4502,6 @@ msgstr "Start" msgid "Personal profile and friends timeline" msgstr "Persoonlijk profiel en tijdlijn van vrienden" -#: lib/action.php:435 -msgid "Account" -msgstr "Gebruiker" - #: lib/action.php:435 msgid "Change your email, avatar, password, profile" msgstr "Uw e-mailadres, avatar, wachtwoord of profiel wijzigen" @@ -4374,10 +4656,6 @@ msgstr "Later" msgid "Before" msgstr "Eerder" -#: lib/action.php:1167 -msgid "There was a problem with your session token." -msgstr "Er is een probleem met uw sessietoken." - #: lib/adminpanelaction.php:96 msgid "You cannot make changes to this site." msgstr "U mag geen wijzigingen maken aan deze website." @@ -4410,6 +4688,68 @@ msgstr "Instellingen vormgeving" msgid "Paths configuration" msgstr "Padinstellingen" +#: lib/applicationeditform.php:186 +msgid "Icon for this application" +msgstr "Icoon voor deze applicatie" + +#: lib/applicationeditform.php:206 +#, php-format +msgid "Describe your application in %d characters" +msgstr "Beschrijf uw applicatie in %d tekens" + +#: lib/applicationeditform.php:209 +msgid "Describe your application" +msgstr "Beschrijf uw applicatie" + +#: lib/applicationeditform.php:218 +msgid "Source URL" +msgstr "Bron-URL" + +#: lib/applicationeditform.php:220 +msgid "URL of the homepage of this application" +msgstr "De URL van de homepage van deze applicatie" + +#: lib/applicationeditform.php:226 +msgid "Organization responsible for this application" +msgstr "Organisatie verantwoordelijk voor deze applicatie" + +#: lib/applicationeditform.php:232 +msgid "URL for the homepage of the organization" +msgstr "De URL van de homepage van de organisatie" + +#: lib/applicationeditform.php:238 +msgid "URL to redirect to after authentication" +msgstr "URL om naar door te verwijzen na authenticatie" + +#: lib/applicationeditform.php:260 +msgid "Browser" +msgstr "Browser" + +#: lib/applicationeditform.php:276 +msgid "Desktop" +msgstr "Desktop" + +#: lib/applicationeditform.php:277 +msgid "Type of application, browser or desktop" +msgstr "Type applicatie; browser of desktop" + +#: lib/applicationeditform.php:299 +msgid "Read-only" +msgstr "Alleen-lezen" + +#: lib/applicationeditform.php:317 +msgid "Read-write" +msgstr "Lezen en schrijven" + +#: lib/applicationeditform.php:318 +msgid "Default access for this application: read-only, or read-write" +msgstr "" +"Standaardtoegang voor deze applicatie: alleen-lezen of lezen en schrijven" + +#: lib/applicationlist.php:154 +msgid "Revoke" +msgstr "Intrekken" + #: lib/attachmentlist.php:87 msgid "Attachments" msgstr "Bijlagen" @@ -4430,11 +4770,11 @@ msgstr "Mededelingen die deze bijlage bevatten" msgid "Tags for this attachment" msgstr "Labels voor deze bijlage" -#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 +#: lib/authenticationplugin.php:214 lib/authenticationplugin.php:219 msgid "Password changing failed" msgstr "Wachtwoord wijzigen is mislukt" -#: lib/authenticationplugin.php:197 +#: lib/authenticationplugin.php:229 msgid "Password changing is not allowed" msgstr "Wachtwoord wijzigen is niet toegestaan" @@ -4455,8 +4795,8 @@ msgid "Sorry, this command is not yet implemented." msgstr "Dit commando is nog niet geïmplementeerd." #: lib/command.php:88 -#, fuzzy, php-format -msgid "Could not find a user with nickname %s." +#, php-format +msgid "Could not find a user with nickname %s" msgstr "De gebruiker %s is niet aangetroffen" #: lib/command.php:92 @@ -4464,8 +4804,8 @@ 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 -#, fuzzy, php-format -msgid "Nudge sent to %s." +#, php-format +msgid "Nudge sent to %s" msgstr "De por naar %s is verzonden" #: lib/command.php:126 @@ -4479,176 +4819,193 @@ msgstr "" "Abonnees: %2$s\n" "Mededelingen: %3$s" -#: lib/command.php:152 lib/command.php:399 lib/command.php:460 -#, fuzzy -msgid "Notice with that id does not exist." +#: lib/command.php:152 lib/command.php:390 lib/command.php:451 +msgid "Notice with that id does not exist" msgstr "Er bestaat geen mededeling met dat ID" -#: lib/command.php:168 lib/command.php:415 lib/command.php:476 -#: lib/command.php:532 -#, fuzzy -msgid "User has no last notice." +#: lib/command.php:168 lib/command.php:406 lib/command.php:467 +#: lib/command.php:523 +msgid "User has no last notice" msgstr "Deze gebruiker heeft geen laatste mededeling" #: lib/command.php:190 msgid "Notice marked as fave." msgstr "De mededeling is op de favorietenlijst geplaatst." -#: lib/command.php:284 -#, fuzzy, php-format -msgid "Could not remove user %1$s to group %2$s." +#: lib/command.php:217 +msgid "You are already a member of that group" +msgstr "U bent al lid van deze groep" + +#: lib/command.php:231 +#, 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" + +#: lib/command.php:236 +#, php-format +msgid "%s joined group %s" +msgstr "%s is lid geworden van de groep %s" + +#: lib/command.php:275 +#, php-format +msgid "Could not remove user %s to group %s" msgstr "De gebruiker %s kon niet uit de groep %s verwijderd worden" -#: lib/command.php:318 +#: lib/command.php:280 +#, php-format +msgid "%s left group %s" +msgstr "%s heeft de groep %s verlaten" + +#: lib/command.php:309 #, php-format msgid "Fullname: %s" msgstr "Volledige naam: %s" -#: lib/command.php:321 +#: lib/command.php:312 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "Locatie: %s" -#: lib/command.php:324 +#: lib/command.php:315 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "Thuispagina: %s" -#: lib/command.php:327 +#: lib/command.php:318 #, php-format msgid "About: %s" msgstr "Over: %s" -#: lib/command.php:358 -#, fuzzy, php-format -msgid "Message too long - maximum is %1$d characters, you sent %2$d." +#: lib/command.php:349 +#, 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" -#: lib/command.php:376 -#, fuzzy, php-format -msgid "Direct message to %s sent." +#: lib/command.php:367 +#, php-format +msgid "Direct message to %s sent" msgstr "Het directe bericht aan %s is verzonden" -#: lib/command.php:378 +#: lib/command.php:369 msgid "Error sending direct message." msgstr "Er is een fout opgetreden bij het verzonden van het directe bericht." -#: lib/command.php:435 -#, fuzzy, php-format -msgid "Notice from %s repeated." +#: lib/command.php:413 +msgid "Cannot repeat your own notice" +msgstr "U kunt uw eigen mededelingen niet herhalen." + +#: lib/command.php:418 +msgid "Already repeated that notice" +msgstr "U hebt die mededeling al herhaald." + +#: lib/command.php:426 +#, php-format +msgid "Notice from %s repeated" msgstr "De mededeling van %s is herhaald" -#: lib/command.php:437 +#: lib/command.php:428 msgid "Error repeating notice." msgstr "Er is een fout opgetreden bij het herhalen van de mededeling." -#: lib/command.php:491 -#, fuzzy, php-format -msgid "Notice too long - maximum is %1$d characters, you sent %2$d." +#: lib/command.php:482 +#, 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" -#: lib/command.php:500 -#, fuzzy, php-format -msgid "Reply to %s sent." +#: lib/command.php:491 +#, php-format +msgid "Reply to %s sent" msgstr "Het antwoord aan %s is verzonden" -#: lib/command.php:502 +#: lib/command.php:493 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." +#: lib/command.php:547 +msgid "Specify the name of the user to subscribe to" msgstr "Geef de naam op van de gebruiker waarop u wilt abonneren" -#: lib/command.php:563 +#: lib/command.php:554 #, php-format msgid "Subscribed to %s" msgstr "Geabonneerd op %s" -#: lib/command.php:584 -#, fuzzy -msgid "Specify the name of the user to unsubscribe from." +#: lib/command.php:575 +msgid "Specify the name of the user to unsubscribe from" msgstr "" "Geef de naam op van de gebruiker waarvoor u het abonnement wilt opzeggen" -#: lib/command.php:591 +#: lib/command.php:582 #, php-format msgid "Unsubscribed from %s" msgstr "Uw abonnement op %s is opgezegd" -#: lib/command.php:609 lib/command.php:632 +#: lib/command.php:600 lib/command.php:623 msgid "Command not yet implemented." msgstr "Dit commando is nog niet geïmplementeerd." -#: lib/command.php:612 +#: lib/command.php:603 msgid "Notification off." msgstr "Notificaties uitgeschakeld." -#: lib/command.php:614 +#: lib/command.php:605 msgid "Can't turn off notification." msgstr "Het is niet mogelijk de mededelingen uit te schakelen." -#: lib/command.php:635 +#: lib/command.php:626 msgid "Notification on." msgstr "Notificaties ingeschakeld." -#: lib/command.php:637 +#: lib/command.php:628 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." +#: lib/command.php:641 +msgid "Login command is disabled" msgstr "Het aanmeldcommando is uitgeschakeld" -#: lib/command.php:664 -#, fuzzy, php-format -msgid "Could not create login token for %s." -msgstr "Het was niet mogelijk een aanmeldtoken aan te maken voor %s" - -#: lib/command.php:669 -#, fuzzy, php-format -msgid "This link is useable only once, and is good for only 2 minutes: %s." +#: lib/command.php:652 +#, 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" -#: lib/command.php:685 +#: lib/command.php:668 msgid "You are not subscribed to anyone." msgstr "U bent op geen enkele gebruiker geabonneerd." -#: lib/command.php:687 +#: lib/command.php:670 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:690 msgid "No one is subscribed to you." msgstr "Niemand heeft een abonnenment op u." -#: lib/command.php:709 +#: lib/command.php:692 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:712 msgid "You are not a member of any groups." msgstr "U bent lid van geen enkele groep." -#: lib/command.php:731 +#: lib/command.php:714 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:728 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4728,20 +5085,20 @@ msgstr "" "tracks - nog niet beschikbaar\n" "tracking - nog niet beschikbaar\n" -#: lib/common.php:199 +#: lib/common.php:131 msgid "No configuration file found. " msgstr "Er is geen instellingenbestand aangetroffen. " -#: lib/common.php:200 +#: lib/common.php:132 msgid "I looked for configuration files in the following places: " msgstr "Er is gezocht naar instellingenbestanden op de volgende plaatsen: " -#: lib/common.php:201 +#: lib/common.php:134 msgid "You may wish to run the installer to fix this." msgstr "" "U kunt proberen de installer uit te voeren om dit probleem op te lossen." -#: lib/common.php:202 +#: lib/common.php:135 msgid "Go to the installer." msgstr "Naar het installatieprogramma gaan." @@ -4757,6 +5114,14 @@ msgstr "Updates via instant messenger (IM)" msgid "Updates by SMS" msgstr "Updates via SMS" +#: lib/connectsettingsaction.php:120 +msgid "Connections" +msgstr "Verbindingen" + +#: lib/connectsettingsaction.php:121 +msgid "Authorized connected applications" +msgstr "Geautoriseerde verbonden applicaties" + #: lib/dberroraction.php:60 msgid "Database error" msgstr "Databasefout" @@ -4943,11 +5308,16 @@ msgstr "MB" msgid "kB" msgstr "kB" -#: lib/jabber.php:191 +#: lib/jabber.php:202 #, php-format msgid "[%s]" msgstr "[%s]" +#: lib/jabber.php:385 +#, php-format +msgid "Unknown inbox source %d." +msgstr "Onbekende bron Postvak IN %d." + #: lib/joinform.php:114 msgid "Join" msgstr "Toetreden" @@ -5028,24 +5398,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 @@ -5260,9 +5616,9 @@ msgid "Sorry, no incoming email allowed." msgstr "Inkomende e-mail is niet toegestaan." #: lib/mailhandler.php:228 -#, fuzzy, php-format +#, php-format msgid "Unsupported message type: %s" -msgstr "Niet ondersteund beeldbestandsformaat." +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." @@ -5301,16 +5657,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 @@ -5319,7 +5675,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 @@ -5352,17 +5708,20 @@ msgid "Attach a file" msgstr "Bestand toevoegen" #: lib/noticeform.php:212 -#, fuzzy -msgid "Share my location." +msgid "Share my location" msgstr "Mijn locatie bekend maken" -#: lib/noticeform.php:214 -msgid "Do not share my location." -msgstr "Mijn locatie niet bekend maken." - #: lib/noticeform.php:215 -msgid "Hide this info" -msgstr "Deze informatie verbergen" +msgid "Do not share my location" +msgstr "Mijn locatie niet bekend maken" + +#: lib/noticeform.php:216 +msgid "" +"Sorry, retrieving your geo location is taking longer than expected, please " +"try again later" +msgstr "" +"Het ophalen van uw geolocatie duurt langer dan verwacht. Probeer het later " +"nog eens" #: lib/noticelist.php:428 #, php-format @@ -5622,23 +5981,23 @@ msgstr "U bent al gebonneerd!" msgid "User has blocked you." msgstr "Deze gebruiker negeert u." -#: lib/subs.php:60 +#: lib/subs.php:63 msgid "Could not subscribe." msgstr "Kan niet abonneren " -#: lib/subs.php:79 +#: lib/subs.php:82 msgid "Could not subscribe other to you." msgstr "Het was niet mogelijk om een ander op u te laten abonneren" -#: lib/subs.php:128 +#: lib/subs.php:137 msgid "Not subscribed!" msgstr "Niet geabonneerd!" -#: lib/subs.php:133 +#: lib/subs.php:142 msgid "Couldn't delete self-subscription." msgstr "Het was niet mogelijk het abonnement op uzelf te verwijderen." -#: lib/subs.php:146 +#: lib/subs.php:158 msgid "Couldn't delete subscription." msgstr "Kon abonnement niet verwijderen." @@ -5652,10 +6011,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" @@ -5716,47 +6071,47 @@ msgstr "Bericht" msgid "Moderate" msgstr "Modereren" -#: lib/util.php:837 +#: lib/util.php:875 msgid "a few seconds ago" msgstr "een paar seconden geleden" -#: lib/util.php:839 +#: lib/util.php:877 msgid "about a minute ago" msgstr "ongeveer een minuut geleden" -#: lib/util.php:841 +#: lib/util.php:879 #, php-format msgid "about %d minutes ago" msgstr "ongeveer %d minuten geleden" -#: lib/util.php:843 +#: lib/util.php:881 msgid "about an hour ago" msgstr "ongeveer een uur geleden" -#: lib/util.php:845 +#: lib/util.php:883 #, php-format msgid "about %d hours ago" msgstr "ongeveer %d uur geleden" -#: lib/util.php:847 +#: lib/util.php:885 msgid "about a day ago" msgstr "ongeveer een dag geleden" -#: lib/util.php:849 +#: lib/util.php:887 #, php-format msgid "about %d days ago" msgstr "ongeveer %d dagen geleden" -#: lib/util.php:851 +#: lib/util.php:889 msgid "about a month ago" msgstr "ongeveer een maand geleden" -#: lib/util.php:853 +#: lib/util.php:891 #, php-format msgid "about %d months ago" msgstr "ongeveer %d maanden geleden" -#: lib/util.php:855 +#: lib/util.php:893 msgid "about a year ago" msgstr "ongeveer een jaar geleden" @@ -5772,7 +6127,7 @@ msgstr "%s is geen geldige kleur. Gebruik drie of zes hexadecimale tekens." #: scripts/xmppdaemon.php:301 #, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" -"Het bericht te is lang. De maximale lengte is %d tekens. De lengte van uw " -"bericht was %d" +"Het bericht te is lang. De maximale lengte is %1$d tekens. De lengte van uw " +"bericht was %2$d." diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po index 3c4411080d..6ea81a38ee 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-10 00:46+0000\n" -"PO-Revision-Date: 2010-01-10 00:48:37+0000\n" +"POT-Creation-Date: 2010-01-15 19:15+0000\n" +"PO-Revision-Date: 2010-01-15 19:17:38+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 (r60878); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r61101); 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" @@ -33,25 +33,30 @@ msgstr "Dette emneord finst ikkje." #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 +#: actions/apistatusesupdate.php:149 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 #: 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 #: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 -#: lib/command.php:163 lib/command.php:311 lib/command.php:364 -#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/command.php:163 lib/command.php:302 lib/command.php:355 +#: lib/command.php:401 lib/command.php:462 lib/command.php:518 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/subs.php:34 lib/subs.php:125 msgid "No such user." msgstr "Brukaren finst ikkje." +#: actions/all.php:84 +#, fuzzy, php-format +msgid "%1$s and friends, page %2$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 +#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -104,7 +109,7 @@ msgstr "" msgid "You and friends" msgstr "%s med vener" -#: actions/allrss.php:119 actions/apitimelinefriends.php:122 +#: actions/allrss.php:119 actions/apitimelinefriends.php:121 #: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" @@ -115,6 +120,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:155 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." @@ -129,7 +151,7 @@ msgstr "Fann ikkje API-metode." #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:114 +#: actions/apistatusesupdate.php:119 msgid "This method requires a POST." msgstr "Dette krev ein POST." @@ -160,8 +182,9 @@ msgstr "Kan ikkje lagra profil." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257 -#: actions/designadminpanel.php:122 actions/newnotice.php:94 +#: actions/apistatusesupdate.php:132 actions/avatarsettings.php:257 +#: actions/designadminpanel.php:122 actions/editapplication.php:118 +#: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format msgid "" @@ -173,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 #, fuzzy msgid "Unable to save your design settings." msgstr "Klarte ikkje Ã¥ lagra Twitter-innstillingane dine!" @@ -216,26 +242,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!" @@ -260,7 +266,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 @@ -269,7 +275,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 @@ -291,8 +297,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." @@ -326,7 +333,8 @@ msgstr "Kallenamnet er allereie i bruk. Prøv eit anna." msgid "Not a valid nickname." msgstr "Ikkje eit gyldig brukarnamn." -#: actions/apigroupcreate.php:196 actions/editgroup.php:195 +#: actions/apigroupcreate.php:196 actions/editapplication.php:212 +#: actions/editgroup.php:195 actions/newapplication.php:200 #: actions/newgroup.php:139 actions/profilesettings.php:222 #: actions/register.php:217 msgid "Homepage is not a valid URL." @@ -338,7 +346,8 @@ msgstr "Heimesida er ikkje ei gyldig internettadresse." msgid "Full name is too long (max 255 chars)." msgstr "Ditt fulle namn er for langt (maksimalt 255 teikn)." -#: actions/apigroupcreate.php:213 +#: actions/apigroupcreate.php:213 actions/editapplication.php:187 +#: actions/newapplication.php:169 #, fuzzy, php-format msgid "Description is too long (max %d chars)." msgstr "skildringa er for lang (maks 140 teikn)." @@ -379,7 +388,7 @@ msgstr "" msgid "Group not found!" msgstr "Fann ikkje API-metode." -#: actions/apigroupjoin.php:110 lib/command.php:217 +#: 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" @@ -388,7 +397,7 @@ msgstr "Du er allereie medlem av den gruppa" msgid "You have been blocked from that group by the admin." msgstr "" -#: actions/apigroupjoin.php:138 lib/command.php:234 +#: actions/apigroupjoin.php:138 actions/joingroup.php:124 #, fuzzy, php-format msgid "Could not join user %1$s to group %2$s." msgstr "Kunne ikkje melde brukaren %s inn i gruppa %s" @@ -398,7 +407,7 @@ 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/leavegroup.php:127 +#: actions/apigroupleave.php:124 actions/leavegroup.php:119 #, fuzzy, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "Kunne ikkje fjerne %s fra %s gruppa " @@ -418,6 +427,101 @@ msgstr "%s grupper" msgid "groups on %s" msgstr "Gruppe handlingar" +#: actions/apioauthauthorize.php:108 actions/apioauthauthorize.php:114 +msgid "Bad request." +msgstr "" + +#: actions/apioauthauthorize.php:134 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:115 actions/makeadmin.php:66 +#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 +#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:139 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 +#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/subscribe.php:46 actions/tagother.php:166 +#: 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 "Der var eit problem med sesjonen din. Vennlegst prøv pÃ¥ nytt." + +#: actions/apioauthauthorize.php:146 +#, fuzzy +msgid "Invalid nickname / password!" +msgstr "Ugyldig brukarnamn eller passord." + +#: actions/apioauthauthorize.php:170 +#, fuzzy +msgid "DB error deleting OAuth app user." +msgstr "Feil ved Ã¥ setja brukar." + +#: actions/apioauthauthorize.php:196 +#, fuzzy +msgid "DB error inserting OAuth app user." +msgstr "databasefeil ved innsetjing av skigardmerkelapp (#merkelapp): %s" + +#: actions/apioauthauthorize.php:231 +#, php-format +msgid "" +"The request token %s has been authorized. Please exchange it for an access " +"token." +msgstr "" + +#: actions/apioauthauthorize.php:241 +#, php-format +msgid "The request token %s has been denied." +msgstr "" + +#: actions/apioauthauthorize.php:246 actions/avatarsettings.php:281 +#: actions/designadminpanel.php:103 actions/editapplication.php:139 +#: actions/emailsettings.php:256 actions/grouplogo.php:319 +#: actions/imsettings.php:220 actions/newapplication.php:121 +#: actions/oauthconnectionssettings.php:151 actions/recoverpassword.php:44 +#: actions/smssettings.php:248 lib/designsettings.php:304 +msgid "Unexpected form submission." +msgstr "Uventa skjemasending." + +#: actions/apioauthauthorize.php:273 +msgid "An application would like to connect to your account" +msgstr "" + +#: actions/apioauthauthorize.php:290 +msgid "Allow or deny access" +msgstr "" + +#: actions/apioauthauthorize.php:320 lib/action.php:435 +msgid "Account" +msgstr "Konto" + +#: actions/apioauthauthorize.php:323 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/apioauthauthorize.php:326 actions/login.php:233 +#: actions/register.php:429 lib/accountsettingsaction.php:116 +msgid "Password" +msgstr "Passord" + +#: actions/apioauthauthorize.php:338 +msgid "Deny" +msgstr "" + +#: actions/apioauthauthorize.php:344 +#, fuzzy +msgid "Allow" +msgstr "Alle" + +#: actions/apioauthauthorize.php:361 +msgid "Allow or deny access to your account information." +msgstr "" + #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." msgstr "Dette krev anten ein POST eller DELETE." @@ -431,12 +535,12 @@ msgstr "Du kan ikkje sletta statusen til ein annan brukar." msgid "No such notice." msgstr "Denne notisen finst ikkje." -#: actions/apistatusesretweet.php:83 lib/command.php:422 +#: actions/apistatusesretweet.php:83 #, fuzzy msgid "Cannot repeat your own notice." msgstr "Kan ikkje slÃ¥ pÃ¥ notifikasjon." -#: actions/apistatusesretweet.php:91 lib/command.php:427 +#: actions/apistatusesretweet.php:91 #, fuzzy msgid "Already repeated that notice." msgstr "Slett denne notisen" @@ -450,17 +554,17 @@ msgstr "Lasta opp brukarbilete." msgid "No status with that ID found." msgstr "Fann ingen status med den ID-en." -#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:162 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Det er for langt! Ein notis kan berre innehalde 140 teikn." -#: actions/apistatusesupdate.php:198 +#: actions/apistatusesupdate.php:203 msgid "Not found" msgstr "Fann ikkje" -#: actions/apistatusesupdate.php:221 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:226 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -546,8 +650,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." @@ -570,8 +677,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" @@ -603,29 +710,6 @@ 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/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 -#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 -#: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 -#: actions/subscribe.php:46 actions/tagother.php:166 -#: 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 "Der var eit problem med sesjonen din. Vennlegst prøv pÃ¥ nytt." - -#: actions/avatarsettings.php:281 actions/designadminpanel.php:103 -#: actions/emailsettings.php:256 actions/grouplogo.php:319 -#: actions/imsettings.php:220 actions/recoverpassword.php:44 -#: actions/smssettings.php:248 lib/designsettings.php:304 -msgid "Unexpected form submission." -msgstr "Uventa skjemasending." - #: actions/avatarsettings.php:328 msgid "Pick a square area of the image to be your avatar" msgstr "Velg eit utvalg av bildet som vil blir din avatar." @@ -687,19 +771,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:260 +msgid "No such group." +msgstr "Denne gruppa finst ikkje." #: actions/blockedfromgroup.php:90 #, fuzzy, php-format @@ -769,7 +849,8 @@ msgid "Couldn't delete email confirmation." msgstr "Kan ikkje sletta e-postgodkjenning." #: actions/confirmaddress.php:144 -msgid "Confirm Address" +#, fuzzy +msgid "Confirm address" msgstr "Stadfest adresse" #: actions/confirmaddress.php:159 @@ -827,11 +908,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." @@ -975,7 +1051,8 @@ msgstr "" #: actions/pathsadminpanel.php:324 actions/profilesettings.php:174 #: actions/siteadminpanel.php:388 actions/smssettings.php:181 #: actions/subscriptions.php:203 actions/tagother.php:154 -#: actions/useradminpanel.php:313 lib/designsettings.php:256 +#: actions/useradminpanel.php:313 lib/applicationeditform.php:335 +#: lib/applicationeditform.php:336 lib/designsettings.php:256 #: lib/groupeditform.php:202 msgid "Save" msgstr "Lagra" @@ -996,6 +1073,86 @@ msgstr "Legg til i favorittar" msgid "No such document." msgstr "Slikt dokument finst ikkje." +#: actions/editapplication.php:54 lib/applicationeditform.php:136 +msgid "Edit application" +msgstr "" + +#: actions/editapplication.php:66 +#, fuzzy +msgid "You must be logged in to edit an application." +msgstr "Du mÃ¥ være logga inn for Ã¥ lage ei gruppe." + +#: actions/editapplication.php:77 actions/showapplication.php:94 +#, fuzzy +msgid "You are not the owner of this application." +msgstr "Du er ikkje medlem av den gruppa." + +#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:163 +#: actions/showapplication.php:87 +#, fuzzy +msgid "No such application." +msgstr "Denne notisen finst ikkje." + +#: actions/editapplication.php:127 actions/newapplication.php:110 +#: actions/showapplication.php:118 lib/action.php:1167 +msgid "There was a problem with your session token." +msgstr "Det var eit problem med sesjons billetten din." + +#: actions/editapplication.php:161 +#, fuzzy +msgid "Use this form to edit your application." +msgstr "Bruk dette skjemaet for Ã¥ redigere gruppa" + +#: actions/editapplication.php:177 actions/newapplication.php:159 +#, fuzzy +msgid "Name is required." +msgstr "Samme som passord over. PÃ¥krevd." + +#: actions/editapplication.php:180 actions/newapplication.php:162 +#, fuzzy +msgid "Name is too long (max 255 chars)." +msgstr "Ditt fulle namn er for langt (maksimalt 255 teikn)." + +#: actions/editapplication.php:183 actions/newapplication.php:165 +#, fuzzy +msgid "Description is required." +msgstr "Beskriving" + +#: actions/editapplication.php:191 +msgid "Source URL is too long." +msgstr "" + +#: actions/editapplication.php:197 actions/newapplication.php:182 +#, fuzzy +msgid "Source URL is not valid." +msgstr "Heimesida er ikkje ei gyldig internettadresse." + +#: actions/editapplication.php:200 actions/newapplication.php:185 +msgid "Organization is required." +msgstr "" + +#: actions/editapplication.php:203 actions/newapplication.php:188 +#, fuzzy +msgid "Organization is too long (max 255 chars)." +msgstr "Plassering er for lang (maksimalt 255 teikn)." + +#: actions/editapplication.php:206 actions/newapplication.php:191 +msgid "Organization homepage is required." +msgstr "" + +#: actions/editapplication.php:215 actions/newapplication.php:203 +msgid "Callback is too long." +msgstr "" + +#: actions/editapplication.php:222 actions/newapplication.php:212 +msgid "Callback URL is not valid." +msgstr "" + +#: actions/editapplication.php:255 +#, fuzzy +msgid "Could not update application." +msgstr "Kann ikkje oppdatera gruppa." + #: actions/editgroup.php:56 #, php-format msgid "Edit %s group" @@ -1007,7 +1164,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 @@ -1033,7 +1191,8 @@ msgid "Options saved." msgstr "Lagra innstillingar." #: actions/emailsettings.php:60 -msgid "Email Settings" +#, fuzzy +msgid "Email settings" msgstr "Epostinnstillingar" #: actions/emailsettings.php:71 @@ -1065,13 +1224,15 @@ msgstr "" "med instruksjonar." #: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 +#: actions/smssettings.php:126 lib/applicationeditform.php:333 +#: lib/applicationeditform.php:334 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\"" @@ -1146,9 +1307,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." @@ -1332,13 +1494,6 @@ 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:79 #, fuzzy msgid "No such file." @@ -1357,7 +1512,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." @@ -1408,8 +1563,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 @@ -1434,13 +1590,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." @@ -1456,6 +1605,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." @@ -1581,7 +1735,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 @@ -1612,7 +1767,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 @@ -1708,7 +1864,7 @@ 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 lib/command.php:315 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -1754,7 +1910,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:234 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236 msgid "Send" msgstr "Send" @@ -1819,16 +1975,7 @@ 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 -msgid "You are already a member of that group" -msgstr "Du er allereie medlem av den gruppa" - -#: actions/joingroup.php:128 -#, fuzzy, php-format -msgid "Could not join user %1$s to group %2$s" -msgstr "Kunne ikkje melde brukaren %s inn i gruppa %s" - -#: actions/joingroup.php:135 lib/command.php:239 +#: actions/joingroup.php:131 #, fuzzy, php-format msgid "%1$s joined group %2$s" msgstr "%s blei medlem av gruppe %s" @@ -1837,70 +1984,50 @@ msgstr "%s blei medlem av gruppe %s" msgid "You must be logged in to leave a group." msgstr "Du mÃ¥ være innlogga for Ã¥ melde deg ut av ei gruppe." -#: actions/leavegroup.php:90 lib/command.php:268 +#: actions/leavegroup.php:90 lib/command.php:265 msgid "You are not a member of that group." msgstr "Du er ikkje medlem av den gruppa." -#: actions/leavegroup.php:119 lib/command.php:278 -msgid "Could not find membership record." -msgstr "Kan ikkje finne brukar." - -#: actions/leavegroup.php:134 lib/command.php:289 +#: actions/leavegroup.php:127 #, 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:460 +#: 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 -#: lib/groupeditform.php:152 lib/userprofile.php:131 -msgid "Nickname" -msgstr "Kallenamn" - -#: actions/login.php:253 actions/register.php:428 -#: 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." @@ -1908,7 +2035,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]" @@ -1928,19 +2055,42 @@ 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 %1$s in group %2$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 #, fuzzy, php-format -msgid "Can't make %1$s an admin for group %2$s" +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" msgstr "Ingen status" +#: actions/newapplication.php:52 +msgid "New application" +msgstr "" + +#: actions/newapplication.php:64 +#, fuzzy +msgid "You must be logged in to register an application." +msgstr "Du mÃ¥ være logga inn for Ã¥ lage ei gruppe." + +#: actions/newapplication.php:143 +#, fuzzy +msgid "Use this form to register a new application." +msgstr "Bruk dette skjemaet for Ã¥ lage ein ny gruppe." + +#: actions/newapplication.php:173 +msgid "Source URL is required." +msgstr "" + +#: actions/newapplication.php:255 actions/newapplication.php:264 +#, fuzzy +msgid "Could not create application." +msgstr "Kunne ikkje lagre favoritt." + #: actions/newgroup.php:53 msgid "New group" msgstr "Ny gruppe" @@ -1953,12 +2103,12 @@ msgstr "Bruk dette skjemaet for Ã¥ lage ein ny gruppe." msgid "New message" msgstr "Ny melding" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 msgid "You can't send a message to this user." msgstr "Du kan ikkje sende melding til denne brukaren." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:484 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 +#: lib/command.php:475 msgid "No content!" msgstr "Ingen innhald." @@ -1966,7 +2116,7 @@ msgstr "Ingen innhald." msgid "No recipient specified." msgstr "Ingen mottakar spesifisert." -#: actions/newmessage.php:164 lib/command.php:370 +#: actions/newmessage.php:164 lib/command.php:361 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -1979,8 +2129,8 @@ msgid "Message sent" msgstr "Melding" #: actions/newmessage.php:185 -#, php-format -msgid "Direct message to %s sent" +#, fuzzy, php-format +msgid "Direct message to %s sent." msgstr "Direkte melding til %s sendt" #: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 @@ -2052,6 +2202,51 @@ msgstr "Dytta!" msgid "Nudge sent!" msgstr "Dytta!" +#: actions/oauthappssettings.php:59 +#, fuzzy +msgid "You must be logged in to list your applications." +msgstr "Du mÃ¥ være logga inn for Ã¥ lage ei gruppe." + +#: actions/oauthappssettings.php:74 +#, fuzzy +msgid "OAuth applications" +msgstr "Andre val" + +#: actions/oauthappssettings.php:85 +msgid "Applications you have registered" +msgstr "" + +#: actions/oauthappssettings.php:135 +#, php-format +msgid "You have not registered any applications yet." +msgstr "" + +#: actions/oauthconnectionssettings.php:71 +msgid "Connected applications" +msgstr "" + +#: actions/oauthconnectionssettings.php:87 +msgid "You have allowed the following applications to access you account." +msgstr "" + +#: actions/oauthconnectionssettings.php:170 +#, fuzzy +msgid "You are not a user of that application." +msgstr "Du er ikkje medlem av den gruppa." + +#: actions/oauthconnectionssettings.php:180 +msgid "Unable to revoke access for app: " +msgstr "" + +#: actions/oauthconnectionssettings.php:192 +#, php-format +msgid "You have not authorized any applications to use your account." +msgstr "" + +#: actions/oauthconnectionssettings.php:205 +msgid "Developers can edit the registration settings for their applications " +msgstr "" + #: actions/oembed.php:79 actions/shownotice.php:100 msgid "Notice has no profile" msgstr "Notisen har ingen profil" @@ -2070,8 +2265,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:1038 +#: lib/api.php:1066 lib/api.php:1176 msgid "Not a supported data format." msgstr "Ikkje eit støtta dataformat." @@ -2084,7 +2279,8 @@ msgid "Notice Search" msgstr "Notissøk" #: actions/othersettings.php:60 -msgid "Other Settings" +#, fuzzy +msgid "Other settings" msgstr "Andre innstillingar" #: actions/othersettings.php:71 @@ -2116,6 +2312,31 @@ msgstr "" msgid "URL shortening service is too long (max 50 chars)." msgstr "Adressa til forkortingstenesta er for lang (maksimalt 50 teikn)." +#: 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 msgid "Outbox for %s" @@ -2150,7 +2371,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" @@ -2321,8 +2542,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" @@ -2385,43 +2607,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 -#: lib/groupeditform.php:161 +#: actions/profilesettings.php:115 actions/register.php:453 +#: lib/applicationeditform.php:230 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»" @@ -2723,7 +2945,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." @@ -2736,7 +2958,7 @@ msgstr "Feil med stadfestingskode." msgid "Registration successful" msgstr "Registreringa gikk bra" -#: actions/register.php:114 actions/register.php:502 lib/action.php:457 +#: actions/register.php:114 actions/register.php:503 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Registrér" @@ -2749,61 +2971,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 " @@ -2812,7 +3030,7 @@ msgstr "" " unnateke privatdata: passord, epostadresse, ljonmeldingsadresse og " "telefonnummer." -#: actions/register.php:537 +#: actions/register.php:538 #, fuzzy, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -2844,7 +3062,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.)" @@ -3000,6 +3218,84 @@ msgstr "Du kan ikkje sende melding til denne brukaren." msgid "User is already sandboxed." msgstr "Brukar har blokkert deg." +#: actions/showapplication.php:82 +#, fuzzy +msgid "You must be logged in to view an application." +msgstr "Du mÃ¥ være innlogga for Ã¥ melde deg ut av ei gruppe." + +#: actions/showapplication.php:158 +#, fuzzy +msgid "Application profile" +msgstr "Notisen har ingen profil" + +#: actions/showapplication.php:160 lib/applicationeditform.php:182 +msgid "Icon" +msgstr "" + +#: actions/showapplication.php:170 actions/version.php:195 +#: lib/applicationeditform.php:197 +#, fuzzy +msgid "Name" +msgstr "Kallenamn" + +#: actions/showapplication.php:179 lib/applicationeditform.php:224 +#, fuzzy +msgid "Organization" +msgstr "Paginering" + +#: actions/showapplication.php:188 actions/version.php:198 +#: lib/applicationeditform.php:211 lib/groupeditform.php:172 +msgid "Description" +msgstr "Beskriving" + +#: actions/showapplication.php:193 actions/showgroup.php:429 +#: lib/profileaction.php:174 +msgid "Statistics" +msgstr "Statistikk" + +#: actions/showapplication.php:204 +#, php-format +msgid "created by %1$s - %2$s access by default - %3$d users" +msgstr "" + +#: actions/showapplication.php:214 +msgid "Application actions" +msgstr "" + +#: actions/showapplication.php:233 +msgid "Reset key & secret" +msgstr "" + +#: actions/showapplication.php:241 +msgid "Application info" +msgstr "" + +#: actions/showapplication.php:243 +msgid "Consumer key" +msgstr "" + +#: actions/showapplication.php:248 +msgid "Consumer secret" +msgstr "" + +#: actions/showapplication.php:253 +msgid "Request token URL" +msgstr "" + +#: actions/showapplication.php:258 +msgid "Access token URL" +msgstr "" + +#: actions/showapplication.php:263 +msgid "Authorize URL" +msgstr "" + +#: actions/showapplication.php:268 +msgid "" +"Note: We support HMAC-SHA1 signatures. We do not support the plaintext " +"signature method." +msgstr "" + #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "Kunne ikkje hente fram favorittane." @@ -3097,7 +3393,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)" @@ -3105,10 +3401,6 @@ msgstr "(Ingen)" msgid "All members" msgstr "Alle medlemmar" -#: actions/showgroup.php:429 lib/profileaction.php:174 -msgid "Statistics" -msgstr "Statistikk" - #: actions/showgroup.php:432 #, fuzzy msgid "Created" @@ -3255,12 +3547,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 @@ -3451,7 +3743,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 @@ -3481,7 +3774,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 @@ -3734,10 +4028,6 @@ 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" @@ -3946,11 +4236,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" @@ -4029,11 +4314,6 @@ msgstr "" msgid "Plugins" msgstr "" -#: actions/version.php:195 -#, fuzzy -msgid "Name" -msgstr "Kallenamn" - #: actions/version.php:196 lib/action.php:741 #, fuzzy msgid "Version" @@ -4043,27 +4323,43 @@ msgstr "Personleg" msgid "Author(s)" msgstr "" -#: actions/version.php:198 lib/groupeditform.php:172 -msgid "Description" -msgstr "Beskriving" - -#: classes/File.php:137 +#: 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/Group_member.php:41 +#, fuzzy +msgid "Group join failed." +msgstr "Gruppe profil" + +#: classes/Group_member.php:53 +#, fuzzy +msgid "Not part of group." +msgstr "Kann ikkje oppdatera gruppa." + +#: classes/Group_member.php:60 +#, fuzzy +msgid "Group leave failed." +msgstr "Gruppe profil" + +#: 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." @@ -4077,27 +4373,27 @@ msgstr "Kunne ikkje lagre melding." msgid "Could not update message with new URI." msgstr "Kunne ikkje oppdatere melding med ny URI." -#: classes/Notice.php:172 +#: classes/Notice.php:171 #, php-format msgid "DB error inserting hashtag: %s" msgstr "databasefeil ved innsetjing av skigardmerkelapp (#merkelapp): %s" -#: classes/Notice.php:226 +#: classes/Notice.php:225 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Eit problem oppstod ved lagring av notis." -#: classes/Notice.php:230 +#: classes/Notice.php:229 msgid "Problem saving notice. Unknown user." msgstr "Feil ved lagring av notis. Ukjend brukar." -#: classes/Notice.php:235 +#: classes/Notice.php:234 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "For mange notisar for raskt; tek ei pause, og prøv igjen om eit par minutt." -#: classes/Notice.php:241 +#: classes/Notice.php:240 #, fuzzy msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " @@ -4105,25 +4401,25 @@ msgid "" msgstr "" "For mange notisar for raskt; tek ei pause, og prøv igjen om eit par minutt." -#: classes/Notice.php:247 +#: classes/Notice.php:246 msgid "You are banned from posting notices on this site." msgstr "Du kan ikkje lengre legge inn notisar pÃ¥ denne sida." -#: classes/Notice.php:309 classes/Notice.php:334 +#: classes/Notice.php:305 classes/Notice.php:330 msgid "Problem saving notice." msgstr "Eit problem oppstod ved lagring av notis." -#: classes/Notice.php:1034 +#: classes/Notice.php:1052 #, php-format msgid "DB error inserting reply: %s" msgstr "Databasefeil, kan ikkje lagra svar: %s" -#: classes/Notice.php:1359 +#: classes/Notice.php:1423 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" -#: classes/User.php:368 +#: classes/User.php:382 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Melding til %1$s pÃ¥ %2$s" @@ -4165,6 +4461,11 @@ msgstr "Anna" msgid "Other options" msgstr "Andre val" +#: lib/action.php:144 +#, fuzzy, php-format +msgid "%1$s - %2$s" +msgstr "%1$s (%2$s)" + #: lib/action.php:159 msgid "Untitled page" msgstr "Ingen tittel" @@ -4181,10 +4482,6 @@ msgstr "Heim" msgid "Personal profile and friends timeline" msgstr "Personleg profil og oversyn over vener" -#: lib/action.php:435 -msgid "Account" -msgstr "Konto" - #: lib/action.php:435 msgid "Change your email, avatar, password, profile" msgstr "Endra e-posten, avataren, passordet eller profilen" @@ -4343,10 +4640,6 @@ msgstr "« Etter" msgid "Before" msgstr "Før »" -#: lib/action.php:1167 -msgid "There was a problem with your session token." -msgstr "Det var eit problem med sesjons billetten din." - #: lib/adminpanelaction.php:96 #, fuzzy msgid "You cannot make changes to this site." @@ -4387,6 +4680,72 @@ msgstr "SMS bekreftelse" msgid "Paths configuration" msgstr "SMS bekreftelse" +#: lib/applicationeditform.php:186 +msgid "Icon for this application" +msgstr "" + +#: lib/applicationeditform.php:206 +#, fuzzy, php-format +msgid "Describe your application in %d characters" +msgstr "Beskriv gruppa eller emnet med 140 teikn" + +#: lib/applicationeditform.php:209 +#, fuzzy +msgid "Describe your application" +msgstr "Beskriv gruppa eller emnet med 140 teikn" + +#: lib/applicationeditform.php:218 +#, fuzzy +msgid "Source URL" +msgstr "Kjeldekode" + +#: lib/applicationeditform.php:220 +#, fuzzy +msgid "URL of the homepage of this application" +msgstr "URL til heimesida eller bloggen for gruppa eller emnet" + +#: lib/applicationeditform.php:226 +msgid "Organization responsible for this application" +msgstr "" + +#: lib/applicationeditform.php:232 +#, fuzzy +msgid "URL for the homepage of the organization" +msgstr "URL til heimesida eller bloggen for gruppa eller emnet" + +#: lib/applicationeditform.php:238 +msgid "URL to redirect to after authentication" +msgstr "" + +#: lib/applicationeditform.php:260 +msgid "Browser" +msgstr "" + +#: lib/applicationeditform.php:276 +msgid "Desktop" +msgstr "" + +#: lib/applicationeditform.php:277 +msgid "Type of application, browser or desktop" +msgstr "" + +#: lib/applicationeditform.php:299 +msgid "Read-only" +msgstr "" + +#: lib/applicationeditform.php:317 +msgid "Read-write" +msgstr "" + +#: lib/applicationeditform.php:318 +msgid "Default access for this application: read-only, or read-write" +msgstr "" + +#: lib/applicationlist.php:154 +#, fuzzy +msgid "Revoke" +msgstr "Fjern" + #: lib/attachmentlist.php:87 msgid "Attachments" msgstr "" @@ -4408,12 +4767,12 @@ msgstr "" msgid "Tags for this attachment" msgstr "" -#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 +#: lib/authenticationplugin.php:214 lib/authenticationplugin.php:219 #, fuzzy msgid "Password changing failed" msgstr "Endra passord" -#: lib/authenticationplugin.php:197 +#: lib/authenticationplugin.php:229 #, fuzzy msgid "Password changing is not allowed" msgstr "Endra passord" @@ -4436,7 +4795,7 @@ msgstr "Orsak, men kommandoen er ikkje laga enno." #: lib/command.php:88 #, fuzzy, php-format -msgid "Could not find a user with nickname %s." +msgid "Could not find a user with nickname %s" msgstr "Kan ikkje oppdatera brukar med stadfesta e-postadresse." #: lib/command.php:92 @@ -4445,7 +4804,7 @@ msgstr "" #: lib/command.php:99 #, fuzzy, php-format -msgid "Nudge sent to %s." +msgid "Nudge sent to %s" msgstr "Dytta!" #: lib/command.php:126 @@ -4456,173 +4815,194 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:399 lib/command.php:460 +#: lib/command.php:152 lib/command.php:390 lib/command.php:451 #, fuzzy -msgid "Notice with that id does not exist." +msgid "Notice with that id does not exist" msgstr "Fann ingen profil med den IDen." -#: lib/command.php:168 lib/command.php:415 lib/command.php:476 -#: lib/command.php:532 -#, fuzzy -msgid "User has no last notice." +#: lib/command.php:168 lib/command.php:406 lib/command.php:467 +#: lib/command.php:523 +msgid "User has no last notice" msgstr "Brukaren har ikkje siste notis" #: lib/command.php:190 msgid "Notice marked as fave." msgstr "Notis markert som favoritt." -#: lib/command.php:284 -#, fuzzy, php-format -msgid "Could not remove user %1$s to group %2$s." +#: lib/command.php:217 +msgid "You are already a member of that group" +msgstr "Du er allereie medlem av den gruppa" + +#: lib/command.php:231 +#, php-format +msgid "Could not join user %s to group %s" +msgstr "Kunne ikkje melde brukaren %s inn i gruppa %s" + +#: lib/command.php:236 +#, php-format +msgid "%s joined group %s" +msgstr "%s blei medlem av gruppe %s" + +#: lib/command.php:275 +#, php-format +msgid "Could not remove user %s to group %s" msgstr "Kunne ikkje fjerne %s fra %s gruppa " -#: lib/command.php:318 +#: lib/command.php:280 +#, php-format +msgid "%s left group %s" +msgstr "%s forlot %s gruppa" + +#: lib/command.php:309 #, php-format msgid "Fullname: %s" msgstr "Fullt namn: %s" -#: lib/command.php:321 +#: lib/command.php:312 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "Stad: %s" -#: lib/command.php:324 +#: lib/command.php:315 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "Heimeside: %s" -#: lib/command.php:327 +#: lib/command.php:318 #, php-format msgid "About: %s" msgstr "Om: %s" -#: lib/command.php:358 +#: lib/command.php:349 #, fuzzy, php-format -msgid "Message too long - maximum is %1$d characters, you sent %2$d." +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." +#: lib/command.php:367 +#, php-format +msgid "Direct message to %s sent" msgstr "Direkte melding til %s sendt" -#: lib/command.php:378 +#: lib/command.php:369 msgid "Error sending direct message." msgstr "Ein feil oppstod ved sending av direkte melding." -#: lib/command.php:435 +#: lib/command.php:413 +#, fuzzy +msgid "Cannot repeat your own notice" +msgstr "Kan ikkje slÃ¥ pÃ¥ notifikasjon." + +#: lib/command.php:418 +#, fuzzy +msgid "Already repeated that notice" +msgstr "Slett denne notisen" + +#: lib/command.php:426 #, fuzzy, php-format -msgid "Notice from %s repeated." +msgid "Notice from %s repeated" msgstr "Melding lagra" -#: lib/command.php:437 +#: lib/command.php:428 #, fuzzy msgid "Error repeating notice." msgstr "Eit problem oppstod ved lagring av notis." -#: lib/command.php:491 +#: lib/command.php:482 #, fuzzy, php-format -msgid "Notice too long - maximum is %1$d characters, you sent %2$d." +msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Melding for lang - maksimum 140 teikn, du skreiv %d" -#: lib/command.php:500 +#: lib/command.php:491 #, fuzzy, php-format -msgid "Reply to %s sent." +msgid "Reply to %s sent" msgstr "Svar pÃ¥ denne notisen" -#: lib/command.php:502 +#: lib/command.php:493 #, fuzzy 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." +#: lib/command.php:547 +msgid "Specify the name of the user to subscribe to" msgstr "Spesifer namnet til brukaren du vil tinge" -#: lib/command.php:563 +#: lib/command.php:554 #, php-format msgid "Subscribed to %s" msgstr "Tingar %s" -#: lib/command.php:584 -#, fuzzy -msgid "Specify the name of the user to unsubscribe from." +#: lib/command.php:575 +msgid "Specify the name of the user to unsubscribe from" msgstr "Spesifer namnet til brukar du vil fjerne tinging pÃ¥" -#: lib/command.php:591 +#: lib/command.php:582 #, php-format msgid "Unsubscribed from %s" msgstr "Tingar ikkje %s lengre" -#: lib/command.php:609 lib/command.php:632 +#: lib/command.php:600 lib/command.php:623 msgid "Command not yet implemented." msgstr "Kommando ikkje implementert." -#: lib/command.php:612 +#: lib/command.php:603 msgid "Notification off." msgstr "Notifikasjon av." -#: lib/command.php:614 +#: lib/command.php:605 msgid "Can't turn off notification." msgstr "Kan ikkje skru av notifikasjon." -#: lib/command.php:635 +#: lib/command.php:626 msgid "Notification on." msgstr "Notifikasjon pÃ¥." -#: lib/command.php:637 +#: lib/command.php:628 msgid "Can't turn on notification." msgstr "Kan ikkje slÃ¥ pÃ¥ notifikasjon." -#: lib/command.php:650 -msgid "Login command is disabled." +#: lib/command.php:641 +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:652 #, php-format -msgid "This link is useable only once, and is good for only 2 minutes: %s." +msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:685 +#: lib/command.php:668 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Du tingar ikkje oppdateringar til den profilen." -#: lib/command.php:687 +#: lib/command.php:670 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:690 #, fuzzy msgid "No one is subscribed to you." msgstr "Kan ikkje tinga andre til deg." -#: lib/command.php:709 +#: lib/command.php:692 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:712 #, 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:714 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:728 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4663,20 +5043,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:199 +#: lib/common.php:131 #, fuzzy msgid "No configuration file found. " msgstr "Ingen stadfestingskode." -#: lib/common.php:200 +#: lib/common.php:132 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:201 +#: lib/common.php:134 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:202 +#: lib/common.php:135 #, fuzzy msgid "Go to the installer." msgstr "Logg inn or sida" @@ -4693,6 +5073,15 @@ msgstr "Oppdateringar over direktemeldingar (IM)" msgid "Updates by SMS" msgstr "Oppdateringar over SMS" +#: lib/connectsettingsaction.php:120 +#, fuzzy +msgid "Connections" +msgstr "Kopla til" + +#: lib/connectsettingsaction.php:121 +msgid "Authorized connected applications" +msgstr "" + #: lib/dberroraction.php:60 msgid "Database error" msgstr "" @@ -4880,11 +5269,16 @@ msgstr "" msgid "kB" msgstr "" -#: lib/jabber.php:191 +#: lib/jabber.php:202 #, php-format msgid "[%s]" msgstr "" +#: lib/jabber.php:385 +#, php-format +msgid "Unknown inbox source %d." +msgstr "" + #: lib/joinform.php:114 msgid "Join" msgstr "Bli med" @@ -4948,21 +5342,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" @@ -5159,7 +5541,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 @@ -5167,7 +5549,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 @@ -5177,7 +5560,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 @@ -5211,16 +5594,18 @@ msgstr "" #: lib/noticeform.php:212 #, fuzzy -msgid "Share my location." -msgstr "Kan ikkje lagra merkelapp." - -#: lib/noticeform.php:214 -#, fuzzy -msgid "Do not share my location." +msgid "Share my location" msgstr "Kan ikkje lagra merkelapp." #: lib/noticeform.php:215 -msgid "Hide this info" +#, fuzzy +msgid "Do not share my location" +msgstr "Kan ikkje lagra merkelapp." + +#: lib/noticeform.php:216 +msgid "" +"Sorry, retrieving your geo location is taking longer than expected, please " +"try again later" msgstr "" #: lib/noticelist.php:428 @@ -5497,25 +5882,25 @@ msgstr "" msgid "User has blocked you." msgstr "Brukar har blokkert deg." -#: lib/subs.php:60 +#: lib/subs.php:63 msgid "Could not subscribe." msgstr "Kan ikkje tinga." -#: lib/subs.php:79 +#: lib/subs.php:82 msgid "Could not subscribe other to you." msgstr "Kan ikkje tinga andre til deg." -#: lib/subs.php:128 +#: lib/subs.php:137 #, fuzzy msgid "Not subscribed!" msgstr "Ikkje tinga." -#: lib/subs.php:133 +#: lib/subs.php:142 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "Kan ikkje sletta tinging." -#: lib/subs.php:146 +#: lib/subs.php:158 msgid "Couldn't delete subscription." msgstr "Kan ikkje sletta tinging." @@ -5529,10 +5914,6 @@ msgstr "" msgid "People Tagcloud as tagged" msgstr "" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(ingen)" - #: lib/tagcloudsection.php:56 msgid "None" msgstr "Ingen" @@ -5597,47 +5978,47 @@ msgstr "Melding" msgid "Moderate" msgstr "" -#: lib/util.php:837 +#: lib/util.php:875 msgid "a few seconds ago" msgstr "eit par sekund sidan" -#: lib/util.php:839 +#: lib/util.php:877 msgid "about a minute ago" msgstr "omtrent eitt minutt sidan" -#: lib/util.php:841 +#: lib/util.php:879 #, php-format msgid "about %d minutes ago" msgstr "~%d minutt sidan" -#: lib/util.php:843 +#: lib/util.php:881 msgid "about an hour ago" msgstr "omtrent ein time sidan" -#: lib/util.php:845 +#: lib/util.php:883 #, php-format msgid "about %d hours ago" msgstr "~%d timar sidan" -#: lib/util.php:847 +#: lib/util.php:885 msgid "about a day ago" msgstr "omtrent ein dag sidan" -#: lib/util.php:849 +#: lib/util.php:887 #, php-format msgid "about %d days ago" msgstr "~%d dagar sidan" -#: lib/util.php:851 +#: lib/util.php:889 msgid "about a month ago" msgstr "omtrent ein mÃ¥nad sidan" -#: lib/util.php:853 +#: lib/util.php:891 #, php-format msgid "about %d months ago" msgstr "~%d mÃ¥nadar sidan" -#: lib/util.php:855 +#: lib/util.php:893 msgid "about a year ago" msgstr "omtrent eitt Ã¥r sidan" @@ -5653,5 +6034,5 @@ msgstr "" #: scripts/xmppdaemon.php:301 #, fuzzy, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "Melding for lang - maksimum 140 teikn, du skreiv %d" diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po index 247c239591..17f334cb40 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-10 00:46+0000\n" -"PO-Revision-Date: 2010-01-10 00:48:45+0000\n" +"POT-Creation-Date: 2010-01-15 19:15+0000\n" +"PO-Revision-Date: 2010-01-16 17:52:53+0000\n" "Last-Translator: Piotr DrÄ…g \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" @@ -19,7 +19,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" -"X-Generator: MediaWiki 1.16alpha (r60878); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r61138); 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" @@ -38,25 +38,30 @@ msgstr "Nie ma takiej strony" #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 +#: actions/apistatusesupdate.php:149 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 #: 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 #: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 -#: lib/command.php:163 lib/command.php:311 lib/command.php:364 -#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/command.php:163 lib/command.php:302 lib/command.php:355 +#: lib/command.php:401 lib/command.php:462 lib/command.php:518 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/subs.php:34 lib/subs.php:125 msgid "No such user." msgstr "Brak takiego użytkownika." +#: actions/all.php:84 +#, php-format +msgid "%1$s and friends, page %2$d" +msgstr "%1$s i przyjaciele, strona %2$d" + #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 +#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -95,14 +100,14 @@ msgstr "" "wysÅ‚ać coÅ› samemu." #: actions/all.php:134 -#, fuzzy, php-format +#, php-format msgid "" "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 @@ -117,7 +122,7 @@ msgstr "" msgid "You and friends" msgstr "Ty i przyjaciele" -#: actions/allrss.php:119 actions/apitimelinefriends.php:122 +#: actions/allrss.php:119 actions/apitimelinefriends.php:121 #: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" @@ -128,6 +133,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:155 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." @@ -141,7 +163,7 @@ msgstr "Nie odnaleziono metody API." #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:114 +#: actions/apistatusesupdate.php:119 msgid "This method requires a POST." msgstr "Ta metoda wymaga POST." @@ -171,8 +193,9 @@ msgstr "Nie można zapisać profilu." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257 -#: actions/designadminpanel.php:122 actions/newnotice.php:94 +#: actions/apistatusesupdate.php:132 actions/avatarsettings.php:257 +#: actions/designadminpanel.php:122 actions/editapplication.php:118 +#: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format msgid "" @@ -186,6 +209,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." @@ -226,26 +252,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." @@ -271,7 +277,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 @@ -279,7 +285,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 @@ -301,7 +307,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 @@ -334,7 +340,8 @@ msgstr "Pseudonim jest już używany. Spróbuj innego." msgid "Not a valid nickname." msgstr "To nie jest prawidÅ‚owy pseudonim." -#: actions/apigroupcreate.php:196 actions/editgroup.php:195 +#: actions/apigroupcreate.php:196 actions/editapplication.php:212 +#: actions/editgroup.php:195 actions/newapplication.php:200 #: actions/newgroup.php:139 actions/profilesettings.php:222 #: actions/register.php:217 msgid "Homepage is not a valid URL." @@ -346,7 +353,8 @@ msgstr "Strona domowa nie jest prawidÅ‚owym adresem URL." msgid "Full name is too long (max 255 chars)." msgstr "ImiÄ™ i nazwisko jest za dÅ‚ugie (maksymalnie 255 znaków)." -#: actions/apigroupcreate.php:213 +#: actions/apigroupcreate.php:213 actions/editapplication.php:187 +#: actions/newapplication.php:169 #, php-format msgid "Description is too long (max %d chars)." msgstr "Opis jest za dÅ‚ugi (maksymalnie %d znaków)." @@ -386,7 +394,7 @@ msgstr "Alias nie może być taki sam jak pseudonim." msgid "Group not found!" msgstr "Nie odnaleziono grupy." -#: actions/apigroupjoin.php:110 lib/command.php:217 +#: actions/apigroupjoin.php:110 actions/joingroup.php:90 msgid "You are already a member of that group." msgstr "JesteÅ› już czÅ‚onkiem tej grupy." @@ -394,19 +402,19 @@ 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 lib/command.php:234 -#, fuzzy, php-format +#: actions/apigroupjoin.php:138 actions/joingroup.php:124 +#, php-format msgid "Could not join user %1$s to group %2$s." -msgstr "Nie można doÅ‚Ä…czyć użytkownika %s do grupy %s." +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/leavegroup.php:127 -#, fuzzy, php-format +#: actions/apigroupleave.php:124 actions/leavegroup.php:119 +#, php-format msgid "Could not remove user %1$s from group %2$s." -msgstr "Nie można usunąć użytkownika %s z grupy %s." +msgstr "Nie można usunąć użytkownika %1$s z grupy %2$s." #: actions/apigrouplist.php:95 #, php-format @@ -423,6 +431,98 @@ msgstr "Grupy %s" msgid "groups on %s" msgstr "grupy na %s" +#: actions/apioauthauthorize.php:108 actions/apioauthauthorize.php:114 +msgid "Bad request." +msgstr "BÅ‚Ä™dne żądanie." + +#: actions/apioauthauthorize.php:134 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:115 actions/makeadmin.php:66 +#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 +#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:139 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 +#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/subscribe.php:46 actions/tagother.php:166 +#: 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 "WystÄ…piÅ‚ problem z tokenem sesji. Spróbuj ponownie." + +#: actions/apioauthauthorize.php:146 +msgid "Invalid nickname / password!" +msgstr "NieprawidÅ‚owy pseudonim/hasÅ‚o." + +#: actions/apioauthauthorize.php:170 +msgid "DB error deleting OAuth app user." +msgstr "BÅ‚Ä…d bazy danych podczas usuwania użytkownika aplikacji OAuth." + +#: actions/apioauthauthorize.php:196 +msgid "DB error inserting OAuth app user." +msgstr "BÅ‚Ä…d bazy danych podczas wprowadzania użytkownika aplikacji OAuth." + +#: actions/apioauthauthorize.php:231 +#, php-format +msgid "" +"The request token %s has been authorized. Please exchange it for an access " +"token." +msgstr "" +"Token żądania %s zostaÅ‚ upoważniony. ProszÄ™ wymienić go na token dostÄ™pu." + +#: actions/apioauthauthorize.php:241 +#, php-format +msgid "The request token %s has been denied." +msgstr "Token żądania %s zostaÅ‚ odrzucony." + +#: actions/apioauthauthorize.php:246 actions/avatarsettings.php:281 +#: actions/designadminpanel.php:103 actions/editapplication.php:139 +#: actions/emailsettings.php:256 actions/grouplogo.php:319 +#: actions/imsettings.php:220 actions/newapplication.php:121 +#: actions/oauthconnectionssettings.php:151 actions/recoverpassword.php:44 +#: actions/smssettings.php:248 lib/designsettings.php:304 +msgid "Unexpected form submission." +msgstr "Nieoczekiwane wysÅ‚anie formularza." + +#: actions/apioauthauthorize.php:273 +msgid "An application would like to connect to your account" +msgstr "Aplikacja chce poÅ‚Ä…czyć siÄ™ z kontem użytkownika" + +#: actions/apioauthauthorize.php:290 +msgid "Allow or deny access" +msgstr "Zezwolić czy odmówić dostÄ™p" + +#: actions/apioauthauthorize.php:320 lib/action.php:435 +msgid "Account" +msgstr "Konto" + +#: actions/apioauthauthorize.php:323 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/apioauthauthorize.php:326 actions/login.php:233 +#: actions/register.php:429 lib/accountsettingsaction.php:116 +msgid "Password" +msgstr "HasÅ‚o" + +#: actions/apioauthauthorize.php:338 +msgid "Deny" +msgstr "Odrzuć" + +#: actions/apioauthauthorize.php:344 +msgid "Allow" +msgstr "Zezwól" + +#: actions/apioauthauthorize.php:361 +msgid "Allow or deny access to your account information." +msgstr "Zezwól lub odmów dostÄ™p do informacji konta." + #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." msgstr "Ta metoda wymaga POST lub DELETE." @@ -436,11 +536,11 @@ msgstr "Nie można usuwać stanów innych użytkowników." msgid "No such notice." msgstr "Nie ma takiego wpisu." -#: actions/apistatusesretweet.php:83 lib/command.php:422 +#: actions/apistatusesretweet.php:83 msgid "Cannot repeat your own notice." msgstr "Nie można powtórzyć wÅ‚asnego wpisu." -#: actions/apistatusesretweet.php:91 lib/command.php:427 +#: actions/apistatusesretweet.php:91 msgid "Already repeated that notice." msgstr "Już powtórzono ten wpis." @@ -452,17 +552,17 @@ msgstr "UsuniÄ™to stan." msgid "No status with that ID found." msgstr "Nie odnaleziono stanów z tym identyfikatorem." -#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:162 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Wpis jest za dÅ‚ugi. Maksymalna dÅ‚ugość wynosi %d znaków." -#: actions/apistatusesupdate.php:198 +#: actions/apistatusesupdate.php:203 msgid "Not found" msgstr "Nie odnaleziono" -#: actions/apistatusesupdate.php:221 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:226 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "Maksymalny rozmiar wpisu wynosi %d znaków, w tym adres URL zaÅ‚Ä…cznika." @@ -472,14 +572,14 @@ msgid "Unsupported format." msgstr "NieobsÅ‚ugiwany format." #: actions/apitimelinefavorites.php:108 -#, fuzzy, php-format +#, php-format msgid "%1$s / Favorites from %2$s" -msgstr "%s/ulubione wpisy od %s" +msgstr "%1$s/ulubione wpisy od %2$s" #: actions/apitimelinefavorites.php:120 -#, fuzzy, php-format +#, php-format msgid "%1$s updates favorited by %2$s / %2$s." -msgstr "Użytkownik %s aktualizuje ulubione wedÅ‚ug %s/%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 @@ -546,8 +646,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." @@ -570,8 +673,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" @@ -603,29 +706,6 @@ 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/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 -#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 -#: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 -#: actions/subscribe.php:46 actions/tagother.php:166 -#: 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 "WystÄ…piÅ‚ problem z tokenem sesji. Spróbuj ponownie." - -#: actions/avatarsettings.php:281 actions/designadminpanel.php:103 -#: actions/emailsettings.php:256 actions/grouplogo.php:319 -#: actions/imsettings.php:220 actions/recoverpassword.php:44 -#: actions/smssettings.php:248 lib/designsettings.php:304 -msgid "Unexpected form submission." -msgstr "Nieoczekiwane wysÅ‚anie formularza." - #: actions/avatarsettings.php:328 msgid "Pick a square area of the image to be your avatar" msgstr "Wybierz kwadratowy obszar obrazu do awatara" @@ -687,19 +767,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:260 +msgid "No such group." +msgstr "Nie ma takiej grupy." #: actions/blockedfromgroup.php:90 #, php-format @@ -707,9 +783,9 @@ msgid "%s blocked profiles" msgstr "%s zablokowane profile" #: actions/blockedfromgroup.php:93 -#, fuzzy, php-format +#, php-format msgid "%1$s blocked profiles, page %2$d" -msgstr "%s zablokowane profile, strona %d" +msgstr "%1$s zablokowane profile, strona %2$d" #: actions/blockedfromgroup.php:108 msgid "A list of the users blocked from joining this group." @@ -766,7 +842,7 @@ msgid "Couldn't delete email confirmation." msgstr "Nie można usunąć potwierdzenia adresu e-mail." #: actions/confirmaddress.php:144 -msgid "Confirm Address" +msgid "Confirm address" msgstr "Potwierdź adres" #: actions/confirmaddress.php:159 @@ -821,10 +897,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." @@ -956,7 +1028,8 @@ msgstr "Przywróć domyÅ›lne ustawienia" #: actions/pathsadminpanel.php:324 actions/profilesettings.php:174 #: actions/siteadminpanel.php:388 actions/smssettings.php:181 #: actions/subscriptions.php:203 actions/tagother.php:154 -#: actions/useradminpanel.php:313 lib/designsettings.php:256 +#: actions/useradminpanel.php:313 lib/applicationeditform.php:335 +#: lib/applicationeditform.php:336 lib/designsettings.php:256 #: lib/groupeditform.php:202 msgid "Save" msgstr "Zapisz" @@ -977,6 +1050,76 @@ msgstr "Dodaj do ulubionych" msgid "No such document." msgstr "Nie ma takiego dokumentu." +#: actions/editapplication.php:54 lib/applicationeditform.php:136 +msgid "Edit application" +msgstr "Zmodyfikuj aplikacjÄ™" + +#: actions/editapplication.php:66 +msgid "You must be logged in to edit an application." +msgstr "Musisz być zalogowany, aby zmodyfikować aplikacjÄ™." + +#: actions/editapplication.php:77 actions/showapplication.php:94 +msgid "You are not the owner of this application." +msgstr "Nie jesteÅ› wÅ‚aÅ›cicielem tej aplikacji." + +#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:163 +#: actions/showapplication.php:87 +msgid "No such application." +msgstr "Nie ma takiej aplikacji." + +#: actions/editapplication.php:127 actions/newapplication.php:110 +#: actions/showapplication.php:118 lib/action.php:1167 +msgid "There was a problem with your session token." +msgstr "WystÄ…piÅ‚ problem z tokenem sesji." + +#: actions/editapplication.php:161 +msgid "Use this form to edit your application." +msgstr "Użyj tego formularza, aby zmodyfikować aplikacjÄ™." + +#: actions/editapplication.php:177 actions/newapplication.php:159 +msgid "Name is required." +msgstr "Nazwa jest wymagana." + +#: actions/editapplication.php:180 actions/newapplication.php:162 +msgid "Name is too long (max 255 chars)." +msgstr "Nazwa jest za dÅ‚uga (maksymalnie 255 znaków)." + +#: actions/editapplication.php:183 actions/newapplication.php:165 +msgid "Description is required." +msgstr "Opis jest wymagany." + +#: actions/editapplication.php:191 +msgid "Source URL is too long." +msgstr "ŹródÅ‚owy adres URL jest za dÅ‚ugi." + +#: actions/editapplication.php:197 actions/newapplication.php:182 +msgid "Source URL is not valid." +msgstr "ŹródÅ‚owy adres URL jest nieprawidÅ‚owy." + +#: actions/editapplication.php:200 actions/newapplication.php:185 +msgid "Organization is required." +msgstr "Organizacja jest wymagana." + +#: actions/editapplication.php:203 actions/newapplication.php:188 +msgid "Organization is too long (max 255 chars)." +msgstr "Organizacja jest za dÅ‚uga (maksymalnie 255 znaków)." + +#: actions/editapplication.php:206 actions/newapplication.php:191 +msgid "Organization homepage is required." +msgstr "Strona domowa organizacji jest wymagana." + +#: actions/editapplication.php:215 actions/newapplication.php:203 +msgid "Callback is too long." +msgstr "Adres zwrotny jest za dÅ‚ugi." + +#: actions/editapplication.php:222 actions/newapplication.php:212 +msgid "Callback URL is not valid." +msgstr "Adres zwrotny URL jest nieprawidÅ‚owy." + +#: actions/editapplication.php:255 +msgid "Could not update application." +msgstr "Nie można zaktualizować aplikacji." + #: actions/editgroup.php:56 #, php-format msgid "Edit %s group" @@ -988,8 +1131,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." @@ -1013,7 +1156,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 @@ -1046,12 +1189,13 @@ msgstr "" "instrukcjami." #: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 +#: actions/smssettings.php:126 lib/applicationeditform.php:333 +#: lib/applicationeditform.php:334 msgid "Cancel" msgstr "Anuluj" #: actions/emailsettings.php:121 -msgid "Email Address" +msgid "Email address" msgstr "Adres e-mail" #: actions/emailsettings.php:123 @@ -1125,9 +1269,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." @@ -1310,13 +1455,6 @@ 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:79 msgid "No such file." msgstr "Nie ma takiego pliku." @@ -1333,7 +1471,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." @@ -1359,13 +1497,13 @@ msgid "Block user from group" msgstr "Zablokuj użytkownika w grupie" #: actions/groupblock.php:162 -#, fuzzy, php-format +#, php-format msgid "" "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " "will be removed from the group, unable to post, and unable to subscribe to " "the group in the future." msgstr "" -"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." @@ -1381,9 +1519,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." @@ -1404,12 +1542,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." @@ -1424,6 +1556,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." @@ -1442,9 +1578,9 @@ msgid "%s group members" msgstr "CzÅ‚onkowie grupy %s" #: actions/groupmembers.php:96 -#, fuzzy, php-format +#, php-format msgid "%1$s group members, page %2$d" -msgstr "CzÅ‚onkowie grupy %s, strona %d" +msgstr "CzÅ‚onkowie grupy %1$s, strona %2$d" #: actions/groupmembers.php:111 msgid "A list of the users in this group." @@ -1553,7 +1689,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 @@ -1584,7 +1720,7 @@ msgstr "" "znajomych?)." #: actions/imsettings.php:124 -msgid "IM Address" +msgid "IM address" msgstr "Adres komunikatora" #: actions/imsettings.php:126 @@ -1683,7 +1819,7 @@ 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 lib/command.php:315 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -1729,7 +1865,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:234 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236 msgid "Send" msgstr "WyÅ›lij" @@ -1799,88 +1935,60 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "Musisz być zalogowany, aby doÅ‚Ä…czyć do grupy." -#: actions/joingroup.php:90 -msgid "You are already a member of that group" -msgstr "JesteÅ› już czÅ‚onkiem tej grupy" - -#: actions/joingroup.php:128 -#, fuzzy, php-format -msgid "Could not join user %1$s to group %2$s" -msgstr "Nie można doÅ‚Ä…czyć użytkownika %s do grupy %s" - -#: actions/joingroup.php:135 lib/command.php:239 -#, fuzzy, php-format +#: actions/joingroup.php:131 +#, php-format msgid "%1$s joined group %2$s" -msgstr "Użytkownik %s doÅ‚Ä…czyÅ‚ do grupy %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." msgstr "Musisz być zalogowany, aby opuÅ›cić grupÄ™." -#: actions/leavegroup.php:90 lib/command.php:268 +#: actions/leavegroup.php:90 lib/command.php:265 msgid "You are not a member of that group." msgstr "Nie jesteÅ› czÅ‚onkiem tej grupy." -#: actions/leavegroup.php:119 lib/command.php:278 -msgid "Could not find membership record." -msgstr "Nie można odnaleźć wpisu czÅ‚onkostwa." - -#: actions/leavegroup.php:134 lib/command.php:289 -#, fuzzy, php-format +#: actions/leavegroup.php:127 +#, php-format msgid "%1$s left group %2$s" -msgstr "Użytkownik %s opuÅ›ciÅ‚ grupÄ™ %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:460 +#: 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 -#: lib/groupeditform.php:152 lib/userprofile.php:131 -msgid "Nickname" -msgstr "Pseudonim" - -#: actions/login.php:253 actions/register.php:428 -#: 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." @@ -1888,7 +1996,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]" @@ -1902,24 +2010,44 @@ msgid "Only an admin can make another user an admin." msgstr "Tylko administrator może uczynić innego użytkownika administratorem." #: actions/makeadmin.php:95 -#, fuzzy, php-format +#, php-format msgid "%1$s is already an admin for group \"%2$s\"." -msgstr "Użytkownika %s jest już administratorem grupy \"%s\"." +msgstr "Użytkownika %1$s jest już administratorem grupy \"%2$s\"." #: actions/makeadmin.php:132 -#, fuzzy, php-format -msgid "Can't get membership record for %1$s in group %2$s" -msgstr "Nie można uzyskać wpisu czÅ‚onkostwa użytkownika %s w grupie %s" +#, php-format +msgid "Can't get membership record for %1$s in group %2$s." +msgstr "Nie można uzyskać wpisu czÅ‚onkostwa użytkownika %1$s w grupie %2$s." #: actions/makeadmin.php:145 -#, fuzzy, php-format -msgid "Can't make %1$s an admin for group %2$s" -msgstr "Nie można uczynić %s administratorem grupy %s" +#, php-format +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" msgstr "Brak obecnego stanu" +#: actions/newapplication.php:52 +msgid "New application" +msgstr "Nowa aplikacja" + +#: actions/newapplication.php:64 +msgid "You must be logged in to register an application." +msgstr "Musisz być zalogowany, aby zarejestrować aplikacjÄ™." + +#: actions/newapplication.php:143 +msgid "Use this form to register a new application." +msgstr "Użyj tego formularza, aby zarejestrować aplikacjÄ™." + +#: actions/newapplication.php:173 +msgid "Source URL is required." +msgstr "ŹródÅ‚owy adres URL jest wymagany." + +#: actions/newapplication.php:255 actions/newapplication.php:264 +msgid "Could not create application." +msgstr "Nie można utworzyć aplikacji." + #: actions/newgroup.php:53 msgid "New group" msgstr "Nowa grupa" @@ -1932,12 +2060,12 @@ msgstr "Użyj tego formularza, aby utworzyć nowÄ… grupÄ™." msgid "New message" msgstr "Nowa wiadomość" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 msgid "You can't send a message to this user." msgstr "Nie można wysÅ‚ać wiadomoÅ›ci do tego użytkownika." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:484 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 +#: lib/command.php:475 msgid "No content!" msgstr "Brak zawartoÅ›ci." @@ -1945,7 +2073,7 @@ msgstr "Brak zawartoÅ›ci." msgid "No recipient specified." msgstr "Nie podano odbiorcy." -#: actions/newmessage.php:164 lib/command.php:370 +#: actions/newmessage.php:164 lib/command.php:361 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "Nie wysyÅ‚aj wiadomoÅ›ci do siebie, po prostu powiedz to sobie po cichu." @@ -1956,8 +2084,8 @@ msgstr "WysÅ‚ano wiadomość" #: 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" @@ -1985,9 +2113,9 @@ msgid "Text search" msgstr "Wyszukiwanie tekstu" #: actions/noticesearch.php:91 -#, fuzzy, php-format +#, php-format msgid "Search results for \"%1$s\" on %2$s" -msgstr "Wyniki wyszukiwania dla \"%s\" na %s" +msgstr "Wyniki wyszukiwania dla \"%1$s\" na %2$s" #: actions/noticesearch.php:121 #, php-format @@ -2033,6 +2161,48 @@ msgstr "WysÅ‚ano szturchniÄ™cie" msgid "Nudge sent!" msgstr "WysÅ‚ano szturchniÄ™cie." +#: actions/oauthappssettings.php:59 +msgid "You must be logged in to list your applications." +msgstr "Musisz być zalogowany, aby wyÅ›wietlić listÄ™ aplikacji." + +#: actions/oauthappssettings.php:74 +msgid "OAuth applications" +msgstr "Aplikacje OAuth" + +#: actions/oauthappssettings.php:85 +msgid "Applications you have registered" +msgstr "Zarejestrowane aplikacje" + +#: actions/oauthappssettings.php:135 +#, php-format +msgid "You have not registered any applications yet." +msgstr "Nie zarejestrowano jeszcze żadnych aplikacji." + +#: actions/oauthconnectionssettings.php:71 +msgid "Connected applications" +msgstr "PoÅ‚Ä…czone aplikacje" + +#: actions/oauthconnectionssettings.php:87 +msgid "You have allowed the following applications to access you account." +msgstr "Zezwolono nastÄ™pujÄ…cym aplikacjom na dostÄ™p do konta." + +#: actions/oauthconnectionssettings.php:170 +msgid "You are not a user of that application." +msgstr "Nie jesteÅ› użytkownikiem tej aplikacji." + +#: actions/oauthconnectionssettings.php:180 +msgid "Unable to revoke access for app: " +msgstr "Nie można unieważnić dostÄ™pu dla aplikacji: " + +#: actions/oauthconnectionssettings.php:192 +#, php-format +msgid "You have not authorized any applications to use your account." +msgstr "Nie upoważniono żadnych aplikacji do używania konta." + +#: actions/oauthconnectionssettings.php:205 +msgid "Developers can edit the registration settings for their applications " +msgstr "ProgramiÅ›ci mogÄ… zmodyfikować ustawienia rejestracji swoich aplikacji " + #: actions/oembed.php:79 actions/shownotice.php:100 msgid "Notice has no profile" msgstr "Wpis nie posiada profilu" @@ -2050,8 +2220,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:1038 +#: lib/api.php:1066 lib/api.php:1176 msgid "Not a supported data format." msgstr "To nie jest obsÅ‚ugiwany format danych." @@ -2064,7 +2234,7 @@ msgid "Notice Search" msgstr "Wyszukiwanie wpisów" #: actions/othersettings.php:60 -msgid "Other Settings" +msgid "Other settings" msgstr "Inne ustawienia" #: actions/othersettings.php:71 @@ -2095,6 +2265,26 @@ 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/otp.php:69 +msgid "No user ID specified." +msgstr "Nie podano identyfikatora użytkownika." + +#: actions/otp.php:83 +msgid "No login token specified." +msgstr "Nie podano tokenu logowania." + +#: actions/otp.php:90 +msgid "No login token requested." +msgstr "Nie zażądano tokenu logowania." + +#: actions/otp.php:95 +msgid "Invalid login token specified." +msgstr "Podano nieprawidÅ‚owy token logowania." + +#: actions/otp.php:104 +msgid "Login token expired." +msgstr "Token logowania wygasÅ‚." + #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" @@ -2129,7 +2319,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ź" @@ -2291,7 +2481,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 @@ -2322,18 +2512,18 @@ msgid "Not a valid people tag: %s" msgstr "NieprawidÅ‚owy znacznik osób: %s" #: actions/peopletag.php:144 -#, fuzzy, php-format +#, php-format msgid "Users self-tagged with %1$s - page %2$d" -msgstr "Użytkownicy używajÄ…cy znacznika %s - strona %d" +msgstr "Użytkownicy używajÄ…cy znacznika %1$s - strona %2$d" #: actions/postnotice.php:84 msgid "Invalid notice content" msgstr "NieprawidÅ‚owa zawartość wpisu" #: actions/postnotice.php:90 -#, fuzzy, php-format +#, php-format msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’." -msgstr "Licencja wpisu \"%s\" nie jest zgodna z licencjÄ… strony \"%s\"." +msgstr "Licencja wpisu \"%1$s\" nie jest zgodna z licencjÄ… strony \"%2$s\"." #: actions/profilesettings.php:60 msgid "Profile settings" @@ -2354,42 +2544,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 -#: lib/groupeditform.php:161 +#: actions/profilesettings.php:115 actions/register.php:453 +#: lib/applicationeditform.php:230 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\"" @@ -2700,7 +2890,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ć." @@ -2712,7 +2902,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:457 +#: actions/register.php:114 actions/register.php:503 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Zarejestruj siÄ™" @@ -2726,19 +2916,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. " @@ -2746,41 +2932,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." @@ -2788,8 +2974,8 @@ msgstr "" " poza tymi prywatnymi danymi: hasÅ‚o, adres e-mail, adres komunikatora i " "numer telefonu." -#: actions/register.php:537 -#, fuzzy, php-format +#: actions/register.php:538 +#, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " "want to...\n" @@ -2806,11 +2992,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%%%%), " @@ -2821,7 +3007,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.)" @@ -2934,13 +3120,13 @@ msgid "Replies feed for %s (Atom)" msgstr "KanaÅ‚ odpowiedzi dla użytkownika %s (Atom)" #: actions/replies.php:198 -#, fuzzy, php-format +#, php-format msgid "" "This is the timeline showing replies to %1$s but %2$s hasn't received a " "notice to his attention yet." msgstr "" -"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 @@ -2952,13 +3138,13 @@ msgstr "" "[doÅ‚Ä…czyć do grup](%%action.groups%%)." #: actions/replies.php:205 -#, fuzzy, php-format +#, php-format msgid "" "You can try to [nudge %1$s](../%2$s) or [post something to his or her " "attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" -"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 @@ -2973,6 +3159,82 @@ msgstr "Nie można ograniczać użytkowników na tej stronie." msgid "User is already sandboxed." msgstr "Użytkownik jest już ograniczony." +#: actions/showapplication.php:82 +msgid "You must be logged in to view an application." +msgstr "Musisz być zalogowany, aby wyÅ›wietlić aplikacjÄ™." + +#: actions/showapplication.php:158 +msgid "Application profile" +msgstr "Profil aplikacji" + +#: actions/showapplication.php:160 lib/applicationeditform.php:182 +msgid "Icon" +msgstr "Ikona" + +#: actions/showapplication.php:170 actions/version.php:195 +#: lib/applicationeditform.php:197 +msgid "Name" +msgstr "Nazwa" + +#: actions/showapplication.php:179 lib/applicationeditform.php:224 +msgid "Organization" +msgstr "Organizacja" + +#: actions/showapplication.php:188 actions/version.php:198 +#: lib/applicationeditform.php:211 lib/groupeditform.php:172 +msgid "Description" +msgstr "Opis" + +#: actions/showapplication.php:193 actions/showgroup.php:429 +#: lib/profileaction.php:174 +msgid "Statistics" +msgstr "Statystyki" + +#: actions/showapplication.php:204 +#, php-format +msgid "created by %1$s - %2$s access by default - %3$d users" +msgstr "utworzona przez %1$s - domyÅ›lny dostÄ™p: %2$s - %3$d użytkowników" + +#: actions/showapplication.php:214 +msgid "Application actions" +msgstr "CzynnoÅ›ci aplikacji" + +#: actions/showapplication.php:233 +msgid "Reset key & secret" +msgstr "Przywrócenie klucza i sekretu" + +#: actions/showapplication.php:241 +msgid "Application info" +msgstr "Informacje o aplikacji" + +#: actions/showapplication.php:243 +msgid "Consumer key" +msgstr "Klucz klienta" + +#: actions/showapplication.php:248 +msgid "Consumer secret" +msgstr "Sekret klienta" + +#: actions/showapplication.php:253 +msgid "Request token URL" +msgstr "Adres URL tokenu żądania" + +#: actions/showapplication.php:258 +msgid "Access token URL" +msgstr "Adres URL tokenu żądania" + +#: actions/showapplication.php:263 +msgid "Authorize URL" +msgstr "Adres URL upoważnienia" + +#: actions/showapplication.php:268 +msgid "" +"Note: We support HMAC-SHA1 signatures. We do not support the plaintext " +"signature method." +msgstr "" +"Uwaga: obsÅ‚ugiwane sÄ… podpisy HMAC-SHA1. Metoda podpisu w zwykÅ‚ym tekÅ›cie " +"nie jest obsÅ‚ugiwana." + #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "Nie można odebrać ulubionych wpisów." @@ -3078,7 +3340,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)" @@ -3086,10 +3348,6 @@ msgstr "(Brak)" msgid "All members" msgstr "Wszyscy czÅ‚onkowie" -#: actions/showgroup.php:429 lib/profileaction.php:174 -msgid "Statistics" -msgstr "Statystyki" - #: actions/showgroup.php:432 msgid "Created" msgstr "Utworzono" @@ -3155,9 +3413,9 @@ msgid " tagged %s" msgstr " ze znacznikiem %s" #: actions/showstream.php:122 -#, fuzzy, php-format +#, php-format msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" -msgstr "KanaÅ‚ wpisów dla %s ze znacznikiem %s (RSS 1.0)" +msgstr "KanaÅ‚ wpisów dla %1$s ze znacznikiem %2$s (RSS 1.0)" #: actions/showstream.php:129 #, php-format @@ -3180,10 +3438,10 @@ msgid "FOAF for %s" msgstr "FOAF dla %s" #: actions/showstream.php:191 -#, fuzzy, php-format +#, php-format msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet." msgstr "" -"To jest oÅ› czasu dla użytkownika %s, ale %s nie nic jeszcze nie wysÅ‚aÅ‚." +"To jest oÅ› czasu dla użytkownika %1$s, ale %2$s nie nic jeszcze nie wysÅ‚aÅ‚." #: actions/showstream.php:196 msgid "" @@ -3194,13 +3452,13 @@ msgstr "" "teraz jest dobry czas, aby zacząć. :)" #: actions/showstream.php:198 -#, fuzzy, php-format +#, php-format msgid "" "You can try to nudge %1$s or [post something to his or her attention](%%%%" "action.newnotice%%%%?status_textarea=%2$s)." msgstr "" -"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 @@ -3249,13 +3507,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." @@ -3438,7 +3696,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 @@ -3467,7 +3725,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 @@ -3558,9 +3816,9 @@ msgid "%s subscribers" msgstr "Subskrybenci użytkownika %s" #: actions/subscribers.php:52 -#, fuzzy, php-format +#, php-format msgid "%1$s subscribers, page %2$d" -msgstr "Subskrybenci użytkownika %s, strona %d" +msgstr "Subskrybenci użytkownika %1$s, strona %2$d" #: actions/subscribers.php:63 msgid "These are the people who listen to your notices." @@ -3599,9 +3857,9 @@ msgid "%s subscriptions" msgstr "Subskrypcje użytkownika %s" #: actions/subscriptions.php:54 -#, fuzzy, php-format +#, php-format msgid "%1$s subscriptions, page %2$d" -msgstr "Subskrypcje użytkownika %s, strona %d" +msgstr "Subskrypcje użytkownika %1$s, strona %2$d" #: actions/subscriptions.php:65 msgid "These are the people whose notices you listen to." @@ -3725,21 +3983,17 @@ 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 -#, fuzzy, php-format +#, php-format msgid "" "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" -"Licencja nasÅ‚uchiwanego strumienia \"%s\" nie jest zgodna z licencjÄ… strony " -"\"%s\"." +"Licencja nasÅ‚uchiwanego strumienia \"%1$s\" nie jest zgodna z licencjÄ… " +"strony \"%2$s\"." #: actions/useradminpanel.php:58 lib/adminpanelaction.php:321 #: lib/personalgroupnav.php:115 @@ -3894,9 +4148,9 @@ msgstr "" "Sprawdź w instrukcjach strony, jak w peÅ‚ni odrzucić subskrypcjÄ™." #: actions/userauthorization.php:296 -#, fuzzy, php-format +#, php-format msgid "Listener URI ‘%s’ not found here." -msgstr "Adres URI nasÅ‚uchujÄ…cego \"%s\" nie zostaÅ‚ tutaj odnaleziony" +msgstr "Adres URI nasÅ‚uchujÄ…cego \"%s\" nie zostaÅ‚ tutaj odnaleziony." #: actions/userauthorization.php:301 #, php-format @@ -3928,10 +4182,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" @@ -3962,9 +4212,9 @@ msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "Spróbuj [wyszukać grupy](%%action.groupsearch%%) i doÅ‚Ä…czyć do nich." #: actions/version.php:73 -#, fuzzy, php-format +#, php-format msgid "StatusNet %s" -msgstr "Statystyki" +msgstr "StatusNet %s" #: actions/version.php:153 #, php-format @@ -3972,15 +4222,16 @@ 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 -#, fuzzy msgid "StatusNet" -msgstr "UsuniÄ™to stan." +msgstr "StatusNet" #: actions/version.php:161 msgid "Contributors" -msgstr "" +msgstr "Współtwórcy" #: actions/version.php:168 msgid "" @@ -3989,6 +4240,10 @@ msgid "" "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 "" @@ -3997,6 +4252,11 @@ msgid "" "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 @@ -4004,31 +4264,23 @@ 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 "" - -#: actions/version.php:195 -#, fuzzy -msgid "Name" -msgstr "Pseudonim" +msgstr "Wtyczki" #: actions/version.php:196 lib/action.php:741 -#, fuzzy msgid "Version" -msgstr "Sesje" +msgstr "Wersja" #: actions/version.php:197 -#, fuzzy msgid "Author(s)" -msgstr "Autor" +msgstr "Autorzy" -#: actions/version.php:198 lib/groupeditform.php:172 -msgid "Description" -msgstr "Opis" - -#: classes/File.php:137 +#: classes/File.php:144 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " @@ -4037,19 +4289,36 @@ 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/Group_member.php:41 +msgid "Group join failed." +msgstr "DoÅ‚Ä…czenie do grupy nie powiodÅ‚o siÄ™." + +#: classes/Group_member.php:53 +msgid "Not part of group." +msgstr "Nie jest częściÄ… grupy." + +#: classes/Group_member.php:60 +msgid "Group leave failed." +msgstr "Opuszczenie grupy nie powiodÅ‚o siÄ™." + +#: classes/Login_token.php:76 +#, 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." @@ -4062,27 +4331,27 @@ msgstr "Nie można wprowadzić wiadomoÅ›ci." msgid "Could not update message with new URI." msgstr "Nie można zaktualizować wiadomoÅ›ci za pomocÄ… nowego adresu URL." -#: classes/Notice.php:172 +#: classes/Notice.php:171 #, php-format msgid "DB error inserting hashtag: %s" msgstr "BÅ‚Ä…d bazy danych podczas wprowadzania znacznika mieszania: %s" -#: classes/Notice.php:226 +#: classes/Notice.php:225 msgid "Problem saving notice. Too long." msgstr "Problem podczas zapisywania wpisu. Za dÅ‚ugi." -#: classes/Notice.php:230 +#: classes/Notice.php:229 msgid "Problem saving notice. Unknown user." msgstr "Problem podczas zapisywania wpisu. Nieznany użytkownik." -#: classes/Notice.php:235 +#: classes/Notice.php:234 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Za dużo wpisów w za krótkim czasie, weź gÅ‚Ä™boki oddech i wyÅ›lij ponownie za " "kilka minut." -#: classes/Notice.php:241 +#: classes/Notice.php:240 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4090,25 +4359,25 @@ msgstr "" "Za dużo takich samych wiadomoÅ›ci w za krótkim czasie, weź gÅ‚Ä™boki oddech i " "wyÅ›lij ponownie za kilka minut." -#: classes/Notice.php:247 +#: classes/Notice.php:246 msgid "You are banned from posting notices on this site." msgstr "Zabroniono ci wysyÅ‚ania wpisów na tej stronie." -#: classes/Notice.php:309 classes/Notice.php:334 +#: classes/Notice.php:305 classes/Notice.php:330 msgid "Problem saving notice." msgstr "Problem podczas zapisywania wpisu." -#: classes/Notice.php:1034 +#: classes/Notice.php:1052 #, php-format msgid "DB error inserting reply: %s" msgstr "BÅ‚Ä…d bazy danych podczas wprowadzania odpowiedzi: %s" -#: classes/Notice.php:1359 +#: classes/Notice.php:1423 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" -#: classes/User.php:368 +#: classes/User.php:382 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Witaj w %1$s, @%2$s." @@ -4149,6 +4418,11 @@ msgstr "Inne" msgid "Other options" msgstr "Inne opcje" +#: lib/action.php:144 +#, php-format +msgid "%1$s - %2$s" +msgstr "%1$s - %2$s" + #: lib/action.php:159 msgid "Untitled page" msgstr "Strona bez nazwy" @@ -4165,10 +4439,6 @@ msgstr "Strona domowa" msgid "Personal profile and friends timeline" msgstr "Profil osobisty i oÅ› czasu przyjaciół" -#: lib/action.php:435 -msgid "Account" -msgstr "Konto" - #: lib/action.php:435 msgid "Change your email, avatar, password, profile" msgstr "ZmieÅ„ adres e-mail, awatar, hasÅ‚o, profil" @@ -4323,18 +4593,13 @@ msgstr "Później" msgid "Before" msgstr "WczeÅ›niej" -#: lib/action.php:1167 -msgid "There was a problem with your session token." -msgstr "WystÄ…piÅ‚ problem z tokenem sesji." - #: lib/adminpanelaction.php:96 msgid "You cannot make changes to this site." msgstr "Nie można wprowadzić zmian strony." #: lib/adminpanelaction.php:107 -#, fuzzy msgid "Changes to that panel are not allowed." -msgstr "Rejestracja nie jest dozwolona." +msgstr "Zmiany w tym panelu nie sÄ… dozwolone." #: lib/adminpanelaction.php:206 msgid "showForm() not implemented." @@ -4360,6 +4625,68 @@ msgstr "Konfiguracja wyglÄ…du" msgid "Paths configuration" msgstr "Konfiguracja Å›cieżek" +#: lib/applicationeditform.php:186 +msgid "Icon for this application" +msgstr "Ikona tej aplikacji" + +#: lib/applicationeditform.php:206 +#, php-format +msgid "Describe your application in %d characters" +msgstr "Opisz aplikacjÄ™ w %d znakach" + +#: lib/applicationeditform.php:209 +msgid "Describe your application" +msgstr "Opisz aplikacjÄ™" + +#: lib/applicationeditform.php:218 +msgid "Source URL" +msgstr "ŹródÅ‚owy adres URL" + +#: lib/applicationeditform.php:220 +msgid "URL of the homepage of this application" +msgstr "Adres URL strony domowej tej aplikacji" + +#: lib/applicationeditform.php:226 +msgid "Organization responsible for this application" +msgstr "Organizacja odpowiedzialna za tÄ™ aplikacjÄ™" + +#: lib/applicationeditform.php:232 +msgid "URL for the homepage of the organization" +msgstr "Adres URL strony domowej organizacji" + +#: lib/applicationeditform.php:238 +msgid "URL to redirect to after authentication" +msgstr "Adres URL do przekierowania po uwierzytelnieniu" + +#: lib/applicationeditform.php:260 +msgid "Browser" +msgstr "PrzeglÄ…darka" + +#: lib/applicationeditform.php:276 +msgid "Desktop" +msgstr "Pulpit" + +#: lib/applicationeditform.php:277 +msgid "Type of application, browser or desktop" +msgstr "Typ aplikacji, przeglÄ…darka lub pulpit" + +#: lib/applicationeditform.php:299 +msgid "Read-only" +msgstr "Tylko do odczytu" + +#: lib/applicationeditform.php:317 +msgid "Read-write" +msgstr "Odczyt i zapis" + +#: lib/applicationeditform.php:318 +msgid "Default access for this application: read-only, or read-write" +msgstr "" +"DomyÅ›lny dostÄ™p do tej aplikacji: tylko do odczytu lub do odczytu i zapisu" + +#: lib/applicationlist.php:154 +msgid "Revoke" +msgstr "Unieważnij" + #: lib/attachmentlist.php:87 msgid "Attachments" msgstr "ZaÅ‚Ä…czniki" @@ -4380,11 +4707,11 @@ msgstr "Powiadamia, kiedy pojawia siÄ™ ten zaÅ‚Ä…cznik" msgid "Tags for this attachment" msgstr "Znaczniki dla tego zaÅ‚Ä…cznika" -#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 +#: lib/authenticationplugin.php:214 lib/authenticationplugin.php:219 msgid "Password changing failed" msgstr "Zmiana hasÅ‚a nie powiodÅ‚a siÄ™" -#: lib/authenticationplugin.php:197 +#: lib/authenticationplugin.php:229 msgid "Password changing is not allowed" msgstr "Zmiana hasÅ‚a nie jest dozwolona" @@ -4405,18 +4732,18 @@ msgid "Sorry, this command is not yet implemented." msgstr "Te polecenie nie zostaÅ‚o jeszcze zaimplementowane." #: lib/command.php:88 -#, fuzzy, php-format -msgid "Could not find a user with nickname %s." -msgstr "Nie można odnaleźć użytkownika z pseudonimem %s" +#, php-format +msgid "Could not find a user with nickname %s" +msgstr "Nie można odnaleźć użytkownika z pseudonimem %s." #: lib/command.php:92 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 -#, fuzzy, php-format -msgid "Nudge sent to %s." -msgstr "WysÅ‚ano szturchniÄ™cie do użytkownika %s" +#, php-format +msgid "Nudge sent to %s" +msgstr "WysÅ‚ano szturchniÄ™cie do użytkownika %s." #: lib/command.php:126 #, php-format @@ -4429,174 +4756,191 @@ msgstr "" "Subskrybenci: %2$s\n" "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" +#: lib/command.php:152 lib/command.php:390 lib/command.php:451 +msgid "Notice with that id does not exist" +msgstr "Wpis z tym identyfikatorem nie istnieje." -#: lib/command.php:168 lib/command.php:415 lib/command.php:476 -#: lib/command.php:532 -#, fuzzy -msgid "User has no last notice." -msgstr "Użytkownik nie posiada ostatniego wpisu" +#: lib/command.php:168 lib/command.php:406 lib/command.php:467 +#: lib/command.php:523 +msgid "User has no last notice" +msgstr "Użytkownik nie posiada ostatniego wpisu." #: lib/command.php:190 msgid "Notice marked as fave." msgstr "Zaznaczono wpis jako ulubiony." -#: lib/command.php:284 -#, fuzzy, php-format -msgid "Could not remove user %1$s to group %2$s." -msgstr "Nie można usunąć użytkownika %s z grupy %s" +#: lib/command.php:217 +msgid "You are already a member of that group" +msgstr "JesteÅ› już czÅ‚onkiem tej grupy." -#: lib/command.php:318 +#: lib/command.php:231 +#, 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:236 +#, php-format +msgid "%s joined group %s" +msgstr "Użytkownik %1$s doÅ‚Ä…czyÅ‚ do grupy %2$s" + +#: lib/command.php:275 +#, 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:280 +#, php-format +msgid "%s left group %s" +msgstr "Użytkownik %1$s opuÅ›ciÅ‚ grupÄ™ %2$s" + +#: lib/command.php:309 #, php-format msgid "Fullname: %s" msgstr "ImiÄ™ i nazwisko: %s" -#: lib/command.php:321 +#: lib/command.php:312 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "PoÅ‚ożenie: %s" -#: lib/command.php:324 +#: lib/command.php:315 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "Strona domowa: %s" -#: lib/command.php:327 +#: lib/command.php:318 #, php-format msgid "About: %s" msgstr "O mnie: %s" -#: lib/command.php:358 -#, fuzzy, php-format -msgid "Message too long - maximum is %1$d characters, you sent %2$d." -msgstr "Wiadomość jest za dÅ‚uga - maksymalnie %d znaków, wysÅ‚ano %d" +#: lib/command.php:349 +#, php-format +msgid "Message too long - maximum is %d characters, you sent %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:367 +#, php-format +msgid "Direct message to %s sent" +msgstr "WysÅ‚ano bezpoÅ›redniÄ… wiadomość do użytkownika %s." -#: lib/command.php:378 +#: lib/command.php:369 msgid "Error sending direct message." msgstr "BÅ‚Ä…d podczas wysyÅ‚ania bezpoÅ›redniej wiadomoÅ›ci." -#: lib/command.php:435 -#, fuzzy, php-format -msgid "Notice from %s repeated." +#: lib/command.php:413 +msgid "Cannot repeat your own notice" +msgstr "Nie można powtórzyć wÅ‚asnego wpisu" + +#: lib/command.php:418 +msgid "Already repeated that notice" +msgstr "Już powtórzono ten wpis" + +#: lib/command.php:426 +#, php-format +msgid "Notice from %s repeated" msgstr "Powtórzono wpis od użytkownika %s" -#: lib/command.php:437 +#: lib/command.php:428 msgid "Error repeating notice." msgstr "BÅ‚Ä…d podczas powtarzania wpisu." +#: lib/command.php:482 +#, php-format +msgid "Notice too long - maximum is %d characters, you sent %d" +msgstr "Wpis jest za dÅ‚ugi - maksymalnie %1$d znaków, wysÅ‚ano %2$d." + #: lib/command.php:491 -#, fuzzy, php-format -msgid "Notice too long - maximum is %1$d characters, you sent %2$d." -msgstr "Wpis jest za dÅ‚ugi - maksymalnie %d znaków, wysÅ‚ano %d" +#, php-format +msgid "Reply to %s sent" +msgstr "WysÅ‚ano odpowiedź do %s." -#: lib/command.php:500 -#, fuzzy, php-format -msgid "Reply to %s sent." -msgstr "WysÅ‚ano odpowiedź do %s" - -#: lib/command.php:502 +#: lib/command.php:493 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" +#: lib/command.php:547 +msgid "Specify the name of the user to subscribe to" +msgstr "Podaj nazwÄ™ użytkownika do subskrybowania." -#: lib/command.php:563 +#: lib/command.php:554 #, php-format 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" +#: lib/command.php:575 +msgid "Specify the name of the user to unsubscribe from" +msgstr "Podaj nazwÄ™ użytkownika do usuniÄ™cia subskrypcji." -#: lib/command.php:591 +#: lib/command.php:582 #, php-format msgid "Unsubscribed from %s" msgstr "UsuniÄ™to subskrypcjÄ™ użytkownika %s" -#: lib/command.php:609 lib/command.php:632 +#: lib/command.php:600 lib/command.php:623 msgid "Command not yet implemented." msgstr "Nie zaimplementowano polecenia." -#: lib/command.php:612 +#: lib/command.php:603 msgid "Notification off." msgstr "WyÅ‚Ä…czono powiadomienia." -#: lib/command.php:614 +#: lib/command.php:605 msgid "Can't turn off notification." msgstr "Nie można wyÅ‚Ä…czyć powiadomieÅ„." -#: lib/command.php:635 +#: lib/command.php:626 msgid "Notification on." msgstr "WÅ‚Ä…czono powiadomienia." -#: lib/command.php:637 +#: lib/command.php:628 msgid "Can't turn on notification." msgstr "Nie można wÅ‚Ä…czyć powiadomieÅ„." -#: lib/command.php:650 -#, fuzzy -msgid "Login command is disabled." +#: lib/command.php:641 +msgid "Login command is disabled" msgstr "Polecenie logowania jest wyÅ‚Ä…czone" -#: lib/command.php:664 -#, fuzzy, php-format -msgid "Could not create login token for %s." -msgstr "Nie można utworzyć tokenów loginów dla %s" - -#: lib/command.php:669 -#, fuzzy, php-format -msgid "This link is useable only once, and is good for only 2 minutes: %s." +#: lib/command.php:652 +#, 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:668 msgid "You are not subscribed to anyone." msgstr "Nie subskrybujesz nikogo." -#: lib/command.php:687 +#: lib/command.php:670 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:690 msgid "No one is subscribed to you." msgstr "Nikt ciÄ™ nie subskrybuje." -#: lib/command.php:709 +#: lib/command.php:692 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:712 msgid "You are not a member of any groups." msgstr "Nie jesteÅ› czÅ‚onkiem żadnej grupy." -#: lib/command.php:731 +#: lib/command.php:714 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:728 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4676,19 +5020,19 @@ msgstr "" "tracks - jeszcze nie zaimplementowano\n" "tracking - jeszcze nie zaimplementowano\n" -#: lib/common.php:199 +#: lib/common.php:131 msgid "No configuration file found. " msgstr "Nie odnaleziono pliku konfiguracji." -#: lib/common.php:200 +#: lib/common.php:132 msgid "I looked for configuration files in the following places: " msgstr "Szukano plików konfiguracji w nastÄ™pujÄ…cych miejscach: " -#: lib/common.php:201 +#: lib/common.php:134 msgid "You may wish to run the installer to fix this." msgstr "Należy uruchomić instalator, aby to naprawić." -#: lib/common.php:202 +#: lib/common.php:135 msgid "Go to the installer." msgstr "Przejdź do instalatora." @@ -4704,6 +5048,14 @@ msgstr "Aktualizacje przez komunikator" msgid "Updates by SMS" msgstr "Aktualizacje przez wiadomoÅ›ci SMS" +#: lib/connectsettingsaction.php:120 +msgid "Connections" +msgstr "PoÅ‚Ä…czenia" + +#: lib/connectsettingsaction.php:121 +msgid "Authorized connected applications" +msgstr "Upoważnione poÅ‚Ä…czone aplikacje" + #: lib/dberroraction.php:60 msgid "Database error" msgstr "BÅ‚Ä…d bazy danych" @@ -4890,11 +5242,16 @@ msgstr "MB" msgid "kB" msgstr "KB" -#: lib/jabber.php:191 +#: lib/jabber.php:202 #, php-format msgid "[%s]" msgstr "[%s]" +#: lib/jabber.php:385 +#, php-format +msgid "Unknown inbox source %d." +msgstr "Nieznane źródÅ‚o skrzynki odbiorczej %d." + #: lib/joinform.php:114 msgid "Join" msgstr "DoÅ‚Ä…cz" @@ -4975,24 +5332,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 @@ -5207,9 +5550,9 @@ msgid "Sorry, no incoming email allowed." msgstr "PrzychodzÄ…cy e-mail nie jest dozwolony." #: lib/mailhandler.php:228 -#, fuzzy, php-format +#, php-format msgid "Unsupported message type: %s" -msgstr "NieobsÅ‚ugiwany format pliku obrazu." +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." @@ -5243,7 +5586,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 @@ -5251,7 +5594,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 @@ -5261,7 +5604,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 @@ -5294,18 +5637,20 @@ msgid "Attach a file" msgstr "ZaÅ‚Ä…cz plik" #: lib/noticeform.php:212 -#, fuzzy -msgid "Share my location." -msgstr "Ujawnij swojÄ… lokalizacjÄ™" - -#: lib/noticeform.php:214 -#, fuzzy -msgid "Do not share my location." -msgstr "Ujawnij swojÄ… lokalizacjÄ™" +msgid "Share my location" +msgstr "Ujawnij poÅ‚ożenie" #: lib/noticeform.php:215 -msgid "Hide this info" +msgid "Do not share my location" +msgstr "Nie ujawniaj poÅ‚ożenia" + +#: lib/noticeform.php:216 +msgid "" +"Sorry, retrieving your geo location is taking longer than expected, please " +"try again later" msgstr "" +"Pobieranie danych geolokalizacji trwa dÅ‚użej niż powinno, proszÄ™ spróbować " +"ponownie później" #: lib/noticelist.php:428 #, php-format @@ -5422,9 +5767,8 @@ msgid "Tags in %s's notices" msgstr "Znaczniki we wpisach użytkownika %s" #: lib/plugin.php:114 -#, fuzzy msgid "Unknown" -msgstr "Nieznane dziaÅ‚anie" +msgstr "Nieznane" #: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82 msgid "Subscriptions" @@ -5565,23 +5909,23 @@ msgstr "Już subskrybowane." msgid "User has blocked you." msgstr "Użytkownik zablokowaÅ‚ ciÄ™." -#: lib/subs.php:60 +#: lib/subs.php:63 msgid "Could not subscribe." msgstr "Nie można subskrybować." -#: lib/subs.php:79 +#: lib/subs.php:82 msgid "Could not subscribe other to you." msgstr "Nie można subskrybować innych do ciebie." -#: lib/subs.php:128 +#: lib/subs.php:137 msgid "Not subscribed!" msgstr "Niesubskrybowane." -#: lib/subs.php:133 +#: lib/subs.php:142 msgid "Couldn't delete self-subscription." msgstr "Nie można usunąć autosubskrypcji." -#: lib/subs.php:146 +#: lib/subs.php:158 msgid "Couldn't delete subscription." msgstr "Nie można usunąć subskrypcji." @@ -5595,10 +5939,6 @@ msgstr "Chmura znaczników osób, które same sobie nadaÅ‚y znaczniki" msgid "People Tagcloud as tagged" msgstr "Chmura znaczników osób ze znacznikami" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(brak)" - #: lib/tagcloudsection.php:56 msgid "None" msgstr "Brak" @@ -5659,47 +5999,47 @@ msgstr "Wiadomość" msgid "Moderate" msgstr "Moderuj" -#: lib/util.php:837 +#: lib/util.php:875 msgid "a few seconds ago" msgstr "kilka sekund temu" -#: lib/util.php:839 +#: lib/util.php:877 msgid "about a minute ago" msgstr "okoÅ‚o minutÄ™ temu" -#: lib/util.php:841 +#: lib/util.php:879 #, php-format msgid "about %d minutes ago" msgstr "okoÅ‚o %d minut temu" -#: lib/util.php:843 +#: lib/util.php:881 msgid "about an hour ago" msgstr "okoÅ‚o godzinÄ™ temu" -#: lib/util.php:845 +#: lib/util.php:883 #, php-format msgid "about %d hours ago" msgstr "okoÅ‚o %d godzin temu" -#: lib/util.php:847 +#: lib/util.php:885 msgid "about a day ago" msgstr "blisko dzieÅ„ temu" -#: lib/util.php:849 +#: lib/util.php:887 #, php-format msgid "about %d days ago" msgstr "okoÅ‚o %d dni temu" -#: lib/util.php:851 +#: lib/util.php:889 msgid "about a month ago" msgstr "okoÅ‚o miesiÄ…c temu" -#: lib/util.php:853 +#: lib/util.php:891 #, php-format msgid "about %d months ago" msgstr "okoÅ‚o %d miesiÄ™cy temu" -#: lib/util.php:855 +#: lib/util.php:893 msgid "about a year ago" msgstr "okoÅ‚o rok temu" @@ -5717,5 +6057,5 @@ msgstr "" #: scripts/xmppdaemon.php:301 #, 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" +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 f037cce813..a7e2b9e33e 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-10 00:46+0000\n" -"PO-Revision-Date: 2010-01-10 00:48:50+0000\n" +"POT-Creation-Date: 2010-01-15 19:15+0000\n" +"PO-Revision-Date: 2010-01-15 19:17:49+0000\n" "Language-Team: Portuguese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60878); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r61101); 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" @@ -34,25 +34,30 @@ msgstr "Página não encontrada." #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 +#: actions/apistatusesupdate.php:149 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 #: 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 #: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 -#: lib/command.php:163 lib/command.php:311 lib/command.php:364 -#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/command.php:163 lib/command.php:302 lib/command.php:355 +#: lib/command.php:401 lib/command.php:462 lib/command.php:518 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/subs.php:34 lib/subs.php:125 msgid "No such user." msgstr "Utilizador não encontrado." +#: actions/all.php:84 +#, fuzzy, php-format +msgid "%1$s and friends, page %2$d" +msgstr "Perfis bloqueados de %1$s, página %2$d" + #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 +#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -61,17 +66,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 @@ -90,13 +95,13 @@ msgstr "" "publicar qualquer coisa." #: actions/all.php:134 -#, fuzzy, php-format +#, php-format msgid "" "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 @@ -104,14 +109,14 @@ 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/allrss.php:119 actions/apitimelinefriends.php:121 #: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" @@ -122,6 +127,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:155 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." @@ -135,7 +157,7 @@ msgstr "Método da API não encontrado." #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:114 +#: actions/apistatusesupdate.php:119 msgid "This method requires a POST." msgstr "Este método requer um POST." @@ -144,7 +166,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." @@ -165,8 +187,9 @@ msgstr "Não foi possível gravar o perfil." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257 -#: actions/designadminpanel.php:122 actions/newnotice.php:94 +#: actions/apistatusesupdate.php:132 actions/avatarsettings.php:257 +#: actions/designadminpanel.php:122 actions/editapplication.php:118 +#: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format msgid "" @@ -180,13 +203,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!" @@ -220,26 +246,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!" @@ -264,16 +270,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." @@ -294,12 +300,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." @@ -313,25 +319,26 @@ 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/apigroupcreate.php:196 actions/editapplication.php:212 +#: actions/editgroup.php:195 actions/newapplication.php:200 #: 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 @@ -339,7 +346,8 @@ msgstr "Página de acolhimento não é uma URL válida." msgid "Full name is too long (max 255 chars)." msgstr "Nome completo demasiado longo (máx. 255 caracteres)." -#: actions/apigroupcreate.php:213 +#: actions/apigroupcreate.php:213 actions/editapplication.php:187 +#: actions/newapplication.php:169 #, php-format msgid "Description is too long (max %d chars)." msgstr "Descrição demasiado longa (máx. 140 caracteres)." @@ -354,24 +362,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 @@ -379,27 +387,27 @@ msgstr "Os cognomes não podem ser iguais à alcunha." msgid "Group not found!" msgstr "Grupo não foi encontrado!" -#: actions/apigroupjoin.php:110 lib/command.php:217 +#: 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 lib/command.php:234 -#, fuzzy, php-format +#: actions/apigroupjoin.php:138 actions/joingroup.php:124 +#, php-format msgid "Could not join user %1$s to group %2$s." -msgstr "Não foi possível adicionar %s ao grupo %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/leavegroup.php:127 -#, fuzzy, php-format +#: actions/apigroupleave.php:124 actions/leavegroup.php:119 +#, php-format msgid "Could not remove user %1$s from group %2$s." -msgstr "Não foi possível remover %s do grupo %s." +msgstr "Não foi possível remover %1$s do grupo %2$s." #: actions/apigrouplist.php:95 #, php-format @@ -416,6 +424,102 @@ msgstr "Grupos de %s" msgid "groups on %s" msgstr "Grupos em %s" +#: actions/apioauthauthorize.php:108 actions/apioauthauthorize.php:114 +msgid "Bad request." +msgstr "" + +#: actions/apioauthauthorize.php:134 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:115 actions/makeadmin.php:66 +#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 +#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:139 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 +#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/subscribe.php:46 actions/tagother.php:166 +#: 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 sessão. Por favor, tente novamente." + +#: actions/apioauthauthorize.php:146 +#, fuzzy +msgid "Invalid nickname / password!" +msgstr "Nome de utilizador ou senha inválidos." + +#: actions/apioauthauthorize.php:170 +#, fuzzy +msgid "DB error deleting OAuth app user." +msgstr "Erro ao configurar utilizador." + +#: actions/apioauthauthorize.php:196 +#, fuzzy +msgid "DB error inserting OAuth app user." +msgstr "Erro na base de dados ao inserir a marca: %s" + +#: actions/apioauthauthorize.php:231 +#, php-format +msgid "" +"The request token %s has been authorized. Please exchange it for an access " +"token." +msgstr "" + +#: actions/apioauthauthorize.php:241 +#, php-format +msgid "The request token %s has been denied." +msgstr "" + +#: actions/apioauthauthorize.php:246 actions/avatarsettings.php:281 +#: actions/designadminpanel.php:103 actions/editapplication.php:139 +#: actions/emailsettings.php:256 actions/grouplogo.php:319 +#: actions/imsettings.php:220 actions/newapplication.php:121 +#: actions/oauthconnectionssettings.php:151 actions/recoverpassword.php:44 +#: actions/smssettings.php:248 lib/designsettings.php:304 +msgid "Unexpected form submission." +msgstr "Envio inesperado de formulário." + +#: actions/apioauthauthorize.php:273 +msgid "An application would like to connect to your account" +msgstr "" + +#: actions/apioauthauthorize.php:290 +msgid "Allow or deny access" +msgstr "" + +#: actions/apioauthauthorize.php:320 lib/action.php:435 +msgid "Account" +msgstr "Conta" + +#: actions/apioauthauthorize.php:323 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 "Utilizador" + +#: actions/apioauthauthorize.php:326 actions/login.php:233 +#: actions/register.php:429 lib/accountsettingsaction.php:116 +msgid "Password" +msgstr "Senha" + +#: actions/apioauthauthorize.php:338 +#, fuzzy +msgid "Deny" +msgstr "Estilo" + +#: actions/apioauthauthorize.php:344 +#, fuzzy +msgid "Allow" +msgstr "Todas" + +#: actions/apioauthauthorize.php:361 +msgid "Allow or deny access to your account information." +msgstr "" + #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." msgstr "Este método requer um POST ou DELETE." @@ -429,11 +533,11 @@ msgstr "Não pode apagar o estado de outro utilizador." msgid "No such notice." msgstr "Nota não encontrada." -#: actions/apistatusesretweet.php:83 lib/command.php:422 +#: actions/apistatusesretweet.php:83 msgid "Cannot repeat your own notice." msgstr "Não pode repetir a sua própria nota." -#: actions/apistatusesretweet.php:91 lib/command.php:427 +#: actions/apistatusesretweet.php:91 msgid "Already repeated that notice." msgstr "Já repetiu essa nota." @@ -445,17 +549,17 @@ msgstr "Estado apagado." 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 +#: actions/apistatusesupdate.php:162 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Demasiado longo. Tamanho máx. das notas é %d caracteres." -#: actions/apistatusesupdate.php:198 +#: actions/apistatusesupdate.php:203 msgid "Not found" msgstr "Não encontrado" -#: actions/apistatusesupdate.php:221 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:226 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "Tamanho máx. das notas é %d caracteres, incluíndo a URL do anexo." @@ -465,14 +569,14 @@ msgid "Unsupported format." msgstr "Formato não suportado." #: actions/apitimelinefavorites.php:108 -#, fuzzy, php-format +#, php-format msgid "%1$s / Favorites from %2$s" -msgstr "%s / Favoritas de %s" +msgstr "%1$s / Favoritas de %2$s" #: actions/apitimelinefavorites.php:120 -#, fuzzy, php-format +#, php-format msgid "%1$s updates favorited by %2$s / %2$s." -msgstr "%s actualizações preferidas por %s / %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 @@ -539,10 +643,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." @@ -563,8 +670,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" @@ -596,30 +703,6 @@ 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/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 -#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 -#: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 -#: actions/subscribe.php:46 actions/tagother.php:166 -#: 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." - -#: actions/avatarsettings.php:281 actions/designadminpanel.php:103 -#: actions/emailsettings.php:256 actions/grouplogo.php:319 -#: actions/imsettings.php:220 actions/recoverpassword.php:44 -#: actions/smssettings.php:248 lib/designsettings.php:304 -msgid "Unexpected form submission." -msgstr "Envio inesperado de formulário." - #: actions/avatarsettings.php:328 msgid "Pick a square area of the image to be your avatar" msgstr "Escolha uma área quadrada da imagem para ser o seu avatar" @@ -681,19 +764,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:260 +msgid "No such group." +msgstr "Grupo não foi encontrado." #: actions/blockedfromgroup.php:90 #, php-format @@ -701,9 +780,9 @@ msgid "%s blocked profiles" msgstr "%s perfis bloqueados" #: actions/blockedfromgroup.php:93 -#, fuzzy, php-format +#, php-format msgid "%1$s blocked profiles, page %2$d" -msgstr "%s perfis bloqueados, página %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." @@ -760,7 +839,8 @@ msgid "Couldn't delete email confirmation." msgstr "Não foi possível apagar a confirmação do endereço electrónico." #: actions/confirmaddress.php:144 -msgid "Confirm Address" +#, fuzzy +msgid "Confirm address" msgstr "Confirmar Endereço" #: actions/confirmaddress.php:159 @@ -815,11 +895,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." @@ -847,15 +922,15 @@ msgstr "Apagar este utilizador" #: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 #: 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 @@ -864,11 +939,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" @@ -926,7 +1001,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" @@ -942,7 +1017,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" @@ -953,14 +1028,15 @@ msgstr "Repor predefinição" #: actions/pathsadminpanel.php:324 actions/profilesettings.php:174 #: actions/siteadminpanel.php:388 actions/smssettings.php:181 #: actions/subscriptions.php:203 actions/tagother.php:154 -#: actions/useradminpanel.php:313 lib/designsettings.php:256 +#: actions/useradminpanel.php:313 lib/applicationeditform.php:335 +#: lib/applicationeditform.php:336 lib/designsettings.php:256 #: lib/groupeditform.php:202 msgid "Save" 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!" @@ -974,6 +1050,87 @@ msgstr "Adicionar às favoritas" msgid "No such document." msgstr "Documento não encontrado." +#: actions/editapplication.php:54 lib/applicationeditform.php:136 +msgid "Edit application" +msgstr "" + +#: actions/editapplication.php:66 +#, fuzzy +msgid "You must be logged in to edit an application." +msgstr "Precisa de iniciar sessão para editar um grupo." + +#: actions/editapplication.php:77 actions/showapplication.php:94 +#, fuzzy +msgid "You are not the owner of this application." +msgstr "Não é membro deste grupo." + +#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:163 +#: actions/showapplication.php:87 +#, fuzzy +msgid "No such application." +msgstr "Nota não encontrada." + +#: actions/editapplication.php:127 actions/newapplication.php:110 +#: actions/showapplication.php:118 lib/action.php:1167 +msgid "There was a problem with your session token." +msgstr "Ocorreu um problema com a sua sessão." + +#: actions/editapplication.php:161 +#, fuzzy +msgid "Use this form to edit your application." +msgstr "Use este formulário para editar o grupo." + +#: actions/editapplication.php:177 actions/newapplication.php:159 +#, fuzzy +msgid "Name is required." +msgstr "Repita a senha acima. Obrigatório." + +#: actions/editapplication.php:180 actions/newapplication.php:162 +#, fuzzy +msgid "Name is too long (max 255 chars)." +msgstr "Nome completo demasiado longo (máx. 255 caracteres)." + +#: actions/editapplication.php:183 actions/newapplication.php:165 +#, fuzzy +msgid "Description is required." +msgstr "Descrição" + +#: actions/editapplication.php:191 +msgid "Source URL is too long." +msgstr "" + +#: actions/editapplication.php:197 actions/newapplication.php:182 +#, fuzzy +msgid "Source URL is not valid." +msgstr "A URL ‘%s’ do avatar é inválida." + +#: actions/editapplication.php:200 actions/newapplication.php:185 +msgid "Organization is required." +msgstr "" + +#: actions/editapplication.php:203 actions/newapplication.php:188 +#, fuzzy +msgid "Organization is too long (max 255 chars)." +msgstr "Localidade demasiado longa (máx. 255 caracteres)." + +#: actions/editapplication.php:206 actions/newapplication.php:191 +msgid "Organization homepage is required." +msgstr "" + +#: actions/editapplication.php:215 actions/newapplication.php:203 +msgid "Callback is too long." +msgstr "" + +#: actions/editapplication.php:222 actions/newapplication.php:212 +#, fuzzy +msgid "Callback URL is not valid." +msgstr "A URL ‘%s’ do avatar é inválida." + +#: actions/editapplication.php:255 +#, fuzzy +msgid "Could not update application." +msgstr "Não foi possível actualizar o grupo." + #: actions/editgroup.php:56 #, php-format msgid "Edit %s group" @@ -985,8 +1142,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." @@ -995,7 +1152,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." @@ -1003,20 +1160,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 @@ -1038,22 +1195,23 @@ 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 -#: actions/smssettings.php:126 +#: actions/smssettings.php:126 lib/applicationeditform.php:333 +#: lib/applicationeditform.php:334 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 @@ -1103,7 +1261,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." @@ -1126,9 +1284,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." @@ -1212,7 +1371,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." @@ -1225,7 +1384,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 @@ -1245,7 +1404,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 @@ -1264,7 +1423,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." @@ -1310,13 +1469,6 @@ 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:79 msgid "No such file." msgstr "Ficheiro não foi encontrado." @@ -1333,7 +1485,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." @@ -1344,7 +1496,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." @@ -1359,14 +1511,14 @@ msgid "Block user from group" msgstr "Bloquear acesso do utilizador ao grupo" #: actions/groupblock.php:162 -#, fuzzy, php-format +#, php-format msgid "" "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " "will be removed from the group, unable to post, and unable to subscribe to " "the group in the future." msgstr "" -"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 @@ -1381,9 +1533,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." @@ -1391,7 +1543,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 "" @@ -1404,41 +1556,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 @@ -1446,9 +1596,9 @@ msgid "%s group members" msgstr "Membros do grupo %s" #: actions/groupmembers.php:96 -#, fuzzy, php-format +#, php-format msgid "%1$s group members, page %2$d" -msgstr "Membros do grupo %s, página %d" +msgstr "Membros do grupo %1$s, página %2$d" #: actions/groupmembers.php:111 msgid "A list of the users in this group." @@ -1456,7 +1606,7 @@ msgstr "Uma lista dos utilizadores neste grupo." #: 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" @@ -1464,15 +1614,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 @@ -1498,11 +1648,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" @@ -1546,7 +1696,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." @@ -1557,8 +1707,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 @@ -1571,7 +1721,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." @@ -1588,7 +1738,7 @@ msgstr "" "amigos?)" #: actions/imsettings.php:124 -msgid "IM Address" +msgid "IM address" msgstr "Endereço IM" #: actions/imsettings.php:126 @@ -1597,9 +1747,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." @@ -1644,7 +1794,7 @@ 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." @@ -1663,7 +1813,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 @@ -1679,7 +1829,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" @@ -1689,7 +1839,7 @@ 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 lib/command.php:315 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -1734,7 +1884,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:234 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236 msgid "Send" msgstr "Enviar" @@ -1803,127 +1953,122 @@ 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 -msgid "You are already a member of that group" -msgstr "Já é membro desse grupo" - -#: actions/joingroup.php:128 -#, fuzzy, php-format -msgid "Could not join user %1$s to group %2$s" -msgstr "Não foi possível juntar o utilizador %s ao grupo %s" - -#: actions/joingroup.php:135 lib/command.php:239 -#, fuzzy, php-format +#: actions/joingroup.php:131 +#, php-format msgid "%1$s joined group %2$s" -msgstr "%s juntou-se ao grupo %s" +msgstr "%1$s juntou-se ao grupo %2$s" #: actions/leavegroup.php:60 msgid "You must be logged in to leave a group." msgstr "Precisa de iniciar uma sessão para deixar um grupo." -#: actions/leavegroup.php:90 lib/command.php:268 +#: actions/leavegroup.php:90 lib/command.php:265 msgid "You are not a member of that group." msgstr "Não é um membro desse grupo." -#: actions/leavegroup.php:119 lib/command.php:278 -msgid "Could not find membership record." -msgstr "Não foi encontrado um registo de membro de grupo." - -#: actions/leavegroup.php:134 lib/command.php:289 -#, fuzzy, php-format +#: actions/leavegroup.php:127 +#, php-format msgid "%1$s left group %2$s" -msgstr "%s deixou o grupo %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:460 +#: 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 -#: lib/groupeditform.php:152 lib/userprofile.php:131 -msgid "Nickname" -msgstr "Alcunha" - -#: actions/login.php:253 actions/register.php:428 -#: lib/accountsettingsaction.php:116 -msgid "Password" -msgstr "Palavra-chave" - -#: 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 -#, fuzzy, php-format +#, php-format msgid "%1$s is already an admin for group \"%2$s\"." -msgstr "%s já é um administrador do grupo \"%s\"." +msgstr "%1$s já é um administrador do grupo \"%2$s\"." #: actions/makeadmin.php:132 -#, fuzzy, php-format -msgid "Can't get membership record for %1$s in group %2$s" -msgstr "Não existe registo de %s ter entrado no grupo %s" +#, php-format +msgid "Can't get membership record for %1$s in group %2$s." +msgstr "Não existe registo de %1$s ter entrado no grupo %2$s." #: actions/makeadmin.php:145 -#, fuzzy, php-format -msgid "Can't make %1$s an admin for group %2$s" -msgstr "Não é possível tornar %s administrador do grupo %s" +#, php-format +msgid "Can't make %1$s an admin for group %2$s." +msgstr "Não é possível tornar %1$s administrador do grupo %2$s." #: actions/microsummary.php:69 msgid "No current status" msgstr "Sem estado actual" +#: actions/newapplication.php:52 +msgid "New application" +msgstr "" + +#: actions/newapplication.php:64 +#, fuzzy +msgid "You must be logged in to register an application." +msgstr "Tem de iniciar uma sessão para criar o grupo." + +#: actions/newapplication.php:143 +#, fuzzy +msgid "Use this form to register a new application." +msgstr "Use este formulário para criar um grupo novo." + +#: actions/newapplication.php:173 +msgid "Source URL is required." +msgstr "" + +#: actions/newapplication.php:255 actions/newapplication.php:264 +#, fuzzy +msgid "Could not create application." +msgstr "Não foi possível criar sinónimos." + #: actions/newgroup.php:53 msgid "New group" msgstr "Grupo novo" @@ -1936,12 +2081,12 @@ msgstr "Use este formulário para criar um grupo novo." msgid "New message" msgstr "Mensagem nova" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 msgid "You can't send a message to this user." msgstr "Não pode enviar uma mensagem a este utilizador." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:484 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 +#: lib/command.php:475 msgid "No content!" msgstr "Sem conteúdo!" @@ -1949,7 +2094,7 @@ msgstr "Sem conteúdo!" msgid "No recipient specified." msgstr "Não especificou um destinatário." -#: actions/newmessage.php:164 lib/command.php:370 +#: actions/newmessage.php:164 lib/command.php:361 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "Não auto-envie uma mensagem; basta lê-la baixinho a si próprio." @@ -1960,8 +2105,8 @@ msgstr "Mensagem enviada" #: 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" @@ -1989,9 +2134,9 @@ msgid "Text search" msgstr "Pesquisa de texto" #: actions/noticesearch.php:91 -#, fuzzy, php-format +#, php-format msgid "Search results for \"%1$s\" on %2$s" -msgstr "Resultados da pesquisa de \"%s\" em %s" +msgstr "Resultados da pesquisa de \"%1$s\" em %2$s" #: actions/noticesearch.php:121 #, php-format @@ -1999,7 +2144,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 @@ -2008,8 +2153,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 @@ -2025,16 +2170,61 @@ 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/oauthappssettings.php:59 +#, fuzzy +msgid "You must be logged in to list your applications." +msgstr "Precisa de iniciar sessão para editar um grupo." + +#: actions/oauthappssettings.php:74 +#, fuzzy +msgid "OAuth applications" +msgstr "Outras opções" + +#: actions/oauthappssettings.php:85 +msgid "Applications you have registered" +msgstr "" + +#: actions/oauthappssettings.php:135 +#, php-format +msgid "You have not registered any applications yet." +msgstr "" + +#: actions/oauthconnectionssettings.php:71 +msgid "Connected applications" +msgstr "" + +#: actions/oauthconnectionssettings.php:87 +msgid "You have allowed the following applications to access you account." +msgstr "" + +#: actions/oauthconnectionssettings.php:170 +#, fuzzy +msgid "You are not a user of that application." +msgstr "Não é um membro desse grupo." + +#: actions/oauthconnectionssettings.php:180 +msgid "Unable to revoke access for app: " +msgstr "" + +#: actions/oauthconnectionssettings.php:192 +#, php-format +msgid "You have not authorized any applications to use your account." +msgstr "" + +#: actions/oauthconnectionssettings.php:205 +msgid "Developers can edit the registration settings for their applications " +msgstr "" #: actions/oembed.php:79 actions/shownotice.php:100 msgid "Notice has no profile" @@ -2053,8 +2243,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:1038 +#: lib/api.php:1066 lib/api.php:1176 msgid "Not a supported data format." msgstr "Formato de dados não suportado." @@ -2067,7 +2257,8 @@ msgid "Notice Search" msgstr "Pesquisa de Notas" #: actions/othersettings.php:60 -msgid "Other Settings" +#, fuzzy +msgid "Other settings" msgstr "Outras Configurações" #: actions/othersettings.php:71 @@ -2080,23 +2271,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/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 @@ -2110,15 +2326,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" @@ -2133,13 +2349,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" @@ -2147,15 +2363,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." @@ -2163,11 +2379,11 @@ 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:326 msgid "Paths" @@ -2195,7 +2411,7 @@ 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." @@ -2216,11 +2432,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" @@ -2260,15 +2476,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" @@ -2295,7 +2511,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 @@ -2326,18 +2542,19 @@ msgid "Not a valid people tag: %s" msgstr "Categoria de pessoas inválida: %s" #: actions/peopletag.php:144 -#, fuzzy, php-format +#, php-format msgid "Users self-tagged with %1$s - page %2$d" -msgstr "Utilizadores auto-categorizados com %s - página %d" +msgstr "Utilizadores auto-categorizados com %1$s - página %2$d" #: actions/postnotice.php:84 msgid "Invalid notice content" msgstr "Conteúdo da nota é inválido" #: actions/postnotice.php:90 -#, fuzzy, php-format +#, php-format msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’." -msgstr "A licença ‘%s’ da nota não é compatível com a licença ‘%s’ do site." +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" @@ -2358,43 +2575,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 -#: lib/groupeditform.php:161 +#: actions/profilesettings.php:115 actions/register.php:453 +#: lib/applicationeditform.php:230 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\"" @@ -2417,11 +2633,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" @@ -2434,8 +2650,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 @@ -2448,7 +2663,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 @@ -2495,15 +2710,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 @@ -2534,11 +2749,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 @@ -2547,8 +2761,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 @@ -2563,9 +2777,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!" @@ -2619,24 +2831,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" @@ -2644,15 +2857,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" @@ -2668,7 +2881,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." @@ -2688,20 +2901,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." @@ -2709,9 +2922,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." @@ -2723,7 +2936,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:457 +#: actions/register.php:114 actions/register.php:503 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Registar" @@ -2736,19 +2949,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. " @@ -2756,51 +2965,50 @@ 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 -#, fuzzy, php-format +#: actions/register.php:538 +#, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " "want to...\n" @@ -2817,22 +3025,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.)" @@ -2862,11 +3070,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" @@ -2932,25 +3140,25 @@ msgstr "Respostas a %s" #: 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 -#, fuzzy, php-format +#, php-format msgid "" "This is the timeline showing replies to %1$s but %2$s hasn't received a " "notice to his attention yet." msgstr "" -"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 @@ -2963,13 +3171,13 @@ msgstr "" "[juntar-se a grupos](%%action.groups%%)." #: actions/replies.php:205 -#, fuzzy, php-format +#, php-format msgid "" "You can try to [nudge %1$s](../%2$s) or [post something to his or her " "attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" -"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 @@ -2984,6 +3192,84 @@ 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/showapplication.php:82 +#, fuzzy +msgid "You must be logged in to view an application." +msgstr "Precisa de iniciar uma sessão para deixar um grupo." + +#: actions/showapplication.php:158 +#, fuzzy +msgid "Application profile" +msgstr "Nota não tem perfil" + +#: actions/showapplication.php:160 lib/applicationeditform.php:182 +msgid "Icon" +msgstr "" + +#: actions/showapplication.php:170 actions/version.php:195 +#: lib/applicationeditform.php:197 +msgid "Name" +msgstr "Nome" + +#: actions/showapplication.php:179 lib/applicationeditform.php:224 +#, fuzzy +msgid "Organization" +msgstr "Paginação" + +#: actions/showapplication.php:188 actions/version.php:198 +#: lib/applicationeditform.php:211 lib/groupeditform.php:172 +msgid "Description" +msgstr "Descrição" + +#: actions/showapplication.php:193 actions/showgroup.php:429 +#: lib/profileaction.php:174 +msgid "Statistics" +msgstr "Estatísticas" + +#: actions/showapplication.php:204 +#, php-format +msgid "created by %1$s - %2$s access by default - %3$d users" +msgstr "" + +#: actions/showapplication.php:214 +msgid "Application actions" +msgstr "" + +#: actions/showapplication.php:233 +msgid "Reset key & secret" +msgstr "" + +#: actions/showapplication.php:241 +msgid "Application info" +msgstr "" + +#: actions/showapplication.php:243 +msgid "Consumer key" +msgstr "" + +#: actions/showapplication.php:248 +msgid "Consumer secret" +msgstr "" + +#: actions/showapplication.php:253 +msgid "Request token URL" +msgstr "" + +#: actions/showapplication.php:258 +msgid "Access token URL" +msgstr "" + +#: actions/showapplication.php:263 +#, fuzzy +msgid "Authorize URL" +msgstr "Autor" + +#: actions/showapplication.php:268 +msgid "" +"Note: We support HMAC-SHA1 signatures. We do not support the plaintext " +"signature method." +msgstr "" + #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "Não foi possível importar notas favoritas." @@ -2991,25 +3277,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 @@ -3029,7 +3315,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 @@ -3057,7 +3343,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" @@ -3066,17 +3352,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 @@ -3089,7 +3375,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)" @@ -3097,10 +3383,6 @@ msgstr "(Nenhum)" msgid "All members" msgstr "Todos os membros" -#: actions/showgroup.php:429 lib/profileaction.php:174 -msgid "Statistics" -msgstr "Estatísticas" - #: actions/showgroup.php:432 msgid "Created" msgstr "Criado" @@ -3114,12 +3396,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 @@ -3129,14 +3411,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." @@ -3166,24 +3448,24 @@ msgid " tagged %s" msgstr " categorizou %s" #: actions/showstream.php:122 -#, fuzzy, php-format +#, php-format msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" -msgstr "Feed de notas para %s categorizado %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 @@ -3191,9 +3473,9 @@ msgid "FOAF for %s" msgstr "FOAF para %s" #: actions/showstream.php:191 -#, fuzzy, php-format +#, php-format msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet." -msgstr "Estas são as notas de %s, mas %s ainda não publicou nenhuma." +msgstr "Estas são as notas de %1$s, mas %2$s ainda não publicou nenhuma." #: actions/showstream.php:196 msgid "" @@ -3204,13 +3486,13 @@ msgstr "" "esta seria uma óptima altura para começar :)" #: actions/showstream.php:198 -#, fuzzy, php-format +#, php-format msgid "" "You can try to nudge %1$s or [post something to his or her attention](%%%%" "action.newnotice%%%%?status_textarea=%2$s)." msgstr "" -"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 @@ -3220,11 +3502,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 @@ -3233,8 +3515,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 @@ -3259,13 +3541,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." @@ -3285,7 +3567,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" @@ -3333,7 +3615,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" @@ -3345,15 +3627,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" @@ -3433,7 +3715,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." @@ -3446,7 +3728,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 @@ -3475,7 +3757,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 @@ -3567,9 +3849,9 @@ msgid "%s subscribers" msgstr "Subscritores de %s" #: actions/subscribers.php:52 -#, fuzzy, php-format +#, php-format msgid "%1$s subscribers, page %2$d" -msgstr "Subscritores de %s, página %d" +msgstr "Subscritores de %1$s, página %2$d" #: actions/subscribers.php:63 msgid "These are the people who listen to your notices." @@ -3599,8 +3881,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 @@ -3608,9 +3890,9 @@ msgid "%s subscriptions" msgstr "Subscrições de %s" #: actions/subscriptions.php:54 -#, fuzzy, php-format +#, php-format msgid "%1$s subscriptions, page %2$d" -msgstr "Subscrições de %s, página %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." @@ -3653,17 +3935,17 @@ msgstr "SMS" #: 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." @@ -3715,7 +3997,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." @@ -3733,20 +4015,17 @@ 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 -#, fuzzy, php-format +#, php-format 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:321 #: lib/personalgroupnav.php:115 @@ -3777,7 +4056,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." @@ -3809,7 +4088,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." @@ -3903,19 +4182,19 @@ msgstr "" "subscrição." #: actions/userauthorization.php:296 -#, fuzzy, php-format +#, php-format msgid "Listener URI ‘%s’ not found here." -msgstr "Listener URI ‘%s’ não foi encontrado aqui" +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 @@ -3937,20 +4216,16 @@ 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 @@ -3972,9 +4247,9 @@ msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "Tente [pesquisar grupos](%%action.groupsearch%%) e juntar-se a eles." #: actions/version.php:73 -#, fuzzy, php-format +#, php-format msgid "StatusNet %s" -msgstr "Estatísticas" +msgstr "StatusNet %s" #: actions/version.php:153 #, php-format @@ -3982,15 +4257,16 @@ 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 -#, fuzzy msgid "StatusNet" -msgstr "Estado apagado." +msgstr "StatusNet" #: actions/version.php:161 msgid "Contributors" -msgstr "" +msgstr "Colaboradores" #: actions/version.php:168 msgid "" @@ -3999,6 +4275,10 @@ msgid "" "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 "" @@ -4007,6 +4287,9 @@ msgid "" "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 @@ -4014,31 +4297,22 @@ 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 "" - -#: actions/version.php:195 -#, fuzzy -msgid "Name" -msgstr "Alcunha" +msgstr "Plugins" #: actions/version.php:196 lib/action.php:741 -#, fuzzy msgid "Version" -msgstr "Sessões" +msgstr "Versão" #: actions/version.php:197 -#, fuzzy msgid "Author(s)" -msgstr "Autor" +msgstr "Autores" -#: actions/version.php:198 lib/groupeditform.php:172 -msgid "Description" -msgstr "Descrição" - -#: classes/File.php:137 +#: classes/File.php:144 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " @@ -4047,17 +4321,37 @@ 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/Group_member.php:41 +#, fuzzy +msgid "Group join failed." +msgstr "Perfil do grupo" + +#: classes/Group_member.php:53 +#, fuzzy +msgid "Not part of group." +msgstr "Não foi possível actualizar o grupo." + +#: classes/Group_member.php:60 +#, fuzzy +msgid "Group leave failed." +msgstr "Perfil do grupo" + +#: classes/Login_token.php:76 +#, 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." @@ -4070,27 +4364,27 @@ msgstr "Não foi possível inserir a mensagem." msgid "Could not update message with new URI." msgstr "Não foi possível actualizar a mensagem com a nova URI." -#: classes/Notice.php:172 +#: classes/Notice.php:171 #, 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 +#: classes/Notice.php:225 msgid "Problem saving notice. Too long." msgstr "Problema na gravação da nota. Demasiado longa." -#: classes/Notice.php:230 +#: classes/Notice.php:229 msgid "Problem saving notice. Unknown user." msgstr "Problema na gravação da nota. Utilizador desconhecido." -#: classes/Notice.php:235 +#: classes/Notice.php:234 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Demasiadas notas, demasiado rápido; descanse e volte a publicar daqui a " "alguns minutos." -#: classes/Notice.php:241 +#: classes/Notice.php:240 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4098,25 +4392,25 @@ msgstr "" "Demasiadas mensagens duplicadas, demasiado rápido; descanse e volte a " "publicar daqui a alguns minutos." -#: classes/Notice.php:247 +#: classes/Notice.php:246 msgid "You are banned from posting notices on this site." msgstr "Está proibido de publicar notas neste site." -#: classes/Notice.php:309 classes/Notice.php:334 +#: classes/Notice.php:305 classes/Notice.php:330 msgid "Problem saving notice." msgstr "Problema na gravação da nota." -#: classes/Notice.php:1034 +#: classes/Notice.php:1052 #, php-format msgid "DB error inserting reply: %s" msgstr "Ocorreu um erro na base de dados ao inserir a resposta: %s" -#: classes/Notice.php:1359 +#: classes/Notice.php:1423 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" -#: classes/User.php:368 +#: classes/User.php:382 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "%1$s dá-lhe as boas-vindas, @%2$s!" @@ -4139,15 +4433,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" @@ -4157,6 +4451,11 @@ msgstr "Outras" msgid "Other options" msgstr "Outras opções" +#: lib/action.php:144 +#, 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" @@ -4173,13 +4472,9 @@ msgstr "Início" msgid "Personal profile and friends timeline" msgstr "Perfil pessoal e notas dos amigos" -#: lib/action.php:435 -msgid "Account" -msgstr "Conta" - #: 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:438 msgid "Connect" @@ -4260,7 +4555,7 @@ msgstr "FAQ" #: lib/action.php:734 msgid "TOS" -msgstr "Condições do Serviço" +msgstr "Termos" #: lib/action.php:737 msgid "Privacy" @@ -4331,18 +4626,13 @@ msgstr "Posteriores" msgid "Before" msgstr "Anteriores" -#: lib/action.php:1167 -msgid "There was a problem with your session token." -msgstr "Ocorreu um problema com a sua chave de 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:107 -#, fuzzy msgid "Changes to that panel are not allowed." -msgstr "Registo não é permitido." +msgstr "Não são permitidas alterações a esse painel." #: lib/adminpanelaction.php:206 msgid "showForm() not implemented." @@ -4354,7 +4644,7 @@ msgstr "saveSettings() não implementado." #: 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:312 msgid "Basic site configuration" @@ -4362,11 +4652,77 @@ msgstr "Configuração básica do site" #: lib/adminpanelaction.php:317 msgid "Design configuration" -msgstr "Configuração do design" +msgstr "Configuração do estilo" #: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327 msgid "Paths configuration" -msgstr "Configuração dos directórios" +msgstr "Configuração das localizações" + +#: lib/applicationeditform.php:186 +msgid "Icon for this application" +msgstr "" + +#: lib/applicationeditform.php:206 +#, fuzzy, php-format +msgid "Describe your application in %d characters" +msgstr "Descreva o grupo ou o assunto em %d caracteres" + +#: lib/applicationeditform.php:209 +#, fuzzy +msgid "Describe your application" +msgstr "Descreva o grupo ou assunto" + +#: lib/applicationeditform.php:218 +#, fuzzy +msgid "Source URL" +msgstr "Código" + +#: lib/applicationeditform.php:220 +#, fuzzy +msgid "URL of the homepage of this application" +msgstr "URL da página ou do blogue, deste grupo ou assunto" + +#: lib/applicationeditform.php:226 +msgid "Organization responsible for this application" +msgstr "" + +#: lib/applicationeditform.php:232 +#, fuzzy +msgid "URL for the homepage of the organization" +msgstr "URL da página ou do blogue, deste grupo ou assunto" + +#: lib/applicationeditform.php:238 +msgid "URL to redirect to after authentication" +msgstr "" + +#: lib/applicationeditform.php:260 +msgid "Browser" +msgstr "" + +#: lib/applicationeditform.php:276 +msgid "Desktop" +msgstr "" + +#: lib/applicationeditform.php:277 +msgid "Type of application, browser or desktop" +msgstr "" + +#: lib/applicationeditform.php:299 +msgid "Read-only" +msgstr "" + +#: lib/applicationeditform.php:317 +msgid "Read-write" +msgstr "" + +#: lib/applicationeditform.php:318 +msgid "Default access for this application: read-only, or read-write" +msgstr "" + +#: lib/applicationlist.php:154 +#, fuzzy +msgid "Revoke" +msgstr "Remover" #: lib/attachmentlist.php:87 msgid "Attachments" @@ -4388,11 +4744,11 @@ msgstr "Notas em que este anexo aparece" msgid "Tags for this attachment" msgstr "Categorias para este anexo" -#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 +#: lib/authenticationplugin.php:214 lib/authenticationplugin.php:219 msgid "Password changing failed" msgstr "Não foi possível mudar a palavra-chave" -#: lib/authenticationplugin.php:197 +#: lib/authenticationplugin.php:229 msgid "Password changing is not allowed" msgstr "Não é permitido mudar a palavra-chave" @@ -4413,17 +4769,17 @@ msgid "Sorry, this command is not yet implemented." msgstr "Desculpe, este comando ainda não foi implementado." #: lib/command.php:88 -#, fuzzy, php-format -msgid "Could not find a user with nickname %s." +#, php-format +msgid "Could not find a user with nickname %s" msgstr "Não foi encontrado um utilizador com a alcunha %s" #: lib/command.php:92 msgid "It does not make a lot of sense to nudge yourself!" -msgstr "Não faz muito sentido acotovelar-nos a nós mesmos!" +msgstr "Não faz muito sentido tocar-nos a nós mesmos!" #: lib/command.php:99 -#, fuzzy, php-format -msgid "Nudge sent to %s." +#, php-format +msgid "Nudge sent to %s" msgstr "Cotovelada enviada a %s" #: lib/command.php:126 @@ -4437,171 +4793,188 @@ msgstr "" "Subscritores: %2$s\n" "Notas: %3$s" -#: lib/command.php:152 lib/command.php:399 lib/command.php:460 -#, fuzzy -msgid "Notice with that id does not exist." +#: lib/command.php:152 lib/command.php:390 lib/command.php:451 +msgid "Notice with that id does not exist" msgstr "Não existe nenhuma nota com essa identificação" -#: lib/command.php:168 lib/command.php:415 lib/command.php:476 -#: lib/command.php:532 -#, fuzzy -msgid "User has no last notice." +#: lib/command.php:168 lib/command.php:406 lib/command.php:467 +#: lib/command.php:523 +msgid "User has no last notice" msgstr "Utilizador não tem nenhuma última nota" #: lib/command.php:190 msgid "Notice marked as fave." msgstr "Nota marcada como favorita." -#: lib/command.php:284 -#, fuzzy, php-format -msgid "Could not remove user %1$s to group %2$s." +#: lib/command.php:217 +msgid "You are already a member of that group" +msgstr "Já é membro desse grupo" + +#: lib/command.php:231 +#, php-format +msgid "Could not join user %s to group %s" +msgstr "Não foi possível juntar o utilizador %s ao grupo %s" + +#: lib/command.php:236 +#, php-format +msgid "%s joined group %s" +msgstr "%s juntou-se ao grupo %s" + +#: lib/command.php:275 +#, php-format +msgid "Could not remove user %s to group %s" msgstr "Não foi possível remover o utilizador %s do grupo %s" -#: lib/command.php:318 +#: lib/command.php:280 +#, php-format +msgid "%s left group %s" +msgstr "%s deixou o grupo %s" + +#: lib/command.php:309 #, php-format msgid "Fullname: %s" msgstr "Nome completo: %s" -#: lib/command.php:321 +#: lib/command.php:312 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "Localidade: %s" -#: lib/command.php:324 +#: lib/command.php:315 lib/mail.php:256 #, php-format msgid "Homepage: %s" -msgstr "Página de acolhimento: %s" +msgstr "Página pessoal: %s" -#: lib/command.php:327 +#: lib/command.php:318 #, php-format msgid "About: %s" msgstr "Sobre: %s" -#: lib/command.php:358 -#, fuzzy, php-format -msgid "Message too long - maximum is %1$d characters, you sent %2$d." +#: lib/command.php:349 +#, php-format +msgid "Message too long - maximum is %d characters, you sent %d" msgstr "Mensagem demasiado extensa - máx. %d caracteres, enviou %d" -#: lib/command.php:376 -#, fuzzy, php-format -msgid "Direct message to %s sent." +#: lib/command.php:367 +#, php-format +msgid "Direct message to %s sent" msgstr "Mensagem directa para %s enviada" -#: lib/command.php:378 +#: lib/command.php:369 msgid "Error sending direct message." msgstr "Erro no envio da mensagem directa." -#: lib/command.php:435 -#, fuzzy, php-format -msgid "Notice from %s repeated." +#: lib/command.php:413 +msgid "Cannot repeat your own notice" +msgstr "Não pode repetir a sua própria nota" + +#: lib/command.php:418 +msgid "Already repeated that notice" +msgstr "Já repetiu essa nota" + +#: lib/command.php:426 +#, php-format +msgid "Notice from %s repeated" msgstr "Nota de %s repetida" -#: lib/command.php:437 +#: lib/command.php:428 msgid "Error repeating notice." msgstr "Erro ao repetir nota." -#: lib/command.php:491 -#, fuzzy, php-format -msgid "Notice too long - maximum is %1$d characters, you sent %2$d." +#: lib/command.php:482 +#, php-format +msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Nota demasiado extensa - máx. %d caracteres, enviou %d" -#: lib/command.php:500 -#, fuzzy, php-format -msgid "Reply to %s sent." +#: lib/command.php:491 +#, php-format +msgid "Reply to %s sent" msgstr "Resposta a %s enviada" -#: lib/command.php:502 +#: lib/command.php:493 msgid "Error saving notice." msgstr "Erro ao gravar nota." -#: lib/command.php:556 -#, fuzzy -msgid "Specify the name of the user to subscribe to." +#: lib/command.php:547 +msgid "Specify the name of the user to subscribe to" msgstr "Introduza o nome do utilizador para subscrever" -#: lib/command.php:563 +#: lib/command.php:554 #, php-format msgid "Subscribed to %s" msgstr "Subscreveu %s" -#: lib/command.php:584 -#, fuzzy -msgid "Specify the name of the user to unsubscribe from." +#: lib/command.php:575 +msgid "Specify the name of the user to unsubscribe from" msgstr "Introduza o nome do utilizador para deixar de subscrever" -#: lib/command.php:591 +#: lib/command.php:582 #, php-format msgid "Unsubscribed from %s" msgstr "Deixou de subscrever %s" -#: lib/command.php:609 lib/command.php:632 +#: lib/command.php:600 lib/command.php:623 msgid "Command not yet implemented." msgstr "Comando ainda não implementado." -#: lib/command.php:612 +#: lib/command.php:603 msgid "Notification off." msgstr "Notificação desligada." -#: lib/command.php:614 +#: lib/command.php:605 msgid "Can't turn off notification." msgstr "Não foi possível desligar a notificação." -#: lib/command.php:635 +#: lib/command.php:626 msgid "Notification on." msgstr "Notificação ligada." -#: lib/command.php:637 +#: lib/command.php:628 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." +#: lib/command.php:641 +msgid "Login command is disabled" msgstr "Comando para iniciar sessão foi desactivado" -#: lib/command.php:664 -#, fuzzy, php-format -msgid "Could not create login token for %s." -msgstr "Não foi possível criar a chave de entrada para %s" - -#: lib/command.php:669 -#, fuzzy, php-format -msgid "This link is useable only once, and is good for only 2 minutes: %s." +#: lib/command.php:652 +#, 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" -#: lib/command.php:685 +#: lib/command.php:668 msgid "You are not subscribed to anyone." msgstr "Não subscreveu ninguém." -#: lib/command.php:687 +#: lib/command.php:670 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:690 msgid "No one is subscribed to you." msgstr "Ninguém subscreve as suas notas." -#: lib/command.php:709 +#: lib/command.php:692 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:712 msgid "You are not a member of any groups." msgstr "Não está em nenhum grupo." -#: lib/command.php:731 +#: lib/command.php:714 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:728 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4645,32 +5018,32 @@ msgstr "" "on - ligar notificações\n" "off - desligar notificações\n" "help - mostrar esta ajuda\n" -"follow - subscrever este utilizador\n" +"follow - 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 - deixar de subscrever este utilizador\n" -"d - mensagem directa para o utilizador\n" -"get - receber última nota do utilizador\n" -"whois - receber perfil do utilizador\n" -"fav - adicionar última nota do utilizador às favoritas\n" +"leave - deixar de subscrever este utilizador\n" +"d - mensagem directa para o utilizador\n" +"get - receber última nota do utilizador\n" +"whois - receber perfil do utilizador\n" +"fav - adicionar última nota do utilizador às favoritas\n" "fav # - adicionar nota com esta identificação às favoritas\n" "repeat # - repetir uma nota com uma certa identificação\n" -"repeat - repetir a última nota do utilizador\n" +"repeat - repetir a última nota do utilizador\n" "reply # - responder à nota com esta identificação\n" -"reply - responder à última nota do utilizador\n" +"reply - responder à última nota do utilizador\n" "join - juntar-se ao grupo\n" "login - Receber uma ligação para iniciar sessão na interface web\n" "drop - 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 - o mesmo que 'follow'\n" -"unsub - o mesmo que 'leave'\n" -"last - o mesmo que 'get'\n" -"on - ainda não implementado.\n" -"off - ainda não implementado.\n" -"nudge - relembrar um utilizador para actualizar.\n" +"sub - o mesmo que 'follow'\n" +"unsub - o mesmo que 'leave'\n" +"last - o mesmo que 'get'\n" +"on - ainda não implementado.\n" +"off - ainda não implementado.\n" +"nudge - relembrar um utilizador para actualizar.\n" "invite - ainda não implementado.\n" "track - ainda não implementado.\n" "untrack - ainda não implementado.\n" @@ -4679,34 +5052,43 @@ msgstr "" "tracks - ainda não implementado.\n" "tracking - ainda não implementado.\n" -#: lib/common.php:199 +#: lib/common.php:131 msgid "No configuration file found. " msgstr "Ficheiro de configuração não encontrado. " -#: lib/common.php:200 +#: lib/common.php:132 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 +#: lib/common.php:134 msgid "You may wish to run the installer to fix this." msgstr "Talvez queira correr o instalador para resolver esta questão." -#: lib/common.php:202 +#: lib/common.php:135 msgid "Go to the installer." 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" msgstr "Actualizações por SMS" +#: lib/connectsettingsaction.php:120 +#, fuzzy +msgid "Connections" +msgstr "Ligar" + +#: lib/connectsettingsaction.php:121 +msgid "Authorized connected applications" +msgstr "" + #: lib/dberroraction.php:60 msgid "Database error" msgstr "Erro de base de dados" @@ -4724,7 +5106,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" @@ -4784,7 +5166,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" @@ -4804,7 +5186,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" @@ -4826,12 +5208,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 @@ -4892,11 +5274,16 @@ msgstr "MB" msgid "kB" msgstr "kB" -#: lib/jabber.php:191 +#: lib/jabber.php:202 #, php-format msgid "[%s]" msgstr "[%s]" +#: lib/jabber.php:385 +#, fuzzy, php-format +msgid "Unknown inbox source %d." +msgstr "Língua desconhecida \"%s\"." + #: lib/joinform.php:114 msgid "Join" msgstr "Juntar-me" @@ -4907,7 +5294,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" @@ -4977,29 +5364,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 @@ -5013,7 +5386,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" @@ -5034,7 +5407,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 @@ -5066,7 +5439,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 @@ -5208,9 +5581,9 @@ msgid "Sorry, no incoming email allowed." msgstr "Desculpe, não lhe é permitido receber correio electrónico." #: lib/mailhandler.php:228 -#, fuzzy, php-format +#, php-format msgid "Unsupported message type: %s" -msgstr "Formato do ficheiro da imagem não é suportado." +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." @@ -5247,25 +5620,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 @@ -5298,17 +5671,18 @@ msgid "Attach a file" msgstr "Anexar um ficheiro" #: lib/noticeform.php:212 -#, fuzzy -msgid "Share my location." -msgstr "Compartilhe a sua localização" - -#: lib/noticeform.php:214 -#, fuzzy -msgid "Do not share my location." -msgstr "Compartilhe a sua localização" +msgid "Share my location" +msgstr "Partilhar a minha localização." #: lib/noticeform.php:215 -msgid "Hide this info" +#, fuzzy +msgid "Do not share my location" +msgstr "Não partilhar a minha localização." + +#: lib/noticeform.php:216 +msgid "" +"Sorry, retrieving your geo location is taking longer than expected, please " +"try again later" msgstr "" #: lib/noticelist.php:428 @@ -5338,7 +5712,7 @@ msgstr "coords." #: lib/noticelist.php:531 msgid "in context" -msgstr "em contexto" +msgstr "no contexto" #: lib/noticelist.php:556 msgid "Repeated by" @@ -5358,15 +5732,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" @@ -5426,9 +5800,8 @@ msgid "Tags in %s's notices" msgstr "Categorias nas notas de %s" #: lib/plugin.php:114 -#, fuzzy msgid "Unknown" -msgstr "Acção desconhecida" +msgstr "Desconhecida" #: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82 msgid "Subscriptions" @@ -5496,7 +5869,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" @@ -5544,7 +5917,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 @@ -5569,23 +5942,23 @@ msgstr "Já subscrito!" msgid "User has blocked you." msgstr "O utilizador bloqueou-o." -#: lib/subs.php:60 +#: lib/subs.php:63 msgid "Could not subscribe." msgstr "Não foi possível subscrever." -#: lib/subs.php:79 +#: lib/subs.php:82 msgid "Could not subscribe other to you." msgstr "Não foi possível que outro o subscrevesse." -#: lib/subs.php:128 +#: lib/subs.php:137 msgid "Not subscribed!" msgstr "Não subscrito!" -#: lib/subs.php:133 +#: lib/subs.php:142 msgid "Couldn't delete self-subscription." msgstr "Não foi possível apagar a auto-subscrição." -#: lib/subs.php:146 +#: lib/subs.php:158 msgid "Couldn't delete subscription." msgstr "Não foi possível apagar a subscrição." @@ -5599,10 +5972,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" @@ -5663,47 +6032,47 @@ msgstr "Mensagem" msgid "Moderate" msgstr "Moderar" -#: lib/util.php:837 +#: lib/util.php:875 msgid "a few seconds ago" msgstr "há alguns segundos" -#: lib/util.php:839 +#: lib/util.php:877 msgid "about a minute ago" msgstr "há cerca de um minuto" -#: lib/util.php:841 +#: lib/util.php:879 #, php-format msgid "about %d minutes ago" msgstr "há cerca de %d minutos" -#: lib/util.php:843 +#: lib/util.php:881 msgid "about an hour ago" msgstr "há cerca de uma hora" -#: lib/util.php:845 +#: lib/util.php:883 #, php-format msgid "about %d hours ago" msgstr "há cerca de %d horas" -#: lib/util.php:847 +#: lib/util.php:885 msgid "about a day ago" msgstr "há cerca de um dia" -#: lib/util.php:849 +#: lib/util.php:887 #, php-format msgid "about %d days ago" msgstr "há cerca de %d dias" -#: lib/util.php:851 +#: lib/util.php:889 msgid "about a month ago" msgstr "há cerca de um mês" -#: lib/util.php:853 +#: lib/util.php:891 #, php-format msgid "about %d months ago" msgstr "há cerca de %d meses" -#: lib/util.php:855 +#: lib/util.php:893 msgid "about a year ago" msgstr "há cerca de um ano" @@ -5719,5 +6088,5 @@ msgstr "%s não é uma cor válida! Use 3 ou 6 caracteres hexadecimais." #: scripts/xmppdaemon.php:301 #, php-format -msgid "Message too long - maximum is %d characters, you sent %d" -msgstr "Mensagem demasiado extensa - máx. %d caracteres, enviou %d" +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 17754a2362..c3162d4700 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-10 00:46+0000\n" -"PO-Revision-Date: 2010-01-10 00:48:54+0000\n" +"POT-Creation-Date: 2010-01-15 19:15+0000\n" +"PO-Revision-Date: 2010-01-16 17:53:00+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 (r60878); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r61138); 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" @@ -35,25 +35,30 @@ msgstr "Esta página não existe." #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 +#: actions/apistatusesupdate.php:149 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 #: 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 #: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 -#: lib/command.php:163 lib/command.php:311 lib/command.php:364 -#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/command.php:163 lib/command.php:302 lib/command.php:355 +#: lib/command.php:401 lib/command.php:462 lib/command.php:518 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/subs.php:34 lib/subs.php:125 msgid "No such user." msgstr "Este usuário não existe." +#: actions/all.php:84 +#, fuzzy, php-format +msgid "%1$s and friends, page %2$d" +msgstr "Perfis bloqueados no %1$s, pág. %2$d" + #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 +#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -92,14 +97,14 @@ msgstr "" "publicar algo." #: actions/all.php:134 -#, fuzzy, php-format +#, php-format msgid "" "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%%%%?" -"status_textarea=%s)." +"Você pode tentar [chamar a atenção de %1$s](../%2$s) em seu perfil ou " +"[publicar alguma coisa que desperte seu interesse](%%%%action.newnotice%%%%?" +"status_textarea=%3$s)." #: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202 #, php-format @@ -114,7 +119,7 @@ msgstr "" msgid "You and friends" msgstr "Você e amigos" -#: actions/allrss.php:119 actions/apitimelinefriends.php:122 +#: actions/allrss.php:119 actions/apitimelinefriends.php:121 #: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" @@ -125,6 +130,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:155 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!" @@ -138,7 +160,7 @@ msgstr "O método da API não foi encontrado!" #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:114 +#: actions/apistatusesupdate.php:119 msgid "This method requires a POST." msgstr "Este método requer um POST." @@ -169,8 +191,9 @@ msgstr "Não foi possível salvar o perfil." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257 -#: actions/designadminpanel.php:122 actions/newnotice.php:94 +#: actions/apistatusesupdate.php:132 actions/avatarsettings.php:257 +#: actions/designadminpanel.php:122 actions/editapplication.php:118 +#: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format msgid "" @@ -184,6 +207,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." @@ -224,26 +250,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!" @@ -269,7 +275,7 @@ 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!" +msgid "This status is already a favorite." msgstr "Esta mensagem já é favorita!" #: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 @@ -277,7 +283,7 @@ 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!" +msgid "That status is not a favorite." msgstr "Essa mensagem não é favorita!" #: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 @@ -298,7 +304,7 @@ 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!" +msgid "You cannot unfollow yourself." msgstr "Você não pode deixar de seguir você mesmo!" #: actions/apifriendshipsexists.php:94 @@ -333,7 +339,8 @@ msgstr "Esta identificação já está em uso. Tente outro." msgid "Not a valid nickname." msgstr "Não é uma identificação válida." -#: actions/apigroupcreate.php:196 actions/editgroup.php:195 +#: actions/apigroupcreate.php:196 actions/editapplication.php:212 +#: actions/editgroup.php:195 actions/newapplication.php:200 #: actions/newgroup.php:139 actions/profilesettings.php:222 #: actions/register.php:217 msgid "Homepage is not a valid URL." @@ -345,7 +352,8 @@ msgstr "A URL informada não é válida." msgid "Full name is too long (max 255 chars)." msgstr "Nome completo muito extenso (máx. 255 caracteres)" -#: actions/apigroupcreate.php:213 +#: actions/apigroupcreate.php:213 actions/editapplication.php:187 +#: actions/newapplication.php:169 #, php-format msgid "Description is too long (max %d chars)." msgstr "Descrição muito extensa (máximo %d caracteres)." @@ -385,7 +393,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 lib/command.php:217 +#: actions/apigroupjoin.php:110 actions/joingroup.php:90 msgid "You are already a member of that group." msgstr "Você já é membro desse grupo." @@ -393,19 +401,19 @@ 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 lib/command.php:234 -#, fuzzy, php-format +#: actions/apigroupjoin.php:138 actions/joingroup.php:124 +#, 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." +msgstr "Não foi possível associar o usuário %1$s ao grupo %2$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 actions/leavegroup.php:127 -#, fuzzy, php-format +#: actions/apigroupleave.php:124 actions/leavegroup.php:119 +#, 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." +msgstr "Não foi possível remover o usuário %1$s do grupo %2$s." #: actions/apigrouplist.php:95 #, php-format @@ -422,6 +430,102 @@ msgstr "Grupos de %s" msgid "groups on %s" msgstr "grupos no %s" +#: actions/apioauthauthorize.php:108 actions/apioauthauthorize.php:114 +msgid "Bad request." +msgstr "Requisição errada." + +#: actions/apioauthauthorize.php:134 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:115 actions/makeadmin.php:66 +#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 +#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:139 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 +#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/subscribe.php:46 actions/tagother.php:166 +#: 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 o seu token de sessão. Tente novamente, por favor." + +#: actions/apioauthauthorize.php:146 +msgid "Invalid nickname / password!" +msgstr "Nome de usuário e/ou senha inválido(s)!" + +#: actions/apioauthauthorize.php:170 +msgid "DB error deleting OAuth app user." +msgstr "" +"Erro no banco de dados durante a exclusão do aplicativo OAuth do usuário." + +#: actions/apioauthauthorize.php:196 +msgid "DB error inserting OAuth app user." +msgstr "" +"Erro no banco de dados durante a inserção do aplicativo OAuth do usuário." + +#: actions/apioauthauthorize.php:231 +#, php-format +msgid "" +"The request token %s has been authorized. Please exchange it for an access " +"token." +msgstr "" +"O token de requisição %s foi autorizado. Por favor, troque-o por um token de " +"acesso." + +#: actions/apioauthauthorize.php:241 +#, php-format +msgid "The request token %s has been denied." +msgstr "O token de requisição %s foi negado." + +#: actions/apioauthauthorize.php:246 actions/avatarsettings.php:281 +#: actions/designadminpanel.php:103 actions/editapplication.php:139 +#: actions/emailsettings.php:256 actions/grouplogo.php:319 +#: actions/imsettings.php:220 actions/newapplication.php:121 +#: actions/oauthconnectionssettings.php:151 actions/recoverpassword.php:44 +#: actions/smssettings.php:248 lib/designsettings.php:304 +msgid "Unexpected form submission." +msgstr "Submissão inesperada de formulário." + +#: actions/apioauthauthorize.php:273 +msgid "An application would like to connect to your account" +msgstr "Uma aplicação gostaria de se conectar à sua conta" + +#: actions/apioauthauthorize.php:290 +msgid "Allow or deny access" +msgstr "Permitir ou negar o acesso" + +#: actions/apioauthauthorize.php:320 lib/action.php:435 +msgid "Account" +msgstr "Conta" + +#: actions/apioauthauthorize.php:323 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/apioauthauthorize.php:326 actions/login.php:233 +#: actions/register.php:429 lib/accountsettingsaction.php:116 +msgid "Password" +msgstr "Senha" + +#: actions/apioauthauthorize.php:338 +msgid "Deny" +msgstr "Negar" + +#: actions/apioauthauthorize.php:344 +msgid "Allow" +msgstr "Permitir" + +#: actions/apioauthauthorize.php:361 +msgid "Allow or deny access to your account information." +msgstr "Permitir ou negar o acesso às informações da sua conta." + #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." msgstr "Esse método requer um POST ou DELETE." @@ -435,11 +539,11 @@ msgstr "Você não pode excluir uma mensagem de outro usuário." msgid "No such notice." msgstr "Essa mensagem não existe." -#: actions/apistatusesretweet.php:83 lib/command.php:422 +#: actions/apistatusesretweet.php:83 msgid "Cannot repeat your own notice." msgstr "Você não pode repetria sua própria mensagem." -#: actions/apistatusesretweet.php:91 lib/command.php:427 +#: actions/apistatusesretweet.php:91 msgid "Already repeated that notice." msgstr "Você já repetiu essa mensagem." @@ -451,17 +555,17 @@ msgstr "A mensagem foi excluída." msgid "No status with that ID found." msgstr "Não foi encontrada nenhuma mensagem com esse ID." -#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:162 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Está muito extenso. O tamanho máximo é de %s caracteres." -#: actions/apistatusesupdate.php:198 +#: actions/apistatusesupdate.php:203 msgid "Not found" msgstr "Não encontrado" -#: actions/apistatusesupdate.php:221 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:226 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "O tamanho máximo da mensagem é de %s caracteres" @@ -471,14 +575,14 @@ msgid "Unsupported format." msgstr "Formato não suportado." #: actions/apitimelinefavorites.php:108 -#, fuzzy, php-format +#, php-format msgid "%1$s / Favorites from %2$s" -msgstr "%s / Favoritas de %s" +msgstr "%1$s / Favoritas de %2$s" #: actions/apitimelinefavorites.php:120 -#, fuzzy, php-format +#, php-format msgid "%1$s updates favorited by %2$s / %2$s." -msgstr "%s marcadas como favoritas por %s / %s." +msgstr "%1$s marcadas como favoritas por %2$s / %2$s." #: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 #: actions/grouprss.php:131 actions/userrss.php:90 @@ -545,8 +649,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." @@ -570,8 +677,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" @@ -603,30 +710,6 @@ 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/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 -#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 -#: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 -#: actions/subscribe.php:46 actions/tagother.php:166 -#: 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 o seu token de sessão. Tente novamente, por favor." - -#: actions/avatarsettings.php:281 actions/designadminpanel.php:103 -#: actions/emailsettings.php:256 actions/grouplogo.php:319 -#: actions/imsettings.php:220 actions/recoverpassword.php:44 -#: actions/smssettings.php:248 lib/designsettings.php:304 -msgid "Unexpected form submission." -msgstr "Submissão inesperada de formulário." - #: actions/avatarsettings.php:328 msgid "Pick a square area of the image to be your avatar" msgstr "Selecione uma área quadrada da imagem para ser seu avatar" @@ -689,19 +772,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:260 +msgid "No such group." +msgstr "Esse grupo não existe." #: actions/blockedfromgroup.php:90 #, php-format @@ -709,9 +788,9 @@ msgid "%s blocked profiles" msgstr "Perfis bloqueados no %s" #: actions/blockedfromgroup.php:93 -#, fuzzy, php-format +#, php-format msgid "%1$s blocked profiles, page %2$d" -msgstr "Perfis bloqueados no %s, página %d" +msgstr "Perfis bloqueados no %1$s, pág. %2$d" #: actions/blockedfromgroup.php:108 msgid "A list of the users blocked from joining this group." @@ -768,7 +847,7 @@ msgid "Couldn't delete email confirmation." msgstr "Não foi possível excluir a confirmação de e-mail." #: actions/confirmaddress.php:144 -msgid "Confirm Address" +msgid "Confirm address" msgstr "Confirme o endereço" #: actions/confirmaddress.php:159 @@ -823,11 +902,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." @@ -961,7 +1035,8 @@ msgstr "Restaura de volta ao padrão" #: actions/pathsadminpanel.php:324 actions/profilesettings.php:174 #: actions/siteadminpanel.php:388 actions/smssettings.php:181 #: actions/subscriptions.php:203 actions/tagother.php:154 -#: actions/useradminpanel.php:313 lib/designsettings.php:256 +#: actions/useradminpanel.php:313 lib/applicationeditform.php:335 +#: lib/applicationeditform.php:336 lib/designsettings.php:256 #: lib/groupeditform.php:202 msgid "Save" msgstr "Salvar" @@ -982,6 +1057,76 @@ msgstr "Adicionar às favoritas" msgid "No such document." msgstr "Esse documento não existe." +#: actions/editapplication.php:54 lib/applicationeditform.php:136 +msgid "Edit application" +msgstr "Editar a aplicação" + +#: actions/editapplication.php:66 +msgid "You must be logged in to edit an application." +msgstr "Você precisa estar autenticado para editar uma aplicação." + +#: actions/editapplication.php:77 actions/showapplication.php:94 +msgid "You are not the owner of this application." +msgstr "Você não é o dono desta aplicação." + +#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:163 +#: actions/showapplication.php:87 +msgid "No such application." +msgstr "Essa aplicação não existe." + +#: actions/editapplication.php:127 actions/newapplication.php:110 +#: actions/showapplication.php:118 lib/action.php:1167 +msgid "There was a problem with your session token." +msgstr "Ocorreu um problema com o seu token de sessão." + +#: actions/editapplication.php:161 +msgid "Use this form to edit your application." +msgstr "Use este formulário para editar a sua aplicação." + +#: actions/editapplication.php:177 actions/newapplication.php:159 +msgid "Name is required." +msgstr "O nome é obrigatório." + +#: actions/editapplication.php:180 actions/newapplication.php:162 +msgid "Name is too long (max 255 chars)." +msgstr "O nome é muito extenso (máx. 255 caracteres)." + +#: actions/editapplication.php:183 actions/newapplication.php:165 +msgid "Description is required." +msgstr "A descrição é obrigatória." + +#: actions/editapplication.php:191 +msgid "Source URL is too long." +msgstr "A URL da fonte é muito extensa." + +#: actions/editapplication.php:197 actions/newapplication.php:182 +msgid "Source URL is not valid." +msgstr "A URL da fonte não é válida." + +#: actions/editapplication.php:200 actions/newapplication.php:185 +msgid "Organization is required." +msgstr "A organização é obrigatória." + +#: actions/editapplication.php:203 actions/newapplication.php:188 +msgid "Organization is too long (max 255 chars)." +msgstr "A organização é muito extensa (máx. 255 caracteres)." + +#: actions/editapplication.php:206 actions/newapplication.php:191 +msgid "Organization homepage is required." +msgstr "O site da organização é obrigatório." + +#: actions/editapplication.php:215 actions/newapplication.php:203 +msgid "Callback is too long." +msgstr "O retorno é muito extenso." + +#: actions/editapplication.php:222 actions/newapplication.php:212 +msgid "Callback URL is not valid." +msgstr "A URL de retorno não é válida." + +#: actions/editapplication.php:255 +msgid "Could not update application." +msgstr "Não foi possível atualizar a aplicação." + #: actions/editgroup.php:56 #, php-format msgid "Edit %s group" @@ -993,8 +1138,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" -msgstr "Você deve ser o administrador do grupo para editá-lo" +msgid "You must be an admin to edit the group." +msgstr "Você deve ser um administrador para editar o grupo." #: actions/editgroup.php:154 msgid "Use this form to edit the group." @@ -1018,7 +1163,7 @@ msgid "Options saved." msgstr "As configurações foram salvas." #: actions/emailsettings.php:60 -msgid "Email Settings" +msgid "Email settings" msgstr "Configurações do e-mail" #: actions/emailsettings.php:71 @@ -1050,12 +1195,13 @@ msgstr "" "de spam!) por uma mensagem com mais instruções." #: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 +#: actions/smssettings.php:126 lib/applicationeditform.php:333 +#: lib/applicationeditform.php:334 msgid "Cancel" msgstr "Cancelar" #: actions/emailsettings.php:121 -msgid "Email Address" +msgid "Email address" msgstr "Endereço de e-mail" #: actions/emailsettings.php:123 @@ -1133,9 +1279,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." @@ -1319,13 +1466,6 @@ 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:79 msgid "No such file." msgstr "Esse arquivo não existe." @@ -1342,7 +1482,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." @@ -1368,14 +1508,14 @@ msgid "Block user from group" msgstr "Bloquear o usuário no grupo" #: actions/groupblock.php:162 -#, fuzzy, php-format +#, php-format msgid "" "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " "will be removed from the group, unable to post, and unable to subscribe to " "the group in the future." msgstr "" -"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 " +"Tem certeza que deseja bloquear o usuário \"%1$s\" no grupo \"%2$s\"? Ele " +"será removido do grupo e impossibilitado de publicar e de se juntar ao grupo " "futuramente." #: actions/groupblock.php:178 @@ -1391,9 +1531,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." @@ -1416,12 +1556,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." @@ -1438,6 +1572,10 @@ msgstr "" "Você pode enviar uma imagem de logo para o seu grupo. O tamanho máximo do " "arquivo é %s." +#: actions/grouplogo.php:178 +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" @@ -1456,9 +1594,9 @@ msgid "%s group members" msgstr "Membros do grupo %s" #: actions/groupmembers.php:96 -#, fuzzy, php-format +#, php-format msgid "%1$s group members, page %2$d" -msgstr "Membros do grupo %s, pág. %d" +msgstr "Membros do grupo %1$s, pág. %2$d" #: actions/groupmembers.php:111 msgid "A list of the users in this group." @@ -1567,7 +1705,7 @@ msgid "Error removing the block." msgstr "Erro na remoção do bloqueio." #: actions/imsettings.php:59 -msgid "IM Settings" +msgid "IM settings" msgstr "Configurações do MI" #: actions/imsettings.php:70 @@ -1598,7 +1736,7 @@ msgstr "" "contatos?)" #: actions/imsettings.php:124 -msgid "IM Address" +msgid "IM address" msgstr "Endereço do MI" #: actions/imsettings.php:126 @@ -1700,7 +1838,7 @@ 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 lib/command.php:315 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -1745,7 +1883,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:234 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236 msgid "Send" msgstr "Enviar" @@ -1815,89 +1953,61 @@ 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 -msgid "You are already a member of that group" -msgstr "Você já é um membro desse grupo." - -#: 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/joingroup.php:135 lib/command.php:239 -#, fuzzy, php-format +#: actions/joingroup.php:131 +#, php-format msgid "%1$s joined group %2$s" -msgstr "%s associou-se ao grupo %s" +msgstr "%1$s associou-se ao grupo %2$s" #: actions/leavegroup.php:60 msgid "You must be logged in to leave a group." msgstr "Você deve estar autenticado para sair de um grupo." -#: actions/leavegroup.php:90 lib/command.php:268 +#: actions/leavegroup.php:90 lib/command.php:265 msgid "You are not a member of that group." msgstr "Você não é um membro desse grupo." -#: actions/leavegroup.php:119 lib/command.php:278 -msgid "Could not find membership record." -msgstr "Não foi possível encontrar o registro do membro." - -#: actions/leavegroup.php:134 lib/command.php:289 -#, fuzzy, php-format +#: actions/leavegroup.php:127 +#, php-format msgid "%1$s left group %2$s" -msgstr "%s deixou o grupo %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 "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:460 +#: 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 -#: lib/groupeditform.php:152 lib/userprofile.php:131 -msgid "Nickname" -msgstr "Usuário" - -#: actions/login.php:253 actions/register.php:428 -#: 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." @@ -1905,7 +2015,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]" @@ -1921,24 +2031,44 @@ msgstr "" "usuário." #: actions/makeadmin.php:95 -#, fuzzy, php-format +#, php-format msgid "%1$s is already an admin for group \"%2$s\"." -msgstr "%s já é um administrador do grupo \"%s\"." +msgstr "%1$s já é um administrador do grupo \"%2$s\"." #: actions/makeadmin.php:132 -#, 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" +#, 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 %1$s no grupo %2$s." #: actions/makeadmin.php:145 -#, 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" +#, php-format +msgid "Can't make %1$s an admin for group %2$s." +msgstr "Não foi possível tornar %1$s um administrador do grupo %2$s." #: actions/microsummary.php:69 msgid "No current status" msgstr "Nenhuma mensagem atual" +#: actions/newapplication.php:52 +msgid "New application" +msgstr "Nova aplicação" + +#: actions/newapplication.php:64 +msgid "You must be logged in to register an application." +msgstr "Você deve estar autenticado para registrar uma aplicação." + +#: actions/newapplication.php:143 +msgid "Use this form to register a new application." +msgstr "Utilize este formulário para registrar uma nova aplicação." + +#: actions/newapplication.php:173 +msgid "Source URL is required." +msgstr "A URL da fonte é obrigatória." + +#: actions/newapplication.php:255 actions/newapplication.php:264 +msgid "Could not create application." +msgstr "Não foi possível criar a aplicação." + #: actions/newgroup.php:53 msgid "New group" msgstr "Novo grupo" @@ -1951,12 +2081,12 @@ msgstr "Utilize este formulário para criar um novo grupo." msgid "New message" msgstr "Nova mensagem" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 msgid "You can't send a message to this user." msgstr "Você não pode enviar mensagens para este usuário." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:484 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 +#: lib/command.php:475 msgid "No content!" msgstr "Nenhum conteúdo!" @@ -1964,7 +2094,7 @@ msgstr "Nenhum conteúdo!" msgid "No recipient specified." msgstr "Não foi especificado nenhum destinatário." -#: actions/newmessage.php:164 lib/command.php:370 +#: actions/newmessage.php:164 lib/command.php:361 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -1977,8 +2107,8 @@ msgstr "A mensagem foi enviada" #: actions/newmessage.php:185 #, php-format -msgid "Direct message to %s sent" -msgstr "A mensagem direta para %s foi enviada" +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 msgid "Ajax Error" @@ -2006,9 +2136,9 @@ msgid "Text search" msgstr "Procurar por texto" #: actions/noticesearch.php:91 -#, fuzzy, php-format +#, php-format msgid "Search results for \"%1$s\" on %2$s" -msgstr "Resultados da procura por \"%s\" no %s" +msgstr "Resultados da procura para \"%1$s\" no %2$s" #: actions/noticesearch.php:121 #, php-format @@ -2054,6 +2184,50 @@ msgstr "A chamada de atenção foi enviada" msgid "Nudge sent!" msgstr "A chamada de atenção foi enviada!" +#: actions/oauthappssettings.php:59 +msgid "You must be logged in to list your applications." +msgstr "Você precisa estar autenticado para listar suas aplicações." + +#: actions/oauthappssettings.php:74 +msgid "OAuth applications" +msgstr "Aplicações OAuth" + +#: actions/oauthappssettings.php:85 +msgid "Applications you have registered" +msgstr "Aplicações que você registrou" + +#: actions/oauthappssettings.php:135 +#, php-format +msgid "You have not registered any applications yet." +msgstr "Você ainda não registrou nenhuma aplicação." + +#: actions/oauthconnectionssettings.php:71 +msgid "Connected applications" +msgstr "Aplicações conectadas" + +#: actions/oauthconnectionssettings.php:87 +msgid "You have allowed the following applications to access you account." +msgstr "Você permitiu que as seguintes aplicações acessem a sua conta." + +#: actions/oauthconnectionssettings.php:170 +msgid "You are not a user of that application." +msgstr "Você não é um usuário dessa aplicação." + +#: actions/oauthconnectionssettings.php:180 +msgid "Unable to revoke access for app: " +msgstr "Não foi possível revogar o acesso para a aplicação: " + +#: actions/oauthconnectionssettings.php:192 +#, php-format +msgid "You have not authorized any applications to use your account." +msgstr "Você não autorizou nenhuma aplicação a usar a sua conta." + +#: actions/oauthconnectionssettings.php:205 +msgid "Developers can edit the registration settings for their applications " +msgstr "" +"Os desenvolvedores podem editar as configurações de registro para suas " +"aplicações " + #: actions/oembed.php:79 actions/shownotice.php:100 msgid "Notice has no profile" msgstr "A mensagem não está associada a nenhum perfil" @@ -2071,8 +2245,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:1038 +#: lib/api.php:1066 lib/api.php:1176 msgid "Not a supported data format." msgstr "Não é um formato de dados suportado." @@ -2085,7 +2259,7 @@ msgid "Notice Search" msgstr "Procurar mensagens" #: actions/othersettings.php:60 -msgid "Other Settings" +msgid "Other settings" msgstr "Outras configurações" #: actions/othersettings.php:71 @@ -2116,6 +2290,26 @@ 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/otp.php:69 +msgid "No user ID specified." +msgstr "Não foi especificado nenhum ID de usuário." + +#: actions/otp.php:83 +msgid "No login token specified." +msgstr "Não foi especificado nenhum token de autenticação." + +#: actions/otp.php:90 +msgid "No login token requested." +msgstr "Não foi requerido nenhum token de autenticação." + +#: actions/otp.php:95 +msgid "Invalid login token specified." +msgstr "O token de autenticação especificado é inválido." + +#: actions/otp.php:104 +msgid "Login token expired." +msgstr "O token de autenticação expirou." + #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" @@ -2152,7 +2346,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" @@ -2315,7 +2509,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 @@ -2345,19 +2539,19 @@ msgid "Not a valid people tag: %s" msgstr "Não é uma etiqueta de pessoa válida: %s" #: actions/peopletag.php:144 -#, fuzzy, php-format +#, php-format msgid "Users self-tagged with %1$s - page %2$d" -msgstr "Usuários auto-etiquetados com %s - pág. %d" +msgstr "Usuários auto-etiquetados com %1$s - pág. %2$d" #: actions/postnotice.php:84 msgid "Invalid notice content" msgstr "O conteúdo da mensagem é inválido" #: actions/postnotice.php:90 -#, fuzzy, php-format +#, 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." +"A licença ‘%1$s’ da mensagem não é compatível com a licença ‘%2$s’ do site." #: actions/profilesettings.php:60 msgid "Profile settings" @@ -2378,42 +2572,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 -#: lib/groupeditform.php:161 +#: actions/profilesettings.php:115 actions/register.php:453 +#: lib/applicationeditform.php:230 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\"" @@ -2729,7 +2923,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." @@ -2741,7 +2935,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:457 +#: actions/register.php:114 actions/register.php:503 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Registrar-se" @@ -2754,19 +2948,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. " @@ -2774,41 +2964,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." @@ -2816,8 +3006,8 @@ msgstr "" " exceto estes dados particulares: senha, endereço de e-mail, endereço de MI " "e número de telefone." -#: actions/register.php:537 -#, fuzzy, php-format +#: actions/register.php:538 +#, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " "want to...\n" @@ -2834,10 +3024,10 @@ msgid "" "\n" "Thanks for signing up and we hope you enjoy using this service." msgstr "" -"Parabéns, %s! E bem-vindo(a) a %%%%site.name%%%%. A partir daqui, você " +"Parabéns, %1$s! E bem-vindo(a) a %%%%site.name%%%%. A partir daqui, você " "pode...\n" "\n" -"* Acessar [seu perfil](%s) e publicar sua primeira mensagem.\n" +"* Acessar [seu perfil](%2$s) e publicar sua primeira mensagem.\n" "* Adicionar um [endereço de Jabber/GTalk](%%%%action.imsettings%%%%) para " "que você possa publicar via mensagens instantâneas.\n" "* [Procurar pessoas](%%%%action.peoplesearch%%%%) que você conheça ou que " @@ -2849,7 +3039,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.)" @@ -2961,13 +3151,13 @@ msgid "Replies feed for %s (Atom)" msgstr "Fonte de respostas para %s (Atom)" #: actions/replies.php:198 -#, fuzzy, php-format +#, php-format msgid "" "This is the timeline showing replies to %1$s but %2$s hasn't received a " "notice to his attention yet." msgstr "" -"Esse é o fluxo de mensagens de resposta para %s, mas %s ainda não recebeu " -"nenhuma mensagem direcionada a ele(a)." +"Esse é o fluxo de mensagens de resposta para %1$s, mas %2$s ainda não " +"recebeu nenhuma mensagem direcionada a ele(a)." #: actions/replies.php:203 #, php-format @@ -2979,13 +3169,14 @@ msgstr "" "pessoas ou [associe-se a grupos](%%action.groups%%)." #: actions/replies.php:205 -#, fuzzy, php-format +#, php-format msgid "" "You can try to [nudge %1$s](../%2$s) or [post something to his or her " "attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" -"Você pode tentar [chamar a atenção de %s](../%s) ou [publicar alguma coisa " -"que desperte seu interesse](%%%%action.newnotice%%%%?status_textarea=%s)." +"Você pode tentar [chamar a atenção de %1$s](../%2$s) ou [publicar alguma " +"coisa que desperte seu interesse](%%%%action.newnotice%%%%?status_textarea=%3" +"$s)." #: actions/repliesrss.php:72 #, php-format @@ -3000,6 +3191,82 @@ 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/showapplication.php:82 +msgid "You must be logged in to view an application." +msgstr "Você deve estar autenticado para visualizar uma aplicação." + +#: actions/showapplication.php:158 +msgid "Application profile" +msgstr "Perfil da aplicação" + +#: actions/showapplication.php:160 lib/applicationeditform.php:182 +msgid "Icon" +msgstr "Ãcone" + +#: actions/showapplication.php:170 actions/version.php:195 +#: lib/applicationeditform.php:197 +msgid "Name" +msgstr "Nome" + +#: actions/showapplication.php:179 lib/applicationeditform.php:224 +msgid "Organization" +msgstr "Organização" + +#: actions/showapplication.php:188 actions/version.php:198 +#: lib/applicationeditform.php:211 lib/groupeditform.php:172 +msgid "Description" +msgstr "Descrição" + +#: actions/showapplication.php:193 actions/showgroup.php:429 +#: lib/profileaction.php:174 +msgid "Statistics" +msgstr "Estatísticas" + +#: actions/showapplication.php:204 +#, php-format +msgid "created by %1$s - %2$s access by default - %3$d users" +msgstr "criado por %1$s - %2$s acessa por padrão - %3$d usuários" + +#: actions/showapplication.php:214 +msgid "Application actions" +msgstr "Ações da aplicação" + +#: actions/showapplication.php:233 +msgid "Reset key & secret" +msgstr "Restaurar a chave e o segredo" + +#: actions/showapplication.php:241 +msgid "Application info" +msgstr "Informação da aplicação" + +#: actions/showapplication.php:243 +msgid "Consumer key" +msgstr "Chave do consumidor" + +#: actions/showapplication.php:248 +msgid "Consumer secret" +msgstr "Segredo do consumidor" + +#: actions/showapplication.php:253 +msgid "Request token URL" +msgstr "URL do token de requisição" + +#: actions/showapplication.php:258 +msgid "Access token URL" +msgstr "URL do token de acesso" + +#: actions/showapplication.php:263 +msgid "Authorize URL" +msgstr "Autorizar a URL" + +#: actions/showapplication.php:268 +msgid "" +"Note: We support HMAC-SHA1 signatures. We do not support the plaintext " +"signature method." +msgstr "" +"Nota: Nós suportamos assinaturas HMAC-SHA1. Nós não suportamos o método de " +"assinatura em texto plano." + #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "Não foi possível recuperar as mensagens favoritas." @@ -3105,7 +3372,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)" @@ -3113,10 +3380,6 @@ msgstr "(Nenhum)" msgid "All members" msgstr "Todos os membros" -#: actions/showgroup.php:429 lib/profileaction.php:174 -msgid "Statistics" -msgstr "Estatísticas" - #: actions/showgroup.php:432 msgid "Created" msgstr "Criado" @@ -3182,9 +3445,9 @@ msgid " tagged %s" msgstr " etiquetada %s" #: actions/showstream.php:122 -#, fuzzy, php-format +#, 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)" +msgstr "Fonte de mensagens de %1$s etiquetada como %2$s (RSS 1.0)" #: actions/showstream.php:129 #, php-format @@ -3207,10 +3470,11 @@ msgid "FOAF for %s" msgstr "FOAF de %s" #: actions/showstream.php:191 -#, fuzzy, php-format +#, 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." +"Este é o fluxo público de mensagens de %1$s, mas %2$s não publicou nada " +"ainda." #: actions/showstream.php:196 msgid "" @@ -3221,13 +3485,13 @@ msgstr "" "mensagem. Que tal começar agora? :)" #: actions/showstream.php:198 -#, fuzzy, php-format +#, php-format msgid "" "You can try to nudge %1$s or [post something to his or her attention](%%%%" "action.newnotice%%%%?status_textarea=%2$s)." msgstr "" -"Você pode tentar chamar a atenção de %s ou [publicar alguma coisa que " -"desperte seu interesse](%%%%action.newnotice%%%%?status_textarea=%s)." +"Você pode tentar chamar a atenção de %1$s ou [publicar alguma coisa que " +"desperte seu interesse](%%%%action.newnotice%%%%?status_textarea=%2$s)." #: actions/showstream.php:234 #, php-format @@ -3276,13 +3540,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" +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\"" -msgstr "Idioma desconhecido \"%s\"" +msgid "Unknown language \"%s\"." +msgstr "Idioma \"%s\" desconhecido." #: actions/siteadminpanel.php:179 msgid "Invalid snapshot report URL." @@ -3463,8 +3727,8 @@ msgid "Save site settings" msgstr "Salvar as configurações do site" #: actions/smssettings.php:58 -msgid "SMS Settings" -msgstr "Configuração de SMS" +msgid "SMS settings" +msgstr "Configuração do SMS" #: actions/smssettings.php:69 #, php-format @@ -3492,7 +3756,7 @@ 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" +msgid "SMS phone number" msgstr "Telefone para SMS" #: actions/smssettings.php:140 @@ -3582,9 +3846,9 @@ msgid "%s subscribers" msgstr "Assinantes de %s" #: actions/subscribers.php:52 -#, fuzzy, php-format +#, php-format msgid "%1$s subscribers, page %2$d" -msgstr "Assinantes de %s, pág. %d" +msgstr "Assinantes de %1$s, pág. %2$d" #: actions/subscribers.php:63 msgid "These are the people who listen to your notices." @@ -3623,9 +3887,9 @@ msgid "%s subscriptions" msgstr "Assinaturas de %s" #: actions/subscriptions.php:54 -#, fuzzy, php-format +#, php-format msgid "%1$s subscriptions, page %2$d" -msgstr "Assinaturas de %s, pág. %d" +msgstr "Assinaturas de %1$s, pág. %2$d" #: actions/subscriptions.php:65 msgid "These are the people whose notices you listen to." @@ -3748,21 +4012,17 @@ 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 -#, fuzzy, php-format +#, 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." +"A licença '%1$s' do fluxo do usuário não é compatível com a licença '%2$s' " +"do site." #: actions/useradminpanel.php:58 lib/adminpanelaction.php:321 #: lib/personalgroupnav.php:115 @@ -3920,9 +4180,9 @@ msgstr "" "completamente a assinatura." #: actions/userauthorization.php:296 -#, fuzzy, php-format +#, php-format msgid "Listener URI ‘%s’ not found here." -msgstr "A URI ‘%s’ do usuário não foi encontrada aqui" +msgstr "A URI ‘%s’ do usuário não foi encontrada aqui." #: actions/userauthorization.php:301 #, php-format @@ -3954,10 +4214,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" @@ -3991,9 +4247,9 @@ msgstr "" "eles." #: actions/version.php:73 -#, fuzzy, php-format +#, php-format msgid "StatusNet %s" -msgstr "Estatísticas" +msgstr "StatusNet %s" #: actions/version.php:153 #, php-format @@ -4001,15 +4257,16 @@ msgid "" "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " "Inc. and contributors." msgstr "" +"Este site funciona sobre %1$s versão %2$s, Copyright 2008-2010 StatusNet, " +"Inc. e colaboradores." #: actions/version.php:157 -#, fuzzy msgid "StatusNet" -msgstr "A mensagem foi excluída." +msgstr "StatusNet" #: actions/version.php:161 msgid "Contributors" -msgstr "" +msgstr "Colaboradores" #: actions/version.php:168 msgid "" @@ -4018,6 +4275,10 @@ msgid "" "Software Foundation, either version 3 of the License, or (at your option) " "any later version. " msgstr "" +"StatusNet é um software livre: você pode redistribui-lo e/ou modificá-lo sob " +"os termos da GNU Affero General Public License, conforme publicado pela Free " +"Software Foundation, na versão 3 desta licença ou (caso deseje) qualquer " +"versão posterior. " #: actions/version.php:174 msgid "" @@ -4026,6 +4287,10 @@ msgid "" "FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License " "for more details. " msgstr "" +"Este programa é distribuído na esperança de ser útil, mas NÃO POSSUI " +"QUALQUER GARANTIA, nem mesmo a garantia implícita de COMERCIALIZAÇÃO ou " +"ADEQUAÇÃO A UMA FINALIDADE ESPECÃFICA. Verifique a GNU Affero General " +"Public License para mais detalhes. " #: actions/version.php:180 #, php-format @@ -4033,31 +4298,22 @@ msgid "" "You should have received a copy of the GNU Affero General Public License " "along with this program. If not, see %s." msgstr "" +"Você deve ter recebido uma cópia da GNU Affero General Public License com " +"este programa. Caso contrário, veja %s." #: actions/version.php:189 msgid "Plugins" -msgstr "" - -#: actions/version.php:195 -#, fuzzy -msgid "Name" -msgstr "Usuário" +msgstr "Plugins" #: actions/version.php:196 lib/action.php:741 -#, fuzzy msgid "Version" -msgstr "Sessões" +msgstr "Versão" #: actions/version.php:197 -#, fuzzy msgid "Author(s)" -msgstr "Autor" +msgstr "Author(es)" -#: actions/version.php:198 lib/groupeditform.php:172 -msgid "Description" -msgstr "Descrição" - -#: classes/File.php:137 +#: classes/File.php:144 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " @@ -4066,16 +4322,33 @@ 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/Group_member.php:41 +msgid "Group join failed." +msgstr "Não foi possível se unir ao grupo." + +#: classes/Group_member.php:53 +msgid "Not part of group." +msgstr "Não é parte de um grupo." + +#: classes/Group_member.php:60 +msgid "Group leave failed." +msgstr "Não foi possível deixar o grupo." + +#: classes/Login_token.php:76 +#, 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." @@ -4088,27 +4361,27 @@ msgstr "Não foi possível inserir a mensagem." msgid "Could not update message with new URI." msgstr "Não foi possível atualizar a mensagem com a nova URI." -#: classes/Notice.php:172 +#: classes/Notice.php:171 #, php-format msgid "DB error inserting hashtag: %s" msgstr "Erro no banco de dados durante a inserção da hashtag: %s" -#: classes/Notice.php:226 +#: classes/Notice.php:225 msgid "Problem saving notice. Too long." msgstr "Problema no salvamento da mensagem. Ela é muito extensa." -#: classes/Notice.php:230 +#: classes/Notice.php:229 msgid "Problem saving notice. Unknown user." msgstr "Problema no salvamento da mensagem. Usuário desconhecido." -#: classes/Notice.php:235 +#: classes/Notice.php:234 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Muitas mensagens em um período curto de tempo; dê uma respirada e publique " "novamente daqui a alguns minutos." -#: classes/Notice.php:241 +#: classes/Notice.php:240 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4116,25 +4389,25 @@ msgstr "" "Muitas mensagens duplicadas em um período curto de tempo; dê uma respirada e " "publique novamente daqui a alguns minutos." -#: classes/Notice.php:247 +#: classes/Notice.php:246 msgid "You are banned from posting notices on this site." msgstr "Você está proibido de publicar mensagens neste site." -#: classes/Notice.php:309 classes/Notice.php:334 +#: classes/Notice.php:305 classes/Notice.php:330 msgid "Problem saving notice." msgstr "Problema no salvamento da mensagem." -#: classes/Notice.php:1034 +#: classes/Notice.php:1052 #, php-format msgid "DB error inserting reply: %s" msgstr "Erro no banco de dados na inserção da reposta: %s" -#: classes/Notice.php:1359 +#: classes/Notice.php:1423 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" -#: classes/User.php:368 +#: classes/User.php:382 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Bem vindo(a) a %1$s, @%2$s!" @@ -4175,6 +4448,11 @@ msgstr "Outras" msgid "Other options" msgstr "Outras opções" +#: lib/action.php:144 +#, 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" @@ -4191,10 +4469,6 @@ msgstr "Início" msgid "Personal profile and friends timeline" msgstr "Perfil pessoal e fluxo de mensagens dos amigos" -#: lib/action.php:435 -msgid "Account" -msgstr "Conta" - #: lib/action.php:435 msgid "Change your email, avatar, password, profile" msgstr "Mude seu e-mail, avatar, senha, perfil" @@ -4349,18 +4623,13 @@ msgstr "Próximo" msgid "Before" msgstr "Anterior" -#: lib/action.php:1167 -msgid "There was a problem with your session token." -msgstr "Ocorreu um problema com o seu token de sessão." - #: lib/adminpanelaction.php:96 msgid "You cannot make changes to this site." msgstr "Você não pode fazer alterações neste site." #: lib/adminpanelaction.php:107 -#, fuzzy msgid "Changes to that panel are not allowed." -msgstr "Não é permitido o registro." +msgstr "Não são permitidas alterações a esse painel." #: lib/adminpanelaction.php:206 msgid "showForm() not implemented." @@ -4386,6 +4655,68 @@ msgstr "Configuração da aparência" msgid "Paths configuration" msgstr "Configuração dos caminhos" +#: lib/applicationeditform.php:186 +msgid "Icon for this application" +msgstr "Ãcone para esta aplicação" + +#: lib/applicationeditform.php:206 +#, php-format +msgid "Describe your application in %d characters" +msgstr "Descreva a sua aplicação em %d caracteres" + +#: lib/applicationeditform.php:209 +msgid "Describe your application" +msgstr "Descreva sua aplicação" + +#: lib/applicationeditform.php:218 +msgid "Source URL" +msgstr "URL da fonte" + +#: lib/applicationeditform.php:220 +msgid "URL of the homepage of this application" +msgstr "URL do site desta aplicação" + +#: lib/applicationeditform.php:226 +msgid "Organization responsible for this application" +msgstr "Organização responsável por esta aplicação" + +#: lib/applicationeditform.php:232 +msgid "URL for the homepage of the organization" +msgstr "URL para o site da organização" + +#: lib/applicationeditform.php:238 +msgid "URL to redirect to after authentication" +msgstr "URL para o redirecionamento após a autenticação" + +#: lib/applicationeditform.php:260 +msgid "Browser" +msgstr "Navegador" + +#: lib/applicationeditform.php:276 +msgid "Desktop" +msgstr "Desktop" + +#: lib/applicationeditform.php:277 +msgid "Type of application, browser or desktop" +msgstr "Tipo de aplicação: navegador ou desktop" + +#: lib/applicationeditform.php:299 +msgid "Read-only" +msgstr "Somente leitura" + +#: lib/applicationeditform.php:317 +msgid "Read-write" +msgstr "Leitura e escrita" + +#: lib/applicationeditform.php:318 +msgid "Default access for this application: read-only, or read-write" +msgstr "" +"Acesso padrão para esta aplicação: somente leitura ou leitura e escrita" + +#: lib/applicationlist.php:154 +msgid "Revoke" +msgstr "Revogar" + #: lib/attachmentlist.php:87 msgid "Attachments" msgstr "Anexos" @@ -4406,15 +4737,13 @@ msgstr "Mensagens onde este anexo aparece" msgid "Tags for this attachment" msgstr "Etiquetas para este anexo" -#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 -#, fuzzy +#: lib/authenticationplugin.php:214 lib/authenticationplugin.php:219 msgid "Password changing failed" -msgstr "Alterar a senha" +msgstr "Não foi possível alterar a senha" -#: lib/authenticationplugin.php:197 -#, fuzzy +#: lib/authenticationplugin.php:229 msgid "Password changing is not allowed" -msgstr "Alterar a senha" +msgstr "Não é permitido alterar a senha" #: lib/channel.php:138 lib/channel.php:158 msgid "Command results" @@ -4433,8 +4762,8 @@ msgid "Sorry, this command is not yet implemented." msgstr "Desculpe, mas esse comando ainda não foi implementado." #: lib/command.php:88 -#, fuzzy, php-format -msgid "Could not find a user with nickname %s." +#, php-format +msgid "Could not find a user with nickname %s" msgstr "Não foi possível encontrar um usuário com a identificação %s" #: lib/command.php:92 @@ -4442,8 +4771,8 @@ msgid "It does not make a lot of sense to nudge yourself!" msgstr "Não faz muito sentido chamar a sua própria atenção!" #: lib/command.php:99 -#, fuzzy, php-format -msgid "Nudge sent to %s." +#, php-format +msgid "Nudge sent to %s" msgstr "Foi enviada a chamada de atenção para %s" #: lib/command.php:126 @@ -4457,173 +4786,190 @@ msgstr "" "Assinantes: %2$s\n" "Mensagens: %3$s" -#: lib/command.php:152 lib/command.php:399 lib/command.php:460 -#, fuzzy -msgid "Notice with that id does not exist." +#: lib/command.php:152 lib/command.php:390 lib/command.php:451 +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." +#: lib/command.php:168 lib/command.php:406 lib/command.php:467 +#: lib/command.php:523 +msgid "User has no last notice" msgstr "O usuário não tem uma \"última mensagem\"" #: lib/command.php:190 msgid "Notice marked as fave." msgstr "Mensagem marcada como favorita." -#: lib/command.php:284 -#, fuzzy, php-format -msgid "Could not remove user %1$s to group %2$s." +#: lib/command.php:217 +msgid "You are already a member of that group" +msgstr "Você já é um membro desse grupo." + +#: lib/command.php:231 +#, 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:236 +#, php-format +msgid "%s joined group %s" +msgstr "%s associou-se ao grupo %s" + +#: lib/command.php:275 +#, 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:318 +#: lib/command.php:280 +#, php-format +msgid "%s left group %s" +msgstr "%s deixou o grupo %s" + +#: lib/command.php:309 #, php-format msgid "Fullname: %s" msgstr "Nome completo: %s" -#: lib/command.php:321 +#: lib/command.php:312 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "Localização: %s" -#: lib/command.php:324 +#: lib/command.php:315 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "Site: %s" -#: lib/command.php:327 +#: lib/command.php:318 #, php-format msgid "About: %s" msgstr "Sobre: %s" -#: lib/command.php:358 -#, fuzzy, php-format -msgid "Message too long - maximum is %1$d characters, you sent %2$d." +#: lib/command.php:349 +#, 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." +#: lib/command.php:367 +#, php-format +msgid "Direct message to %s sent" msgstr "A mensagem direta para %s foi enviada" -#: lib/command.php:378 +#: lib/command.php:369 msgid "Error sending direct message." msgstr "Ocorreu um erro durante o envio da mensagem direta." -#: lib/command.php:435 -#, fuzzy, php-format -msgid "Notice from %s repeated." +#: lib/command.php:413 +msgid "Cannot repeat your own notice" +msgstr "Você não pode repetir sua própria mensagem" + +#: lib/command.php:418 +msgid "Already repeated that notice" +msgstr "Você já repetiu essa mensagem" + +#: lib/command.php:426 +#, php-format +msgid "Notice from %s repeated" msgstr "Mensagem de %s repetida" -#: lib/command.php:437 +#: lib/command.php:428 msgid "Error repeating notice." msgstr "Erro na repetição da mensagem." -#: lib/command.php:491 -#, fuzzy, php-format -msgid "Notice too long - maximum is %1$d characters, you sent %2$d." +#: lib/command.php:482 +#, 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 -#, fuzzy, php-format -msgid "Reply to %s sent." +#: lib/command.php:491 +#, php-format +msgid "Reply to %s sent" msgstr "A resposta a %s foi enviada" -#: lib/command.php:502 +#: lib/command.php:493 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." +#: lib/command.php:547 +msgid "Specify the name of the user to subscribe to" msgstr "Especifique o nome do usuário que será assinado" -#: lib/command.php:563 +#: lib/command.php:554 #, php-format 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." +#: lib/command.php:575 +msgid "Specify the name of the user to unsubscribe from" msgstr "Especifique o nome do usuário cuja assinatura será cancelada" -#: lib/command.php:591 +#: lib/command.php:582 #, php-format msgid "Unsubscribed from %s" msgstr "Cancelada a assinatura de %s" -#: lib/command.php:609 lib/command.php:632 +#: lib/command.php:600 lib/command.php:623 msgid "Command not yet implemented." msgstr "O comando não foi implementado ainda." -#: lib/command.php:612 +#: lib/command.php:603 msgid "Notification off." msgstr "Notificação desligada." -#: lib/command.php:614 +#: lib/command.php:605 msgid "Can't turn off notification." msgstr "Não é possível desligar a notificação." -#: lib/command.php:635 +#: lib/command.php:626 msgid "Notification on." msgstr "Notificação ligada." -#: lib/command.php:637 +#: lib/command.php:628 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." +#: lib/command.php:641 +msgid "Login command is disabled" msgstr "O comando para autenticação está desabilitado" -#: lib/command.php:664 -#, fuzzy, php-format -msgid "Could not create login token for %s." -msgstr "Não foi possível criar o token de autenticação para %s" - -#: lib/command.php:669 -#, fuzzy, php-format -msgid "This link is useable only once, and is good for only 2 minutes: %s." +#: lib/command.php:652 +#, 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:668 msgid "You are not subscribed to anyone." msgstr "Você não está assinando ninguém." -#: lib/command.php:687 +#: lib/command.php:670 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:690 msgid "No one is subscribed to you." msgstr "Ninguém o assinou ainda." -#: lib/command.php:709 +#: lib/command.php:692 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:712 msgid "You are not a member of any groups." msgstr "Você não é membro de nenhum grupo." -#: lib/command.php:731 +#: lib/command.php:714 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:728 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4702,19 +5048,19 @@ msgstr "" "tracks - não implementado ainda\n" "tracking - não implementado ainda\n" -#: lib/common.php:199 +#: lib/common.php:131 msgid "No configuration file found. " msgstr "Não foi encontrado nenhum arquivo de configuração. " -#: lib/common.php:200 +#: lib/common.php:132 msgid "I looked for configuration files in the following places: " msgstr "Eu procurei pelos arquivos de configuração nos seguintes lugares: " -#: lib/common.php:201 +#: lib/common.php:134 msgid "You may wish to run the installer to fix this." msgstr "Você pode querer executar o instalador para corrigir isto." -#: lib/common.php:202 +#: lib/common.php:135 msgid "Go to the installer." msgstr "Ir para o instalador." @@ -4730,6 +5076,14 @@ msgstr "Atualizações via mensageiro instantâneo (MI)" msgid "Updates by SMS" msgstr "Atualizações via SMS" +#: lib/connectsettingsaction.php:120 +msgid "Connections" +msgstr "Conexões" + +#: lib/connectsettingsaction.php:121 +msgid "Authorized connected applications" +msgstr "Aplicações autorizadas conectadas" + #: lib/dberroraction.php:60 msgid "Database error" msgstr "Erro no banco de dados" @@ -4916,11 +5270,16 @@ msgstr "Mb" msgid "kB" msgstr "Kb" -#: lib/jabber.php:191 +#: lib/jabber.php:202 #, php-format msgid "[%s]" msgstr "[%s]" +#: lib/jabber.php:385 +#, php-format +msgid "Unknown inbox source %d." +msgstr "Fonte da caixa de entrada desconhecida %d." + #: lib/joinform.php:114 msgid "Join" msgstr "Entrar" @@ -5000,24 +5359,10 @@ 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" -msgstr "" -"Descrição: %s\n" -"\n" +msgid "Bio: %s" +msgstr "Descrição: %s" #: lib/mail.php:286 #, php-format @@ -5231,9 +5576,9 @@ 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 +#, php-format msgid "Unsupported message type: %s" -msgstr "Formato de imagem não suportado." +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." @@ -5272,16 +5617,16 @@ 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!" -msgstr "O arquivo excede a quota do usuário!" +msgid "File exceeds user's quota." +msgstr "O arquivo excede a quota do usuário." #: 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 arquivo para o diretório de destino." #: lib/mediafile.php:201 lib/mediafile.php:237 -msgid "Could not determine file's mime-type!" -msgstr "Não foi possível determinar o mime-type do arquivo!" +msgid "Could not determine file's MIME type." +msgstr "Não foi possível determinar o tipo MIME do arquivo." #: lib/mediafile.php:270 #, php-format @@ -5290,7 +5635,7 @@ msgstr " Tente usar outro formato %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 arquivo suportado neste servidor." #: lib/messageform.php:120 @@ -5323,18 +5668,20 @@ msgid "Attach a file" msgstr "Anexar um arquivo" #: lib/noticeform.php:212 -#, 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" +msgid "Share my location" +msgstr "Divulgar minha localização" #: lib/noticeform.php:215 -msgid "Hide this info" +msgid "Do not share my location" +msgstr "Não divulgar minha localização" + +#: lib/noticeform.php:216 +msgid "" +"Sorry, retrieving your geo location is taking longer than expected, please " +"try again later" msgstr "" +"Desculpe, mas recuperar a sua geolocalização está demorando mais que o " +"esperado. Por favor, tente novamente mais tarde." #: lib/noticelist.php:428 #, php-format @@ -5451,9 +5798,8 @@ msgid "Tags in %s's notices" msgstr "Etiquetas nas mensagens de %s" #: lib/plugin.php:114 -#, fuzzy msgid "Unknown" -msgstr "Ação desconhecida" +msgstr "Desconhecido" #: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82 msgid "Subscriptions" @@ -5594,23 +5940,23 @@ msgstr "Já assinado!" msgid "User has blocked you." msgstr "O usuário bloqueou você." -#: lib/subs.php:60 +#: lib/subs.php:63 msgid "Could not subscribe." msgstr "Não foi possível assinar." -#: lib/subs.php:79 +#: lib/subs.php:82 msgid "Could not subscribe other to you." msgstr "Não foi possível fazer com que outros o assinem." -#: lib/subs.php:128 +#: lib/subs.php:137 msgid "Not subscribed!" msgstr "Não assinado!" -#: lib/subs.php:133 +#: lib/subs.php:142 msgid "Couldn't delete self-subscription." msgstr "Não foi possível excluir a auto-assinatura." -#: lib/subs.php:146 +#: lib/subs.php:158 msgid "Couldn't delete subscription." msgstr "Não foi possível excluir a assinatura." @@ -5624,10 +5970,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" @@ -5688,47 +6030,47 @@ msgstr "Mensagem" msgid "Moderate" msgstr "Moderar" -#: lib/util.php:837 +#: lib/util.php:875 msgid "a few seconds ago" msgstr "alguns segundos atrás" -#: lib/util.php:839 +#: lib/util.php:877 msgid "about a minute ago" msgstr "cerca de 1 minuto atrás" -#: lib/util.php:841 +#: lib/util.php:879 #, php-format msgid "about %d minutes ago" msgstr "cerca de %d minutos atrás" -#: lib/util.php:843 +#: lib/util.php:881 msgid "about an hour ago" msgstr "cerca de 1 hora atrás" -#: lib/util.php:845 +#: lib/util.php:883 #, php-format msgid "about %d hours ago" msgstr "cerca de %d horas atrás" -#: lib/util.php:847 +#: lib/util.php:885 msgid "about a day ago" msgstr "cerca de 1 dia atrás" -#: lib/util.php:849 +#: lib/util.php:887 #, php-format msgid "about %d days ago" msgstr "cerca de %d dias atrás" -#: lib/util.php:851 +#: lib/util.php:889 msgid "about a month ago" msgstr "cerca de 1 mês atrás" -#: lib/util.php:853 +#: lib/util.php:891 #, php-format msgid "about %d months ago" msgstr "cerca de %d meses atrás" -#: lib/util.php:855 +#: lib/util.php:893 msgid "about a year ago" msgstr "cerca de 1 ano atrás" @@ -5744,6 +6086,6 @@ msgstr "%s não é uma cor válida! Utilize 3 ou 6 caracteres hexadecimais." #: scripts/xmppdaemon.php:301 #, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" -"A mensagem é muito extensa - o máximo são %d caracteres e você enviou %d" +"A mensagem é muito extensa - o máximo são %1$d caracteres e você enviou %2$d." diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po index a0cba423dd..19868d34b2 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-10 00:46+0000\n" -"PO-Revision-Date: 2010-01-10 00:49:00+0000\n" +"POT-Creation-Date: 2010-01-15 19:15+0000\n" +"PO-Revision-Date: 2010-01-15 19:17:57+0000\n" "Language-Team: Russian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60878); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r61101); 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" @@ -36,25 +36,30 @@ msgstr "Ðет такой Ñтраницы" #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 +#: actions/apistatusesupdate.php:149 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 #: 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 #: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 -#: lib/command.php:163 lib/command.php:311 lib/command.php:364 -#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/command.php:163 lib/command.php:302 lib/command.php:355 +#: lib/command.php:401 lib/command.php:462 lib/command.php:518 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/subs.php:34 lib/subs.php:125 msgid "No such user." msgstr "Ðет такого пользователÑ." +#: actions/all.php:84 +#, fuzzy, php-format +msgid "%1$s and friends, page %2$d" +msgstr "Заблокированные профили %1$s, Ñтраница %2$d" + #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 +#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -91,14 +96,14 @@ msgstr "" "action.groups%%) или отправьте что-нибудь Ñами." #: actions/all.php:134 -#, fuzzy, php-format +#, php-format msgid "" "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 @@ -113,7 +118,7 @@ msgstr "" msgid "You and friends" msgstr "Ð’Ñ‹ и друзьÑ" -#: actions/allrss.php:119 actions/apitimelinefriends.php:122 +#: actions/allrss.php:119 actions/apitimelinefriends.php:121 #: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" @@ -124,6 +129,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:155 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 не найден." @@ -137,7 +159,7 @@ msgstr "Метод API не найден." #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:114 +#: actions/apistatusesupdate.php:119 msgid "This method requires a POST." msgstr "Этот метод требует POST." @@ -166,8 +188,9 @@ msgstr "Ðе удаётÑÑ Ñохранить профиль." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257 -#: actions/designadminpanel.php:122 actions/newnotice.php:94 +#: actions/apistatusesupdate.php:132 actions/avatarsettings.php:257 +#: actions/designadminpanel.php:122 actions/editapplication.php:118 +#: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format msgid "" @@ -181,6 +204,9 @@ msgstr "" #: actions/apiaccountupdateprofilebackgroundimage.php:146 #: actions/apiaccountupdateprofilecolors.php:164 #: actions/apiaccountupdateprofilecolors.php:174 +#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 +#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 +#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 msgid "Unable to save your design settings." msgstr "Ðе удаётÑÑ Ñохранить ваши наÑтройки оформлениÑ!" @@ -221,26 +247,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 "ОтÑутÑтвует текÑÑ‚ ÑообщениÑ!" @@ -266,16 +272,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 +305,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." @@ -333,7 +339,8 @@ msgstr "Такое Ð¸Ð¼Ñ ÑƒÐ¶Ðµ иÑпользуетÑÑ. Попробуйте msgid "Not a valid nickname." msgstr "Ðеверное имÑ." -#: actions/apigroupcreate.php:196 actions/editgroup.php:195 +#: actions/apigroupcreate.php:196 actions/editapplication.php:212 +#: actions/editgroup.php:195 actions/newapplication.php:200 #: actions/newgroup.php:139 actions/profilesettings.php:222 #: actions/register.php:217 msgid "Homepage is not a valid URL." @@ -345,7 +352,8 @@ msgstr "URL Главной Ñтраницы неверен." msgid "Full name is too long (max 255 chars)." msgstr "Полное Ð¸Ð¼Ñ Ñлишком длинное (не больше 255 знаков)." -#: actions/apigroupcreate.php:213 +#: actions/apigroupcreate.php:213 actions/editapplication.php:187 +#: actions/newapplication.php:169 #, php-format msgid "Description is too long (max %d chars)." msgstr "Слишком длинное опиÑание (макÑимум %d Ñимволов)" @@ -385,7 +393,7 @@ msgstr "ÐÐ»Ð¸Ð°Ñ Ð½Ðµ может Ñовпадать Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼." msgid "Group not found!" msgstr "Группа не найдена!" -#: actions/apigroupjoin.php:110 lib/command.php:217 +#: actions/apigroupjoin.php:110 actions/joingroup.php:90 msgid "You are already a member of that group." msgstr "Ð’Ñ‹ уже ÑвлÑетеÑÑŒ членом Ñтой группы." @@ -393,19 +401,19 @@ msgstr "Ð’Ñ‹ уже ÑвлÑетеÑÑŒ членом Ñтой группы." msgid "You have been blocked from that group by the admin." msgstr "Ð’Ñ‹ заблокированы из Ñтой группы админиÑтратором." -#: actions/apigroupjoin.php:138 lib/command.php:234 -#, fuzzy, php-format +#: actions/apigroupjoin.php:138 actions/joingroup.php:124 +#, php-format msgid "Could not join user %1$s to group %2$s." -msgstr "Ðе удаётÑÑ Ð¿Ñ€Ð¸Ñоединить Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ %s к группе %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/leavegroup.php:127 -#, fuzzy, php-format +#: actions/apigroupleave.php:124 actions/leavegroup.php:119 +#, php-format msgid "Could not remove user %1$s from group %2$s." -msgstr "Ðе удаётÑÑ ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ %s из группы %s." +msgstr "Ðе удаётÑÑ ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ %1$s из группы %2$s." #: actions/apigrouplist.php:95 #, php-format @@ -422,6 +430,100 @@ msgstr "Группы %s" msgid "groups on %s" msgstr "группы на %s" +#: actions/apioauthauthorize.php:108 actions/apioauthauthorize.php:114 +msgid "Bad request." +msgstr "" + +#: actions/apioauthauthorize.php:134 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:115 actions/makeadmin.php:66 +#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 +#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:139 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 +#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/subscribe.php:46 actions/tagother.php:166 +#: 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 "Проблема Ñ Ð’Ð°ÑˆÐµÐ¹ ÑеÑÑией. Попробуйте ещё раз, пожалуйÑта." + +#: actions/apioauthauthorize.php:146 +#, fuzzy +msgid "Invalid nickname / password!" +msgstr "Ðеверное Ð¸Ð¼Ñ Ð¸Ð»Ð¸ пароль." + +#: actions/apioauthauthorize.php:170 +#, fuzzy +msgid "DB error deleting OAuth app user." +msgstr "Ошибка в уÑтановках пользователÑ." + +#: actions/apioauthauthorize.php:196 +#, fuzzy +msgid "DB error inserting OAuth app user." +msgstr "Ошибка баз данных при вÑтавке хеш-тегов Ð´Ð»Ñ %s" + +#: actions/apioauthauthorize.php:231 +#, php-format +msgid "" +"The request token %s has been authorized. Please exchange it for an access " +"token." +msgstr "" + +#: actions/apioauthauthorize.php:241 +#, php-format +msgid "The request token %s has been denied." +msgstr "" + +#: actions/apioauthauthorize.php:246 actions/avatarsettings.php:281 +#: actions/designadminpanel.php:103 actions/editapplication.php:139 +#: actions/emailsettings.php:256 actions/grouplogo.php:319 +#: actions/imsettings.php:220 actions/newapplication.php:121 +#: actions/oauthconnectionssettings.php:151 actions/recoverpassword.php:44 +#: actions/smssettings.php:248 lib/designsettings.php:304 +msgid "Unexpected form submission." +msgstr "Ðетиповое подтверждение формы." + +#: actions/apioauthauthorize.php:273 +msgid "An application would like to connect to your account" +msgstr "" + +#: actions/apioauthauthorize.php:290 +msgid "Allow or deny access" +msgstr "Разрешить или запретить доÑтуп" + +#: actions/apioauthauthorize.php:320 lib/action.php:435 +msgid "Account" +msgstr "ÐаÑтройки" + +#: actions/apioauthauthorize.php:323 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/apioauthauthorize.php:326 actions/login.php:233 +#: actions/register.php:429 lib/accountsettingsaction.php:116 +msgid "Password" +msgstr "Пароль" + +#: actions/apioauthauthorize.php:338 +msgid "Deny" +msgstr "Запретить" + +#: actions/apioauthauthorize.php:344 +msgid "Allow" +msgstr "Разрешить" + +#: actions/apioauthauthorize.php:361 +msgid "Allow or deny access to your account information." +msgstr "Разрешить или запретить доÑтуп к информации вашей учётной запиÑи." + #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." msgstr "Этот метод требует POST или DELETE." @@ -435,11 +537,11 @@ msgstr "Ð’Ñ‹ не можете удалÑÑ‚ÑŒ ÑÑ‚Ð°Ñ‚ÑƒÑ Ð´Ñ€ÑƒÐ³Ð¸Ñ… поль msgid "No such notice." msgstr "Ðет такой запиÑи." -#: actions/apistatusesretweet.php:83 lib/command.php:422 +#: actions/apistatusesretweet.php:83 msgid "Cannot repeat your own notice." msgstr "Ðевозможно повторить ÑобÑтвенную запиÑÑŒ." -#: actions/apistatusesretweet.php:91 lib/command.php:427 +#: actions/apistatusesretweet.php:91 msgid "Already repeated that notice." msgstr "ЗапиÑÑŒ уже повторена." @@ -451,17 +553,17 @@ msgstr "Ð¡Ñ‚Ð°Ñ‚ÑƒÑ ÑƒÐ´Ð°Ð»Ñ‘Ð½." msgid "No status with that ID found." msgstr "Ðе найдено ÑтатуÑа Ñ Ñ‚Ð°ÐºÐ¸Ð¼ ID." -#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:162 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Слишком Ð´Ð»Ð¸Ð½Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ. МакÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ Ð´Ð»Ð¸Ð½Ð° — %d знаков." -#: actions/apistatusesupdate.php:198 +#: actions/apistatusesupdate.php:203 msgid "Not found" msgstr "Ðе найдено" -#: actions/apistatusesupdate.php:221 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:226 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "МакÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ Ð´Ð»Ð¸Ð½Ð° запиÑи — %d Ñимволов, Ð²ÐºÐ»ÑŽÑ‡Ð°Ñ URL вложениÑ." @@ -471,14 +573,14 @@ msgid "Unsupported format." msgstr "Ðеподдерживаемый формат." #: actions/apitimelinefavorites.php:108 -#, fuzzy, php-format +#, php-format msgid "%1$s / Favorites from %2$s" -msgstr "%s / Любимое от %s" +msgstr "%1$s / Любимое от %2$s" #: actions/apitimelinefavorites.php:120 -#, fuzzy, php-format +#, php-format msgid "%1$s updates favorited by %2$s / %2$s." -msgstr "%s обновлённые любимые запиÑи от %s / %s." +msgstr "ÐžÐ±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ %1$s, отмеченные как любимые %2$s / %2$s." #: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 #: actions/grouprss.php:131 actions/userrss.php:90 @@ -545,8 +647,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 +675,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,29 +708,6 @@ 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/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 -#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 -#: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 -#: actions/subscribe.php:46 actions/tagother.php:166 -#: 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 "Проблема Ñ Ð’Ð°ÑˆÐµÐ¹ ÑеÑÑией. Попробуйте ещё раз, пожалуйÑта." - -#: actions/avatarsettings.php:281 actions/designadminpanel.php:103 -#: actions/emailsettings.php:256 actions/grouplogo.php:319 -#: actions/imsettings.php:220 actions/recoverpassword.php:44 -#: actions/smssettings.php:248 lib/designsettings.php:304 -msgid "Unexpected form submission." -msgstr "Ðетиповое подтверждение формы." - #: actions/avatarsettings.php:328 msgid "Pick a square area of the image to be your avatar" msgstr "Подберите нужный квадратный учаÑток Ð´Ð»Ñ Ð²Ð°ÑˆÐµÐ¹ аватары" @@ -687,19 +769,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:260 +msgid "No such group." +msgstr "Ðет такой группы." #: actions/blockedfromgroup.php:90 #, php-format @@ -707,9 +785,9 @@ msgid "%s blocked profiles" msgstr "Заблокированные профили %s" #: actions/blockedfromgroup.php:93 -#, fuzzy, php-format +#, php-format msgid "%1$s blocked profiles, page %2$d" -msgstr "Заблокированные профили %s, Ñтраница %d" +msgstr "Заблокированные профили %1$s, Ñтраница %2$d" #: actions/blockedfromgroup.php:108 msgid "A list of the users blocked from joining this group." @@ -766,7 +844,7 @@ msgid "Couldn't delete email confirmation." msgstr "Ðе удаётÑÑ ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ подверждение по Ñлектронному адреÑу." #: actions/confirmaddress.php:144 -msgid "Confirm Address" +msgid "Confirm address" msgstr "Подтвердить адреÑ" #: actions/confirmaddress.php:159 @@ -821,10 +899,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 "Ð’Ñ‹ не можете удалÑÑ‚ÑŒ пользователей." @@ -958,7 +1032,8 @@ msgstr "ВоÑÑтановить Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð¿Ð¾ умолчанию" #: actions/pathsadminpanel.php:324 actions/profilesettings.php:174 #: actions/siteadminpanel.php:388 actions/smssettings.php:181 #: actions/subscriptions.php:203 actions/tagother.php:154 -#: actions/useradminpanel.php:313 lib/designsettings.php:256 +#: actions/useradminpanel.php:313 lib/applicationeditform.php:335 +#: lib/applicationeditform.php:336 lib/designsettings.php:256 #: lib/groupeditform.php:202 msgid "Save" msgstr "Сохранить" @@ -979,6 +1054,84 @@ msgstr "Добавить в любимые" msgid "No such document." msgstr "Ðет такого документа." +#: actions/editapplication.php:54 lib/applicationeditform.php:136 +msgid "Edit application" +msgstr "" + +#: actions/editapplication.php:66 +#, fuzzy +msgid "You must be logged in to edit an application." +msgstr "Ð’Ñ‹ должны авторизоватьÑÑ, чтобы изменить группу." + +#: actions/editapplication.php:77 actions/showapplication.php:94 +#, fuzzy +msgid "You are not the owner of this application." +msgstr "Ð’Ñ‹ не ÑвлÑетеÑÑŒ членом Ñтой группы." + +#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:163 +#: actions/showapplication.php:87 +#, fuzzy +msgid "No such application." +msgstr "Ðет такой запиÑи." + +#: actions/editapplication.php:127 actions/newapplication.php:110 +#: actions/showapplication.php:118 lib/action.php:1167 +msgid "There was a problem with your session token." +msgstr "Проблема Ñ Ð’Ð°ÑˆÐµÐ¹ ÑеÑÑией. Попробуйте ещё раз, пожалуйÑта." + +#: actions/editapplication.php:161 +#, fuzzy +msgid "Use this form to edit your application." +msgstr "Заполните информацию о группе в Ñледующие полÑ" + +#: actions/editapplication.php:177 actions/newapplication.php:159 +msgid "Name is required." +msgstr "Ð˜Ð¼Ñ Ð¾Ð±Ñзательно." + +#: actions/editapplication.php:180 actions/newapplication.php:162 +msgid "Name is too long (max 255 chars)." +msgstr "Ð˜Ð¼Ñ Ñлишком длинное (не больше 255 знаков)." + +#: actions/editapplication.php:183 actions/newapplication.php:165 +msgid "Description is required." +msgstr "ОпиÑание обÑзательно." + +#: actions/editapplication.php:191 +msgid "Source URL is too long." +msgstr "" + +#: actions/editapplication.php:197 actions/newapplication.php:182 +#, fuzzy +msgid "Source URL is not valid." +msgstr "URL аватары «%s» недейÑтвителен." + +#: actions/editapplication.php:200 actions/newapplication.php:185 +msgid "Organization is required." +msgstr "" + +#: actions/editapplication.php:203 actions/newapplication.php:188 +#, fuzzy +msgid "Organization is too long (max 255 chars)." +msgstr "Слишком длинное меÑтораÑположение (макÑимум 255 знаков)." + +#: actions/editapplication.php:206 actions/newapplication.php:191 +msgid "Organization homepage is required." +msgstr "ДомашнÑÑ Ñтраница организации обÑзательна." + +#: actions/editapplication.php:215 actions/newapplication.php:203 +msgid "Callback is too long." +msgstr "" + +#: actions/editapplication.php:222 actions/newapplication.php:212 +#, fuzzy +msgid "Callback URL is not valid." +msgstr "URL аватары «%s» недейÑтвителен." + +#: actions/editapplication.php:255 +#, fuzzy +msgid "Could not update application." +msgstr "Ðе удаётÑÑ Ð¾Ð±Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ информацию о группе." + #: actions/editgroup.php:56 #, php-format msgid "Edit %s group" @@ -990,8 +1143,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." @@ -1015,7 +1168,7 @@ msgid "Options saved." msgstr "ÐаÑтройки Ñохранены." #: actions/emailsettings.php:60 -msgid "Email Settings" +msgid "Email settings" msgstr "ÐаÑтройка почты" #: actions/emailsettings.php:71 @@ -1047,13 +1200,14 @@ msgstr "" "Ð´Ð»Ñ Ñпама!), там будут дальнейшие инÑтрукции." #: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 +#: actions/smssettings.php:126 lib/applicationeditform.php:333 +#: lib/applicationeditform.php:334 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\"" @@ -1136,9 +1290,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." @@ -1321,13 +1476,6 @@ 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:79 msgid "No such file." msgstr "Ðет такого файла." @@ -1344,7 +1492,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." @@ -1370,13 +1518,13 @@ msgid "Block user from group" msgstr "Заблокировать Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸Ð· группы." #: actions/groupblock.php:162 -#, fuzzy, php-format +#, php-format msgid "" "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " "will be removed from the group, unable to post, and unable to subscribe to " "the group in the future." msgstr "" -"Ð’Ñ‹ дейÑтвительно хотите заблокировать Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Â«%s» из группы «%s»? " +"Ð’Ñ‹ дейÑтвительно хотите заблокировать Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Â«%1$s» из группы «%2$s»? " "Пользователь будет удалён из группы без возможноÑти отправлÑÑ‚ÑŒ и " "подпиÑыватьÑÑ Ð½Ð° группу в будущем." @@ -1392,9 +1540,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." @@ -1417,12 +1565,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 +1581,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 "Подберите нужный квадратный учаÑток Ð´Ð»Ñ Ð²Ð°ÑˆÐµÐ³Ð¾ логотипа." @@ -1457,9 +1603,9 @@ msgid "%s group members" msgstr "УчаÑтники группы %s" #: actions/groupmembers.php:96 -#, fuzzy, php-format +#, php-format msgid "%1$s group members, page %2$d" -msgstr "УчаÑтники группы %s, Ñтраница %d" +msgstr "УчаÑтники группы %1$s, Ñтраница %2$d" #: actions/groupmembers.php:111 msgid "A list of the users in this group." @@ -1568,7 +1714,7 @@ msgid "Error removing the block." msgstr "Ошибка при удалении данного блока." #: actions/imsettings.php:59 -msgid "IM Settings" +msgid "IM settings" msgstr "IM-уÑтановки" #: actions/imsettings.php:70 @@ -1599,7 +1745,7 @@ msgstr "" "контактов?)" #: actions/imsettings.php:124 -msgid "IM Address" +msgid "IM address" msgstr "IM-адреÑ" #: actions/imsettings.php:126 @@ -1700,7 +1846,7 @@ msgstr "ПриглаÑить новых пользователей" msgid "You are already subscribed to these users:" msgstr "Ð’Ñ‹ уже подпиÑаны на пользователÑ:" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:315 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -1745,7 +1891,7 @@ msgstr "Личное Ñообщение" msgid "Optionally add a personal message to the invitation." msgstr "Можно добавить к приглашению личное Ñообщение." -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236 msgid "Send" msgstr "ОК" @@ -1815,86 +1961,58 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "Ð’Ñ‹ должны авторизоватьÑÑ Ð´Ð»Ñ Ð²ÑÑ‚ÑƒÐ¿Ð»ÐµÐ½Ð¸Ñ Ð² группу." -#: actions/joingroup.php:90 -msgid "You are already a member of that group" -msgstr "Ð’Ñ‹ уже ÑвлÑетеÑÑŒ членом Ñтой группы" - -#: actions/joingroup.php:128 -#, fuzzy, php-format -msgid "Could not join user %1$s to group %2$s" -msgstr "Ðе удаётÑÑ Ð¿Ñ€Ð¸Ñоединить Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ %s к группе %s" - -#: actions/joingroup.php:135 lib/command.php:239 -#, fuzzy, php-format +#: actions/joingroup.php:131 +#, php-format msgid "%1$s joined group %2$s" -msgstr "%s вÑтупил в группу %s" +msgstr "%1$s вÑтупил в группу %2$s" #: actions/leavegroup.php:60 msgid "You must be logged in to leave a group." msgstr "Ð’Ñ‹ должны авторизоватьÑÑ, чтобы покинуть группу." -#: actions/leavegroup.php:90 lib/command.php:268 +#: actions/leavegroup.php:90 lib/command.php:265 msgid "You are not a member of that group." msgstr "Ð’Ñ‹ не ÑвлÑетеÑÑŒ членом Ñтой группы." -#: actions/leavegroup.php:119 lib/command.php:278 -msgid "Could not find membership record." -msgstr "Ðе удаётÑÑ Ð½Ð°Ð¹Ñ‚Ð¸ учетную запиÑÑŒ." - -#: actions/leavegroup.php:134 lib/command.php:289 -#, fuzzy, php-format +#: actions/leavegroup.php:127 +#, php-format msgid "%1$s left group %2$s" -msgstr "%s покинул группу %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:460 +#: 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 -#: lib/groupeditform.php:152 lib/userprofile.php:131 -msgid "Nickname" -msgstr "ИмÑ" - -#: actions/login.php:253 actions/register.php:428 -#: 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." @@ -1902,7 +2020,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]" @@ -1917,24 +2035,47 @@ msgstr "" "Только админиÑтратор может Ñделать другого Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð°Ð´Ð¼Ð¸Ð½Ð¸Ñтратором." #: actions/makeadmin.php:95 -#, fuzzy, php-format +#, php-format msgid "%1$s is already an admin for group \"%2$s\"." -msgstr "%s уже ÑвлÑетÑÑ Ð°Ð´Ð¼Ð¸Ð½Ð¸Ñтратором группы «%s»." +msgstr "%1$s уже ÑвлÑетÑÑ Ð°Ð´Ð¼Ð¸Ð½Ð¸Ñтратором группы «%2$s»." #: actions/makeadmin.php:132 -#, fuzzy, php-format -msgid "Can't get membership record for %1$s in group %2$s" -msgstr "Ðе удаётÑÑ Ð¿Ð¾Ð»ÑƒÑ‡Ð¸Ñ‚ÑŒ запиÑÑŒ принадлежноÑти Ð´Ð»Ñ %s к группе %s" +#, php-format +msgid "Can't get membership record for %1$s in group %2$s." +msgstr "Ðе удаётÑÑ Ð¿Ð¾Ð»ÑƒÑ‡Ð¸Ñ‚ÑŒ запиÑÑŒ принадлежноÑти Ð´Ð»Ñ %1$s к группе %2$s." #: actions/makeadmin.php:145 -#, fuzzy, php-format -msgid "Can't make %1$s an admin for group %2$s" -msgstr "Ðевозможно Ñделать %s админиÑтратором группы %s" +#, php-format +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 "Ðет текущего ÑтатуÑа" +#: actions/newapplication.php:52 +msgid "New application" +msgstr "" + +#: actions/newapplication.php:64 +#, fuzzy +msgid "You must be logged in to register an application." +msgstr "Ð’Ñ‹ должны авторизоватьÑÑ, чтобы Ñоздать новую группу." + +#: actions/newapplication.php:143 +#, fuzzy +msgid "Use this form to register a new application." +msgstr "ИÑпользуйте Ñту форму Ð´Ð»Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð½Ð¾Ð²Ð¾Ð¹ группы." + +#: actions/newapplication.php:173 +msgid "Source URL is required." +msgstr "URL иÑточника обÑзателен." + +#: actions/newapplication.php:255 actions/newapplication.php:264 +#, fuzzy +msgid "Could not create application." +msgstr "Ðе удаётÑÑ Ñоздать алиаÑÑ‹." + #: actions/newgroup.php:53 msgid "New group" msgstr "ÐÐ¾Ð²Ð°Ñ Ð³Ñ€ÑƒÐ¿Ð¿Ð°" @@ -1947,12 +2088,12 @@ msgstr "ИÑпользуйте Ñту форму Ð´Ð»Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð½Ð¾Ð² msgid "New message" msgstr "Ðовое Ñообщение" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 msgid "You can't send a message to this user." msgstr "Ð’Ñ‹ не можете поÑлать Ñообщение Ñтому пользователю." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:484 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 +#: lib/command.php:475 msgid "No content!" msgstr "Ðет контента!" @@ -1960,7 +2101,7 @@ msgstr "Ðет контента!" msgid "No recipient specified." msgstr "Ðет адреÑата." -#: actions/newmessage.php:164 lib/command.php:370 +#: actions/newmessage.php:164 lib/command.php:361 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "Ðе поÑылайте ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ñами Ñебе; проÑто потихоньку Ñкажите Ñто Ñебе." @@ -1971,8 +2112,8 @@ msgstr "Сообщение отправлено" #: 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" @@ -2000,9 +2141,9 @@ msgid "Text search" msgstr "ПоиÑк текÑта" #: actions/noticesearch.php:91 -#, fuzzy, php-format +#, php-format msgid "Search results for \"%1$s\" on %2$s" -msgstr "Результаты поиÑка Ð´Ð»Ñ Â«%s» на %s" +msgstr "Результаты поиÑка Ð´Ð»Ñ Â«%1$s» на %2$s" #: actions/noticesearch.php:121 #, php-format @@ -2047,6 +2188,51 @@ msgstr "«Подталкивание» поÑлано" msgid "Nudge sent!" msgstr "«Подталкивание» отправлено!" +#: actions/oauthappssettings.php:59 +#, fuzzy +msgid "You must be logged in to list your applications." +msgstr "Ð’Ñ‹ должны авторизоватьÑÑ, чтобы изменить группу." + +#: actions/oauthappssettings.php:74 +#, fuzzy +msgid "OAuth applications" +msgstr "Другие опции" + +#: actions/oauthappssettings.php:85 +msgid "Applications you have registered" +msgstr "" + +#: actions/oauthappssettings.php:135 +#, php-format +msgid "You have not registered any applications yet." +msgstr "" + +#: actions/oauthconnectionssettings.php:71 +msgid "Connected applications" +msgstr "" + +#: actions/oauthconnectionssettings.php:87 +msgid "You have allowed the following applications to access you account." +msgstr "" + +#: actions/oauthconnectionssettings.php:170 +#, fuzzy +msgid "You are not a user of that application." +msgstr "Ð’Ñ‹ не ÑвлÑетеÑÑŒ членом Ñтой группы." + +#: actions/oauthconnectionssettings.php:180 +msgid "Unable to revoke access for app: " +msgstr "" + +#: actions/oauthconnectionssettings.php:192 +#, php-format +msgid "You have not authorized any applications to use your account." +msgstr "" + +#: actions/oauthconnectionssettings.php:205 +msgid "Developers can edit the registration settings for their applications " +msgstr "" + #: actions/oembed.php:79 actions/shownotice.php:100 msgid "Notice has no profile" msgstr "ЗапиÑÑŒ без профилÑ" @@ -2064,8 +2250,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:1038 +#: lib/api.php:1066 lib/api.php:1176 msgid "Not a supported data format." msgstr "Ðеподдерживаемый формат данных." @@ -2078,7 +2264,8 @@ msgid "Notice Search" msgstr "ПоиÑк в запиÑÑÑ…" #: actions/othersettings.php:60 -msgid "Other Settings" +#, fuzzy +msgid "Other settings" msgstr "Другие наÑтройки" #: actions/othersettings.php:71 @@ -2109,6 +2296,30 @@ msgstr "Показать или Ñкрыть Ð¾Ñ„Ð¾Ñ€Ð¼Ð»ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ msgid "URL shortening service is too long (max 50 chars)." msgstr "Ð¡ÐµÑ€Ð²Ð¸Ñ ÑÐ¾ÐºÑ€Ð°Ñ‰ÐµÐ½Ð¸Ñ URL Ñлишком длинный (макÑимум 50 Ñимволов)." +#: actions/otp.php:69 +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" @@ -2145,7 +2356,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 "Подтверждение" @@ -2307,7 +2518,7 @@ msgid "When to use SSL" msgstr "Когда иÑпользовать SSL" #: actions/pathsadminpanel.php:308 -msgid "SSL Server" +msgid "SSL server" msgstr "SSL-Ñервер" #: actions/pathsadminpanel.php:309 @@ -2337,18 +2548,18 @@ msgid "Not a valid people tag: %s" msgstr "Ðеверный тег человека: %s" #: actions/peopletag.php:144 -#, fuzzy, php-format +#, php-format msgid "Users self-tagged with %1$s - page %2$d" -msgstr "ПользовательÑкие авто-теги от %s - Ñтраница %d" +msgstr "Пользователи, уÑтановившие Ñебе тег %1$s — Ñтраница %2$d" #: actions/postnotice.php:84 msgid "Invalid notice content" msgstr "Ðеверный контент запиÑи" #: actions/postnotice.php:90 -#, fuzzy, php-format +#, php-format msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’." -msgstr "Ð›Ð¸Ñ†ÐµÐ½Ð·Ð¸Ñ Ð·Ð°Ð¿Ð¸Ñи «%s» не ÑовмеÑтима Ñ Ð»Ð¸Ñ†ÐµÐ½Ð·Ð¸ÐµÐ¹ Ñайта «%s»." +msgstr "Ð›Ð¸Ñ†ÐµÐ½Ð·Ð¸Ñ Ð·Ð°Ð¿Ð¸Ñи «%1$s» не ÑовмеÑтима Ñ Ð»Ð¸Ñ†ÐµÐ½Ð·Ð¸ÐµÐ¹ Ñайта «%2$s»." #: actions/profilesettings.php:60 msgid "Profile settings" @@ -2369,42 +2580,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 -#: lib/groupeditform.php:161 +#: actions/profilesettings.php:115 actions/register.php:453 +#: lib/applicationeditform.php:230 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 "Где вы находитеÑÑŒ, например «Город, облаÑÑ‚ÑŒ, Ñтрана»" @@ -2713,7 +2924,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 "ПроÑтите, региÑÑ‚Ñ€Ð°Ñ†Ð¸Ñ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ по приглашению." @@ -2725,7 +2936,7 @@ msgstr "Извините, неверный приглаÑительный код msgid "Registration successful" msgstr "РегиÑÑ‚Ñ€Ð°Ñ†Ð¸Ñ ÑƒÑпешна!" -#: actions/register.php:114 actions/register.php:502 lib/action.php:457 +#: actions/register.php:114 actions/register.php:503 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "РегиÑтрациÑ" @@ -2740,19 +2951,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. " @@ -2762,41 +2969,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." @@ -2804,8 +3011,8 @@ msgstr "" ", за иÑключением моей личной информации: паролÑ, почты, меÑÑенджера и номера " "телефона." -#: actions/register.php:537 -#, fuzzy, php-format +#: actions/register.php:538 +#, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " "want to...\n" @@ -2822,10 +3029,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%%%%), которых вы, возможно, знаете, " @@ -2833,12 +3040,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.)" @@ -2947,11 +3154,12 @@ msgid "Replies feed for %s (Atom)" msgstr "Лента запиÑей Ð´Ð»Ñ %s (Atom)" #: actions/replies.php:198 -#, fuzzy, php-format +#, php-format msgid "" "This is the timeline showing replies to %1$s but %2$s hasn't received a " "notice to his attention yet." -msgstr "Эта лента Ñодержит ответы на запиÑи %s, однако %s пока не получал их." +msgstr "" +"Эта лента Ñодержит ответы на запиÑи %1$s, однако %2$s пока не получал их." #: actions/replies.php:203 #, php-format @@ -2963,14 +3171,14 @@ msgstr "" "чиÑло людей или [приÑоединившиÑÑŒ к группам](%%action.groups%%)." #: actions/replies.php:205 -#, fuzzy, php-format +#, php-format msgid "" "You can try to [nudge %1$s](../%2$s) or [post something to his or her " "attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" -"Ð’Ñ‹ можете попробовать [«подтолкнуть» %s](../%s) или [напиÑать что-нибудь Ð´Ð»Ñ " -"Ð¿Ñ€Ð¸Ð²Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ ÐµÐ³Ð¾ или её вниманиÑ](%%%%action.newnotice%%%%?status_textarea=%" -"s)." +"Ð’Ñ‹ можете попробовать [«подтолкнуть» %1$s](../%2$s) или [напиÑать что-нибудь " +"Ð´Ð»Ñ Ð¿Ñ€Ð¸Ð²Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ ÐµÐ³Ð¾ или её вниманиÑ](%%%%action.newnotice%%%%?" +"status_textarea=%3$s)." #: actions/repliesrss.php:72 #, php-format @@ -2986,6 +3194,83 @@ msgstr "" msgid "User is already sandboxed." msgstr "Пользователь уже в режиме пеÑочницы." +#: actions/showapplication.php:82 +#, fuzzy +msgid "You must be logged in to view an application." +msgstr "Ð’Ñ‹ должны авторизоватьÑÑ, чтобы покинуть группу." + +#: actions/showapplication.php:158 +#, fuzzy +msgid "Application profile" +msgstr "ЗапиÑÑŒ без профилÑ" + +#: actions/showapplication.php:160 lib/applicationeditform.php:182 +msgid "Icon" +msgstr "" + +#: actions/showapplication.php:170 actions/version.php:195 +#: lib/applicationeditform.php:197 +msgid "Name" +msgstr "ИмÑ" + +#: actions/showapplication.php:179 lib/applicationeditform.php:224 +msgid "Organization" +msgstr "ОрганизациÑ" + +#: actions/showapplication.php:188 actions/version.php:198 +#: lib/applicationeditform.php:211 lib/groupeditform.php:172 +msgid "Description" +msgstr "ОпиÑание" + +#: actions/showapplication.php:193 actions/showgroup.php:429 +#: lib/profileaction.php:174 +msgid "Statistics" +msgstr "СтатиÑтика" + +#: actions/showapplication.php:204 +#, php-format +msgid "created by %1$s - %2$s access by default - %3$d users" +msgstr "" + +#: actions/showapplication.php:214 +msgid "Application actions" +msgstr "" + +#: actions/showapplication.php:233 +msgid "Reset key & secret" +msgstr "" + +#: actions/showapplication.php:241 +msgid "Application info" +msgstr "" + +#: actions/showapplication.php:243 +msgid "Consumer key" +msgstr "" + +#: actions/showapplication.php:248 +msgid "Consumer secret" +msgstr "" + +#: actions/showapplication.php:253 +msgid "Request token URL" +msgstr "" + +#: actions/showapplication.php:258 +msgid "Access token URL" +msgstr "" + +#: actions/showapplication.php:263 +#, fuzzy +msgid "Authorize URL" +msgstr "Ðвтор" + +#: actions/showapplication.php:268 +msgid "" +"Note: We support HMAC-SHA1 signatures. We do not support the plaintext " +"signature method." +msgstr "" + #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "Ðе удаётÑÑ Ð²Ð¾ÑÑтановить любимые запиÑи." @@ -3090,7 +3375,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 "(пока ничего нет)" @@ -3098,10 +3383,6 @@ msgstr "(пока ничего нет)" msgid "All members" msgstr "Ð’Ñе учаÑтники" -#: actions/showgroup.php:429 lib/profileaction.php:174 -msgid "Statistics" -msgstr "СтатиÑтика" - #: actions/showgroup.php:432 msgid "Created" msgstr "Создано" @@ -3167,9 +3448,9 @@ msgid " tagged %s" msgstr " Ñ Ñ‚ÐµÐ³Ð¾Ð¼ %s" #: actions/showstream.php:122 -#, fuzzy, php-format +#, php-format msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" -msgstr "Лента запиÑей %s Ñ Ñ‚ÐµÐ³Ð¾Ð¼ %s (RSS 1.0)" +msgstr "Лента запиÑей %1$s Ñ Ñ‚ÐµÐ³Ð¾Ð¼ %2$s (RSS 1.0)" #: actions/showstream.php:129 #, php-format @@ -3192,9 +3473,9 @@ msgid "FOAF for %s" msgstr "FOAF Ð´Ð»Ñ %s" #: actions/showstream.php:191 -#, fuzzy, php-format +#, php-format msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet." -msgstr "Это лента %s, однако %s пока ничего не отправил." +msgstr "Это лента %1$s, однако %2$s пока ничего не отправил." #: actions/showstream.php:196 msgid "" @@ -3205,14 +3486,14 @@ msgstr "" "ÑÐµÐ¹Ñ‡Ð°Ñ Ñ…Ð¾Ñ€Ð¾ÑˆÐµÐµ Ð²Ñ€ÐµÐ¼Ñ Ð´Ð»Ñ Ð½Ð°Ñ‡Ð°Ð»Ð° :)" #: actions/showstream.php:198 -#, fuzzy, php-format +#, php-format msgid "" "You can try to nudge %1$s or [post something to his or her attention](%%%%" "action.newnotice%%%%?status_textarea=%2$s)." msgstr "" -"Ð’Ñ‹ можете попробовать «подтолкнуть» %s или [напиÑать что-нибудь Ð´Ð»Ñ " -"Ð¿Ñ€Ð¸Ð²Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ ÐµÐ³Ð¾ или её вниманиÑ](%%%%action.newnotice%%%%?status_textarea=%" -"s)." +"Ð’Ñ‹ можете попробовать «подтолкнуть» %1$s или [напиÑать что-нибудь Ð´Ð»Ñ " +"Ð¿Ñ€Ð¸Ð²Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ ÐµÐ³Ð¾ или её вниманиÑ](%%%%action.newnotice%%%%?status_textarea=%2" +"$s)." #: actions/showstream.php:234 #, php-format @@ -3263,13 +3544,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." @@ -3452,7 +3733,7 @@ msgid "Save site settings" msgstr "Сохранить наÑтройки Ñайта" #: actions/smssettings.php:58 -msgid "SMS Settings" +msgid "SMS settings" msgstr "УÑтановки СМС" #: actions/smssettings.php:69 @@ -3483,7 +3764,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 @@ -3574,9 +3855,9 @@ msgid "%s subscribers" msgstr "ПодпиÑчики %s" #: actions/subscribers.php:52 -#, fuzzy, php-format +#, php-format msgid "%1$s subscribers, page %2$d" -msgstr "%s подпиÑчики, Ñтраница %d" +msgstr "ПодпиÑчики %1$s, Ñтраница %2$d" #: actions/subscribers.php:63 msgid "These are the people who listen to your notices." @@ -3615,9 +3896,9 @@ msgid "%s subscriptions" msgstr "ПодпиÑки %s" #: actions/subscriptions.php:54 -#, fuzzy, php-format +#, php-format msgid "%1$s subscriptions, page %2$d" -msgstr "ПодпиÑки %s, Ñтраница %d" +msgstr "ПодпиÑки %1$s, Ñтраница %2$d" #: actions/subscriptions.php:65 msgid "These are the people whose notices you listen to." @@ -3741,20 +4022,16 @@ 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 -#, fuzzy, php-format +#, php-format 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:321 #: lib/personalgroupnav.php:115 @@ -3910,9 +4187,9 @@ msgstr "" "инÑтрукции на Ñайте, чтобы полноÑтью отказатьÑÑ Ð¾Ñ‚ подпиÑки." #: actions/userauthorization.php:296 -#, fuzzy, php-format +#, php-format msgid "Listener URI ‘%s’ not found here." -msgstr "СмотрÑщий URI «%s» здеÑÑŒ не найден" +msgstr "СмотрÑщий URI «%s» здеÑÑŒ не найден." #: actions/userauthorization.php:301 #, php-format @@ -3944,10 +4221,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 "Оформление профилÑ" @@ -3980,9 +4253,9 @@ msgstr "" "Попробуйте [найти группы](%%action.groupsearch%%) и приÑоединитьÑÑ Ðº ним." #: actions/version.php:73 -#, fuzzy, php-format +#, php-format msgid "StatusNet %s" -msgstr "СтатиÑтика" +msgstr "StatusNet %s" #: actions/version.php:153 #, php-format @@ -3990,15 +4263,16 @@ 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 -#, fuzzy msgid "StatusNet" -msgstr "Ð¡Ñ‚Ð°Ñ‚ÑƒÑ ÑƒÐ´Ð°Ð»Ñ‘Ð½." +msgstr "StatusNet" #: actions/version.php:161 msgid "Contributors" -msgstr "" +msgstr "Разработчики" #: actions/version.php:168 msgid "" @@ -4007,6 +4281,10 @@ msgid "" "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 "" @@ -4015,6 +4293,10 @@ msgid "" "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 @@ -4022,31 +4304,22 @@ 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 -#, fuzzy -msgid "Name" -msgstr "ИмÑ" +msgstr "Плагины" #: actions/version.php:196 lib/action.php:741 -#, fuzzy msgid "Version" -msgstr "СеÑÑии" +msgstr "ВерÑиÑ" #: actions/version.php:197 -#, fuzzy msgid "Author(s)" -msgstr "Ðвтор" +msgstr "Ðвтор(Ñ‹)" -#: actions/version.php:198 lib/groupeditform.php:172 -msgid "Description" -msgstr "ОпиÑание" - -#: classes/File.php:137 +#: classes/File.php:144 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " @@ -4055,16 +4328,36 @@ 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/Group_member.php:41 +#, fuzzy +msgid "Group join failed." +msgstr "Профиль группы" + +#: classes/Group_member.php:53 +#, fuzzy +msgid "Not part of group." +msgstr "Ðе удаётÑÑ Ð¾Ð±Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ информацию о группе." + +#: classes/Group_member.php:60 +#, fuzzy +msgid "Group leave failed." +msgstr "Профиль группы" + +#: classes/Login_token.php:76 +#, 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 "Ð’Ñ‹ заблокированы от отправки прÑмых Ñообщений." @@ -4077,27 +4370,27 @@ msgstr "Ðе удаётÑÑ Ð²Ñтавить Ñообщение." msgid "Could not update message with new URI." msgstr "Ðе удаётÑÑ Ð¾Ð±Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ Ñообщение Ñ Ð½Ð¾Ð²Ñ‹Ð¼ URI." -#: classes/Notice.php:172 +#: classes/Notice.php:171 #, php-format msgid "DB error inserting hashtag: %s" msgstr "Ошибка баз данных при вÑтавке хеш-тегов Ð´Ð»Ñ %s" -#: classes/Notice.php:226 +#: classes/Notice.php:225 msgid "Problem saving notice. Too long." msgstr "Проблемы Ñ Ñохранением запиÑи. Слишком длинно." -#: classes/Notice.php:230 +#: classes/Notice.php:229 msgid "Problem saving notice. Unknown user." msgstr "Проблема при Ñохранении запиÑи. ÐеизвеÑтный пользователь." -#: classes/Notice.php:235 +#: classes/Notice.php:234 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Слишком много запиÑей за Ñтоль короткий Ñрок; передохните немного и " "попробуйте вновь через пару минут." -#: classes/Notice.php:241 +#: classes/Notice.php:240 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4105,25 +4398,25 @@ msgstr "" "Слишком много одинаковых запиÑей за Ñтоль короткий Ñрок; передохните немного " "и попробуйте вновь через пару минут." -#: classes/Notice.php:247 +#: classes/Notice.php:246 msgid "You are banned from posting notices on this site." msgstr "Вам запрещено поÑтитьÑÑ Ð½Ð° Ñтом Ñайте (бан)" -#: classes/Notice.php:309 classes/Notice.php:334 +#: classes/Notice.php:305 classes/Notice.php:330 msgid "Problem saving notice." msgstr "Проблемы Ñ Ñохранением запиÑи." -#: classes/Notice.php:1034 +#: classes/Notice.php:1052 #, php-format msgid "DB error inserting reply: %s" msgstr "Ошибка баз данных при вÑтавке ответа Ð´Ð»Ñ %s" -#: classes/Notice.php:1359 +#: classes/Notice.php:1423 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" -#: classes/User.php:368 +#: classes/User.php:382 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Добро пожаловать на %1$s, @%2$s!" @@ -4164,6 +4457,11 @@ msgstr "Другое" msgid "Other options" msgstr "Другие опции" +#: lib/action.php:144 +#, fuzzy, php-format +msgid "%1$s - %2$s" +msgstr "%1$s (%2$s)" + #: lib/action.php:159 msgid "Untitled page" msgstr "Страница без названиÑ" @@ -4180,10 +4478,6 @@ msgstr "Моё" msgid "Personal profile and friends timeline" msgstr "Личный профиль и лента друзей" -#: lib/action.php:435 -msgid "Account" -msgstr "ÐаÑтройки" - #: lib/action.php:435 msgid "Change your email, avatar, password, profile" msgstr "Изменить ваш email, аватару, пароль, профиль" @@ -4339,18 +4633,13 @@ msgstr "Сюда" msgid "Before" msgstr "Туда" -#: lib/action.php:1167 -msgid "There was a problem with your session token." -msgstr "Проблема Ñ Ð’Ð°ÑˆÐµÐ¹ ÑеÑÑией. Попробуйте ещё раз, пожалуйÑта." - #: lib/adminpanelaction.php:96 msgid "You cannot make changes to this site." msgstr "Ð’Ñ‹ не можете изменÑÑ‚ÑŒ Ñтот Ñайт." #: lib/adminpanelaction.php:107 -#, fuzzy msgid "Changes to that panel are not allowed." -msgstr "РегиÑÑ‚Ñ€Ð°Ñ†Ð¸Ñ Ð½ÐµÐ´Ð¾Ð¿ÑƒÑтима." +msgstr "Ð˜Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ñтой панели недопуÑтимы." #: lib/adminpanelaction.php:206 msgid "showForm() not implemented." @@ -4376,6 +4665,72 @@ msgstr "ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ Ð¾Ñ„Ð¾Ñ€Ð¼Ð»ÐµÐ½Ð¸Ñ" msgid "Paths configuration" msgstr "ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ Ð¿ÑƒÑ‚ÐµÐ¹" +#: lib/applicationeditform.php:186 +msgid "Icon for this application" +msgstr "" + +#: lib/applicationeditform.php:206 +#, fuzzy, php-format +msgid "Describe your application in %d characters" +msgstr "Опишите группу или тему при помощи %d Ñимволов" + +#: lib/applicationeditform.php:209 +#, fuzzy +msgid "Describe your application" +msgstr "Опишите группу или тему" + +#: lib/applicationeditform.php:218 +#, fuzzy +msgid "Source URL" +msgstr "ИÑходный код" + +#: lib/applicationeditform.php:220 +#, fuzzy +msgid "URL of the homepage of this application" +msgstr "ÐÐ´Ñ€ÐµÑ Ñтраницы, дневника или Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹ на другом портале" + +#: lib/applicationeditform.php:226 +msgid "Organization responsible for this application" +msgstr "" + +#: lib/applicationeditform.php:232 +#, fuzzy +msgid "URL for the homepage of the organization" +msgstr "ÐÐ´Ñ€ÐµÑ Ñтраницы, дневника или Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹ на другом портале" + +#: lib/applicationeditform.php:238 +msgid "URL to redirect to after authentication" +msgstr "" + +#: lib/applicationeditform.php:260 +msgid "Browser" +msgstr "" + +#: lib/applicationeditform.php:276 +msgid "Desktop" +msgstr "" + +#: lib/applicationeditform.php:277 +msgid "Type of application, browser or desktop" +msgstr "" + +#: lib/applicationeditform.php:299 +msgid "Read-only" +msgstr "" + +#: lib/applicationeditform.php:317 +msgid "Read-write" +msgstr "" + +#: lib/applicationeditform.php:318 +msgid "Default access for this application: read-only, or read-write" +msgstr "" + +#: lib/applicationlist.php:154 +#, fuzzy +msgid "Revoke" +msgstr "Убрать" + #: lib/attachmentlist.php:87 msgid "Attachments" msgstr "ВложениÑ" @@ -4396,11 +4751,11 @@ msgstr "Сообщает, где поÑвлÑетÑÑ Ñто вложение" msgid "Tags for this attachment" msgstr "Теги Ð´Ð»Ñ Ñтого вложениÑ" -#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 +#: lib/authenticationplugin.php:214 lib/authenticationplugin.php:219 msgid "Password changing failed" msgstr "Изменение Ð¿Ð°Ñ€Ð¾Ð»Ñ Ð½Ðµ удалоÑÑŒ" -#: lib/authenticationplugin.php:197 +#: lib/authenticationplugin.php:229 msgid "Password changing is not allowed" msgstr "Смена Ð¿Ð°Ñ€Ð¾Ð»Ñ Ð½Ðµ разрешена" @@ -4421,8 +4776,8 @@ msgid "Sorry, this command is not yet implemented." msgstr "ПроÑтите, Ñта команда ещё не выполнена." #: lib/command.php:88 -#, fuzzy, php-format -msgid "Could not find a user with nickname %s." +#, php-format +msgid "Could not find a user with nickname %s" msgstr "Ðе удаётÑÑ Ð½Ð°Ð¹Ñ‚Ð¸ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ %s" #: lib/command.php:92 @@ -4430,8 +4785,8 @@ msgid "It does not make a lot of sense to nudge yourself!" msgstr "Ðет ÑмыÑла «подталкивать» Ñамого ÑебÑ!" #: lib/command.php:99 -#, fuzzy, php-format -msgid "Nudge sent to %s." +#, php-format +msgid "Nudge sent to %s" msgstr "«Подталкивание» поÑлано %s" #: lib/command.php:126 @@ -4445,172 +4800,189 @@ msgstr "" "ПодпиÑчиков: %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." +#: lib/command.php:152 lib/command.php:390 lib/command.php:451 +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 "У Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð½ÐµÑ‚ запиÑей" +#: lib/command.php:168 lib/command.php:406 lib/command.php:467 +#: lib/command.php:523 +msgid "User has no last notice" +msgstr "У Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð½ÐµÑ‚ поÑледней запиÑи." #: lib/command.php:190 msgid "Notice marked as fave." msgstr "ЗапиÑÑŒ помечена как любимаÑ." -#: lib/command.php:284 -#, fuzzy, php-format -msgid "Could not remove user %1$s to group %2$s." -msgstr "Ðе удаётÑÑ ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ %s из группы %s" +#: lib/command.php:217 +msgid "You are already a member of that group" +msgstr "Ð’Ñ‹ уже ÑвлÑетеÑÑŒ членом Ñтой группы." -#: lib/command.php:318 +#: lib/command.php:231 +#, php-format +msgid "Could not join user %s to group %s" +msgstr "Ðе удаётÑÑ Ð¿Ñ€Ð¸Ñоединить Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ %s к группе %s" + +#: lib/command.php:236 +#, php-format +msgid "%s joined group %s" +msgstr "%1$s вÑтупил в группу %2$s" + +#: lib/command.php:275 +#, php-format +msgid "Could not remove user %s to group %s" +msgstr "Ðе удаётÑÑ ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ %1$s из группы %2$s." + +#: lib/command.php:280 +#, php-format +msgid "%s left group %s" +msgstr "%1$s покинул группу %2$s" + +#: lib/command.php:309 #, php-format msgid "Fullname: %s" msgstr "Полное имÑ: %s" -#: lib/command.php:321 +#: lib/command.php:312 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "МеÑтораÑположение: %s" -#: lib/command.php:324 +#: lib/command.php:315 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "ДомашнÑÑ Ñтраница: %s" -#: lib/command.php:327 +#: lib/command.php:318 #, php-format msgid "About: %s" msgstr "О пользователе: %s" -#: lib/command.php:358 -#, fuzzy, php-format -msgid "Message too long - maximum is %1$d characters, you sent %2$d." +#: lib/command.php:349 +#, 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:367 +#, php-format +msgid "Direct message to %s sent" +msgstr "ПрÑмое Ñообщение Ð´Ð»Ñ %s поÑлано." -#: lib/command.php:378 +#: lib/command.php:369 msgid "Error sending direct message." msgstr "Ошибка при отправке прÑмого ÑообщениÑ." -#: lib/command.php:435 -#, fuzzy, php-format -msgid "Notice from %s repeated." +#: lib/command.php:413 +msgid "Cannot repeat your own notice" +msgstr "Ðевозможно повторить ÑобÑтвенную запиÑÑŒ." + +#: lib/command.php:418 +msgid "Already repeated that notice" +msgstr "Эта запиÑÑŒ уже повторена" + +#: lib/command.php:426 +#, php-format +msgid "Notice from %s repeated" msgstr "ЗапиÑÑŒ %s повторена" -#: lib/command.php:437 +#: lib/command.php:428 msgid "Error repeating notice." msgstr "Ошибка при повторении запиÑи." -#: lib/command.php:491 -#, fuzzy, php-format -msgid "Notice too long - maximum is %1$d characters, you sent %2$d." +#: lib/command.php:482 +#, php-format +msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "ЗапиÑÑŒ Ñлишком Ð´Ð»Ð¸Ð½Ð½Ð°Ñ â€” не больше %d Ñимволов, вы поÑылаете %d" -#: lib/command.php:500 -#, fuzzy, php-format -msgid "Reply to %s sent." +#: lib/command.php:491 +#, php-format +msgid "Reply to %s sent" msgstr "Ответ %s отправлен" -#: lib/command.php:502 +#: lib/command.php:493 msgid "Error saving notice." msgstr "Проблемы Ñ Ñохранением запиÑи." -#: lib/command.php:556 -#, fuzzy -msgid "Specify the name of the user to subscribe to." -msgstr "Определите Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¿Ñ€Ð¸ подпиÑке на" +#: lib/command.php:547 +msgid "Specify the name of the user to subscribe to" +msgstr "Укажите Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¿Ð¸Ñки." -#: lib/command.php:563 +#: lib/command.php:554 #, php-format msgid "Subscribed to %s" msgstr "ПодпиÑано на %s" -#: lib/command.php:584 -#, fuzzy -msgid "Specify the name of the user to unsubscribe from." -msgstr "Определите Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð´Ð»Ñ Ð¾Ñ‚Ð¿Ð¸Ñки от" +#: lib/command.php:575 +msgid "Specify the name of the user to unsubscribe from" +msgstr "Укажите Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð´Ð»Ñ Ð¾Ñ‚Ð¼ÐµÐ½Ñ‹ подпиÑки." -#: lib/command.php:591 +#: lib/command.php:582 #, php-format msgid "Unsubscribed from %s" msgstr "ОтпиÑано от %s" -#: lib/command.php:609 lib/command.php:632 +#: lib/command.php:600 lib/command.php:623 msgid "Command not yet implemented." msgstr "Команда ещё не выполнена." -#: lib/command.php:612 +#: lib/command.php:603 msgid "Notification off." msgstr "Оповещение отÑутÑтвует." -#: lib/command.php:614 +#: lib/command.php:605 msgid "Can't turn off notification." msgstr "Ðет оповещениÑ." -#: lib/command.php:635 +#: lib/command.php:626 msgid "Notification on." msgstr "ЕÑÑ‚ÑŒ оповещение." -#: lib/command.php:637 +#: lib/command.php:628 msgid "Can't turn on notification." msgstr "ЕÑÑ‚ÑŒ оповещение." -#: lib/command.php:650 -#, fuzzy -msgid "Login command is disabled." +#: lib/command.php:641 +msgid "Login command is disabled" msgstr "Команда входа отключена" -#: lib/command.php:664 -#, fuzzy, php-format -msgid "Could not create login token for %s." -msgstr "Ðе удаётÑÑ Ñоздать токен входа Ð´Ð»Ñ %s" - -#: lib/command.php:669 -#, fuzzy, php-format -msgid "This link is useable only once, and is good for only 2 minutes: %s." +#: lib/command.php:652 +#, 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:668 msgid "You are not subscribed to anyone." msgstr "Ð’Ñ‹ ни на кого не подпиÑаны." -#: lib/command.php:687 +#: lib/command.php:670 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:690 msgid "No one is subscribed to you." msgstr "Ðикто не подпиÑан на ваÑ." -#: lib/command.php:709 +#: lib/command.php:692 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:712 msgid "You are not a member of any groups." msgstr "Ð’Ñ‹ не ÑоÑтоите ни в одной группе." -#: lib/command.php:731 +#: lib/command.php:714 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:728 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4688,19 +5060,19 @@ msgstr "" "tracks — пока не реализовано.\n" "tracking — пока не реализовано.\n" -#: lib/common.php:199 +#: lib/common.php:131 msgid "No configuration file found. " msgstr "Конфигурационный файл не найден. " -#: lib/common.php:200 +#: lib/common.php:132 msgid "I looked for configuration files in the following places: " msgstr "Конфигурационные файлы иÑкалиÑÑŒ в Ñледующих меÑтах: " -#: lib/common.php:201 +#: lib/common.php:134 msgid "You may wish to run the installer to fix this." msgstr "Возможно, вы решите запуÑтить уÑтановщик Ð´Ð»Ñ Ð¸ÑÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ñтого." -#: lib/common.php:202 +#: lib/common.php:135 msgid "Go to the installer." msgstr "Перейти к уÑтановщику" @@ -4716,6 +5088,15 @@ msgstr "Обновлено по IM" msgid "Updates by SMS" msgstr "ÐžÐ±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ð¾ СМС" +#: lib/connectsettingsaction.php:120 +#, fuzzy +msgid "Connections" +msgstr "Соединить" + +#: lib/connectsettingsaction.php:121 +msgid "Authorized connected applications" +msgstr "" + #: lib/dberroraction.php:60 msgid "Database error" msgstr "Ошибка базы данных" @@ -4902,11 +5283,16 @@ msgstr "МБ" msgid "kB" msgstr "КБ" -#: lib/jabber.php:191 +#: lib/jabber.php:202 #, php-format msgid "[%s]" msgstr "[%s]" +#: lib/jabber.php:385 +#, fuzzy, php-format +msgid "Unknown inbox source %d." +msgstr "ÐеизвеÑтный Ñзык «%s»." + #: lib/joinform.php:114 msgid "Join" msgstr "ПриÑоединитьÑÑ" @@ -4987,24 +5373,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 @@ -5218,9 +5590,9 @@ msgid "Sorry, no incoming email allowed." msgstr "ПроÑтите, входÑщих пиÑем нет." #: lib/mailhandler.php:228 -#, fuzzy, php-format +#, php-format msgid "Unsupported message type: %s" -msgstr "Ðеподдерживаемый формат файла изображениÑ." +msgstr "Ðеподдерживаемый формат файла изображениÑ: %s" #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." @@ -5256,16 +5628,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 @@ -5274,7 +5646,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 @@ -5307,17 +5679,17 @@ msgid "Attach a file" msgstr "Прикрепить файл" #: lib/noticeform.php:212 -#, fuzzy -msgid "Share my location." -msgstr "ПоделитьÑÑ Ñвоим меÑтоположением" - -#: lib/noticeform.php:214 -#, fuzzy -msgid "Do not share my location." -msgstr "ПоделитьÑÑ Ñвоим меÑтоположением" +msgid "Share my location" +msgstr "ПоделитьÑÑ Ñвоим меÑтоположением." #: lib/noticeform.php:215 -msgid "Hide this info" +msgid "Do not share my location" +msgstr "Ðе публиковать Ñвоё меÑтоположение" + +#: lib/noticeform.php:216 +msgid "" +"Sorry, retrieving your geo location is taking longer than expected, please " +"try again later" msgstr "" #: lib/noticelist.php:428 @@ -5435,9 +5807,8 @@ msgid "Tags in %s's notices" msgstr "Теги запиÑей Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ %s" #: lib/plugin.php:114 -#, fuzzy msgid "Unknown" -msgstr "ÐеизвеÑтное дейÑтвие" +msgstr "ÐеизвеÑтно" #: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82 msgid "Subscriptions" @@ -5578,23 +5949,23 @@ msgstr "Уже подпиÑаны!" msgid "User has blocked you." msgstr "Пользователь заблокировал ВаÑ." -#: lib/subs.php:60 +#: lib/subs.php:63 msgid "Could not subscribe." msgstr "ПодпиÑка неудачна." -#: lib/subs.php:79 +#: lib/subs.php:82 msgid "Could not subscribe other to you." msgstr "Ðе удаётÑÑ Ð¿Ð¾Ð´Ð¿Ð¸Ñать других на вашу ленту." -#: lib/subs.php:128 +#: lib/subs.php:137 msgid "Not subscribed!" msgstr "Ðе подпиÑаны!" -#: lib/subs.php:133 +#: lib/subs.php:142 msgid "Couldn't delete self-subscription." msgstr "Ðевозможно удалить ÑамоподпиÑку." -#: lib/subs.php:146 +#: lib/subs.php:158 msgid "Couldn't delete subscription." msgstr "Ðе удаётÑÑ ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ подпиÑку." @@ -5608,10 +5979,6 @@ msgstr "Облако ÑобÑтвенных тегов людей" msgid "People Tagcloud as tagged" msgstr "Облако тегов людей" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(пока ничего нет)" - #: lib/tagcloudsection.php:56 msgid "None" msgstr "Ðет тегов" @@ -5672,47 +6039,47 @@ msgstr "Сообщение" msgid "Moderate" msgstr "Модерировать" -#: lib/util.php:837 +#: lib/util.php:875 msgid "a few seconds ago" msgstr "пару Ñекунд назад" -#: lib/util.php:839 +#: lib/util.php:877 msgid "about a minute ago" msgstr "около минуты назад" -#: lib/util.php:841 +#: lib/util.php:879 #, php-format msgid "about %d minutes ago" msgstr "около %d минут(Ñ‹) назад" -#: lib/util.php:843 +#: lib/util.php:881 msgid "about an hour ago" msgstr "около чаÑа назад" -#: lib/util.php:845 +#: lib/util.php:883 #, php-format msgid "about %d hours ago" msgstr "около %d чаÑа(ов) назад" -#: lib/util.php:847 +#: lib/util.php:885 msgid "about a day ago" msgstr "около Ð´Ð½Ñ Ð½Ð°Ð·Ð°Ð´" -#: lib/util.php:849 +#: lib/util.php:887 #, php-format msgid "about %d days ago" msgstr "около %d днÑ(ей) назад" -#: lib/util.php:851 +#: lib/util.php:889 msgid "about a month ago" msgstr "около меÑÑца назад" -#: lib/util.php:853 +#: lib/util.php:891 #, php-format msgid "about %d months ago" msgstr "около %d меÑÑца(ев) назад" -#: lib/util.php:855 +#: lib/util.php:893 msgid "about a year ago" msgstr "около года назад" @@ -5730,5 +6097,6 @@ msgstr "" #: scripts/xmppdaemon.php:301 #, php-format -msgid "Message too long - maximum is %d characters, you sent %d" -msgstr "Сообщение Ñлишком длинное — не больше %d Ñимволов, вы поÑылаете %d" +msgid "Message too long - maximum is %1$d characters, you sent %2$d." +msgstr "" +"Сообщение Ñлишком длинное — не больше %1$d Ñимволов, вы отправили %2$d." diff --git a/locale/statusnet.po b/locale/statusnet.po index cce6e1e427..a7f7f9f74b 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-10 00:46+0000\n" +"POT-Creation-Date: 2010-01-16 17:51+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -31,25 +31,30 @@ msgstr "" #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 +#: actions/apistatusesupdate.php:149 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 #: 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 #: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 -#: lib/command.php:163 lib/command.php:311 lib/command.php:364 -#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/command.php:163 lib/command.php:302 lib/command.php:355 +#: lib/command.php:401 lib/command.php:462 lib/command.php:518 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/subs.php:34 lib/subs.php:125 msgid "No such user." msgstr "" +#: actions/all.php:84 +#, php-format +msgid "%1$s and friends, page %2$d" +msgstr "" + #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 +#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -101,7 +106,7 @@ msgstr "" msgid "You and friends" msgstr "" -#: actions/allrss.php:119 actions/apitimelinefriends.php:122 +#: actions/allrss.php:119 actions/apitimelinefriends.php:121 #: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" @@ -112,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:155 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 "" @@ -125,7 +147,7 @@ msgstr "" #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:114 +#: actions/apistatusesupdate.php:119 msgid "This method requires a POST." msgstr "" @@ -154,8 +176,9 @@ msgstr "" #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257 -#: actions/designadminpanel.php:122 actions/newnotice.php:94 +#: actions/apistatusesupdate.php:132 actions/avatarsettings.php:257 +#: actions/designadminpanel.php:122 actions/editapplication.php:118 +#: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format msgid "" @@ -167,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 "" @@ -207,26 +233,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 "" @@ -250,7 +256,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 @@ -258,7 +264,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 @@ -279,7 +285,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 @@ -312,7 +318,8 @@ msgstr "" msgid "Not a valid nickname." msgstr "" -#: actions/apigroupcreate.php:196 actions/editgroup.php:195 +#: actions/apigroupcreate.php:196 actions/editapplication.php:212 +#: actions/editgroup.php:195 actions/newapplication.php:200 #: actions/newgroup.php:139 actions/profilesettings.php:222 #: actions/register.php:217 msgid "Homepage is not a valid URL." @@ -324,7 +331,8 @@ msgstr "" msgid "Full name is too long (max 255 chars)." msgstr "" -#: actions/apigroupcreate.php:213 +#: actions/apigroupcreate.php:213 actions/editapplication.php:187 +#: actions/newapplication.php:169 #, php-format msgid "Description is too long (max %d chars)." msgstr "" @@ -364,7 +372,7 @@ msgstr "" msgid "Group not found!" msgstr "" -#: actions/apigroupjoin.php:110 lib/command.php:217 +#: actions/apigroupjoin.php:110 actions/joingroup.php:90 msgid "You are already a member of that group." msgstr "" @@ -372,7 +380,7 @@ msgstr "" msgid "You have been blocked from that group by the admin." msgstr "" -#: actions/apigroupjoin.php:138 lib/command.php:234 +#: actions/apigroupjoin.php:138 actions/joingroup.php:124 #, php-format msgid "Could not join user %1$s to group %2$s." msgstr "" @@ -381,7 +389,7 @@ msgstr "" msgid "You are not a member of this group." msgstr "" -#: actions/apigroupleave.php:124 actions/leavegroup.php:127 +#: actions/apigroupleave.php:124 actions/leavegroup.php:119 #, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "" @@ -401,6 +409,97 @@ msgstr "" msgid "groups on %s" msgstr "" +#: actions/apioauthauthorize.php:108 actions/apioauthauthorize.php:114 +msgid "Bad request." +msgstr "" + +#: actions/apioauthauthorize.php:134 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:115 actions/makeadmin.php:66 +#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 +#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:139 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 +#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/subscribe.php:46 actions/tagother.php:166 +#: 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 "" + +#: actions/apioauthauthorize.php:146 +msgid "Invalid nickname / password!" +msgstr "" + +#: actions/apioauthauthorize.php:170 +msgid "DB error deleting OAuth app user." +msgstr "" + +#: actions/apioauthauthorize.php:196 +msgid "DB error inserting OAuth app user." +msgstr "" + +#: actions/apioauthauthorize.php:231 +#, php-format +msgid "" +"The request token %s has been authorized. Please exchange it for an access " +"token." +msgstr "" + +#: actions/apioauthauthorize.php:241 +#, php-format +msgid "The request token %s has been denied." +msgstr "" + +#: actions/apioauthauthorize.php:246 actions/avatarsettings.php:281 +#: actions/designadminpanel.php:103 actions/editapplication.php:139 +#: actions/emailsettings.php:256 actions/grouplogo.php:319 +#: actions/imsettings.php:220 actions/newapplication.php:121 +#: actions/oauthconnectionssettings.php:151 actions/recoverpassword.php:44 +#: actions/smssettings.php:248 lib/designsettings.php:304 +msgid "Unexpected form submission." +msgstr "" + +#: actions/apioauthauthorize.php:273 +msgid "An application would like to connect to your account" +msgstr "" + +#: actions/apioauthauthorize.php:290 +msgid "Allow or deny access" +msgstr "" + +#: actions/apioauthauthorize.php:320 lib/action.php:435 +msgid "Account" +msgstr "" + +#: actions/apioauthauthorize.php:323 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/apioauthauthorize.php:326 actions/login.php:233 +#: actions/register.php:429 lib/accountsettingsaction.php:116 +msgid "Password" +msgstr "" + +#: actions/apioauthauthorize.php:338 +msgid "Deny" +msgstr "" + +#: actions/apioauthauthorize.php:344 +msgid "Allow" +msgstr "" + +#: actions/apioauthauthorize.php:361 +msgid "Allow or deny access to your account information." +msgstr "" + #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." msgstr "" @@ -414,11 +513,11 @@ msgstr "" msgid "No such notice." msgstr "" -#: actions/apistatusesretweet.php:83 lib/command.php:422 +#: actions/apistatusesretweet.php:83 msgid "Cannot repeat your own notice." msgstr "" -#: actions/apistatusesretweet.php:91 lib/command.php:427 +#: actions/apistatusesretweet.php:91 msgid "Already repeated that notice." msgstr "" @@ -430,17 +529,17 @@ msgstr "" msgid "No status with that ID found." msgstr "" -#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:162 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" -#: actions/apistatusesupdate.php:198 +#: actions/apistatusesupdate.php:203 msgid "Not found" msgstr "" -#: actions/apistatusesupdate.php:221 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:226 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -524,8 +623,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 "" @@ -548,8 +650,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 "" @@ -581,29 +683,6 @@ 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/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 -#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 -#: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 -#: actions/subscribe.php:46 actions/tagother.php:166 -#: 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 "" - -#: actions/avatarsettings.php:281 actions/designadminpanel.php:103 -#: actions/emailsettings.php:256 actions/grouplogo.php:319 -#: actions/imsettings.php:220 actions/recoverpassword.php:44 -#: actions/smssettings.php:248 lib/designsettings.php:304 -msgid "Unexpected form submission." -msgstr "" - #: actions/avatarsettings.php:328 msgid "Pick a square area of the image to be your avatar" msgstr "" @@ -662,18 +741,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:260 +msgid "No such group." msgstr "" #: actions/blockedfromgroup.php:90 @@ -741,7 +816,7 @@ msgid "Couldn't delete email confirmation." msgstr "" #: actions/confirmaddress.php:144 -msgid "Confirm Address" +msgid "Confirm address" msgstr "" #: actions/confirmaddress.php:159 @@ -794,10 +869,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 "" @@ -927,7 +998,8 @@ msgstr "" #: actions/pathsadminpanel.php:324 actions/profilesettings.php:174 #: actions/siteadminpanel.php:388 actions/smssettings.php:181 #: actions/subscriptions.php:203 actions/tagother.php:154 -#: actions/useradminpanel.php:313 lib/designsettings.php:256 +#: actions/useradminpanel.php:313 lib/applicationeditform.php:335 +#: lib/applicationeditform.php:336 lib/designsettings.php:256 #: lib/groupeditform.php:202 msgid "Save" msgstr "" @@ -948,6 +1020,76 @@ msgstr "" msgid "No such document." msgstr "" +#: actions/editapplication.php:54 lib/applicationeditform.php:136 +msgid "Edit application" +msgstr "" + +#: actions/editapplication.php:66 +msgid "You must be logged in to edit an application." +msgstr "" + +#: actions/editapplication.php:77 actions/showapplication.php:94 +msgid "You are not the owner of this application." +msgstr "" + +#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:163 +#: actions/showapplication.php:87 +msgid "No such application." +msgstr "" + +#: actions/editapplication.php:127 actions/newapplication.php:110 +#: actions/showapplication.php:118 lib/action.php:1167 +msgid "There was a problem with your session token." +msgstr "" + +#: actions/editapplication.php:161 +msgid "Use this form to edit your application." +msgstr "" + +#: actions/editapplication.php:177 actions/newapplication.php:159 +msgid "Name is required." +msgstr "" + +#: actions/editapplication.php:180 actions/newapplication.php:162 +msgid "Name is too long (max 255 chars)." +msgstr "" + +#: actions/editapplication.php:183 actions/newapplication.php:165 +msgid "Description is required." +msgstr "" + +#: actions/editapplication.php:191 +msgid "Source URL is too long." +msgstr "" + +#: actions/editapplication.php:197 actions/newapplication.php:182 +msgid "Source URL is not valid." +msgstr "" + +#: actions/editapplication.php:200 actions/newapplication.php:185 +msgid "Organization is required." +msgstr "" + +#: actions/editapplication.php:203 actions/newapplication.php:188 +msgid "Organization is too long (max 255 chars)." +msgstr "" + +#: actions/editapplication.php:206 actions/newapplication.php:191 +msgid "Organization homepage is required." +msgstr "" + +#: actions/editapplication.php:215 actions/newapplication.php:203 +msgid "Callback is too long." +msgstr "" + +#: actions/editapplication.php:222 actions/newapplication.php:212 +msgid "Callback URL is not valid." +msgstr "" + +#: actions/editapplication.php:255 +msgid "Could not update application." +msgstr "" + #: actions/editgroup.php:56 #, php-format msgid "Edit %s group" @@ -959,7 +1101,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 @@ -984,7 +1126,7 @@ msgid "Options saved." msgstr "" #: actions/emailsettings.php:60 -msgid "Email Settings" +msgid "Email settings" msgstr "" #: actions/emailsettings.php:71 @@ -1014,12 +1156,13 @@ msgid "" msgstr "" #: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 +#: actions/smssettings.php:126 lib/applicationeditform.php:333 +#: lib/applicationeditform.php:334 msgid "Cancel" msgstr "" #: actions/emailsettings.php:121 -msgid "Email Address" +msgid "Email address" msgstr "" #: actions/emailsettings.php:123 @@ -1093,8 +1236,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 @@ -1269,13 +1413,6 @@ 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:79 msgid "No such file." msgstr "" @@ -1292,7 +1429,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 "" @@ -1337,8 +1474,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 @@ -1360,12 +1497,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 "" @@ -1380,6 +1511,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 "" @@ -1498,7 +1633,7 @@ msgid "Error removing the block." msgstr "" #: actions/imsettings.php:59 -msgid "IM Settings" +msgid "IM settings" msgstr "" #: actions/imsettings.php:70 @@ -1524,7 +1659,7 @@ msgid "" msgstr "" #: actions/imsettings.php:124 -msgid "IM Address" +msgid "IM address" msgstr "" #: actions/imsettings.php:126 @@ -1616,7 +1751,7 @@ msgstr "" msgid "You are already subscribed to these users:" msgstr "" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:315 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 #, php-format msgid "%1$s (%2$s)" msgstr "" @@ -1657,7 +1792,7 @@ msgstr "" msgid "Optionally add a personal message to the invitation." msgstr "" -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236 msgid "Send" msgstr "" @@ -1701,16 +1836,7 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "" -#: actions/joingroup.php:90 -msgid "You are already a member of that group" -msgstr "" - -#: actions/joingroup.php:128 -#, php-format -msgid "Could not join user %1$s to group %2$s" -msgstr "" - -#: actions/joingroup.php:135 lib/command.php:239 +#: actions/joingroup.php:131 #, php-format msgid "%1$s joined group %2$s" msgstr "" @@ -1719,74 +1845,55 @@ msgstr "" msgid "You must be logged in to leave a group." msgstr "" -#: actions/leavegroup.php:90 lib/command.php:268 +#: actions/leavegroup.php:90 lib/command.php:265 msgid "You are not a member of that group." msgstr "" -#: actions/leavegroup.php:119 lib/command.php:278 -msgid "Could not find membership record." -msgstr "" - -#: actions/leavegroup.php:134 lib/command.php:289 +#: actions/leavegroup.php:127 #, php-format 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:460 +#: 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 -#: lib/groupeditform.php:152 lib/userprofile.php:131 -msgid "Nickname" -msgstr "" - -#: actions/login.php:253 actions/register.php:428 -#: 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]" @@ -1804,18 +1911,38 @@ msgstr "" #: actions/makeadmin.php:132 #, php-format -msgid "Can't get membership record for %1$s in group %2$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 %1$s an admin for group %2$s" +msgid "Can't make %1$s an admin for group %2$s." msgstr "" #: actions/microsummary.php:69 msgid "No current status" msgstr "" +#: actions/newapplication.php:52 +msgid "New application" +msgstr "" + +#: actions/newapplication.php:64 +msgid "You must be logged in to register an application." +msgstr "" + +#: actions/newapplication.php:143 +msgid "Use this form to register a new application." +msgstr "" + +#: actions/newapplication.php:173 +msgid "Source URL is required." +msgstr "" + +#: actions/newapplication.php:255 actions/newapplication.php:264 +msgid "Could not create application." +msgstr "" + #: actions/newgroup.php:53 msgid "New group" msgstr "" @@ -1828,12 +1955,12 @@ msgstr "" msgid "New message" msgstr "" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 msgid "You can't send a message to this user." msgstr "" -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:484 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 +#: lib/command.php:475 msgid "No content!" msgstr "" @@ -1841,7 +1968,7 @@ msgstr "" msgid "No recipient specified." msgstr "" -#: actions/newmessage.php:164 lib/command.php:370 +#: actions/newmessage.php:164 lib/command.php:361 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -1852,7 +1979,7 @@ msgstr "" #: 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 @@ -1920,6 +2047,48 @@ msgstr "" msgid "Nudge sent!" msgstr "" +#: actions/oauthappssettings.php:59 +msgid "You must be logged in to list your applications." +msgstr "" + +#: actions/oauthappssettings.php:74 +msgid "OAuth applications" +msgstr "" + +#: actions/oauthappssettings.php:85 +msgid "Applications you have registered" +msgstr "" + +#: actions/oauthappssettings.php:135 +#, php-format +msgid "You have not registered any applications yet." +msgstr "" + +#: actions/oauthconnectionssettings.php:71 +msgid "Connected applications" +msgstr "" + +#: actions/oauthconnectionssettings.php:87 +msgid "You have allowed the following applications to access you account." +msgstr "" + +#: actions/oauthconnectionssettings.php:170 +msgid "You are not a user of that application." +msgstr "" + +#: actions/oauthconnectionssettings.php:180 +msgid "Unable to revoke access for app: " +msgstr "" + +#: actions/oauthconnectionssettings.php:192 +#, php-format +msgid "You have not authorized any applications to use your account." +msgstr "" + +#: actions/oauthconnectionssettings.php:205 +msgid "Developers can edit the registration settings for their applications " +msgstr "" + #: actions/oembed.php:79 actions/shownotice.php:100 msgid "Notice has no profile" msgstr "" @@ -1937,8 +2106,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:1038 +#: lib/api.php:1066 lib/api.php:1176 msgid "Not a supported data format." msgstr "" @@ -1951,7 +2120,7 @@ msgid "Notice Search" msgstr "" #: actions/othersettings.php:60 -msgid "Other Settings" +msgid "Other settings" msgstr "" #: actions/othersettings.php:71 @@ -1982,6 +2151,26 @@ msgstr "" msgid "URL shortening service is too long (max 50 chars)." msgstr "" +#: 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 #, php-format msgid "Outbox for %s" @@ -2016,7 +2205,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 "" @@ -2178,7 +2367,7 @@ msgid "When to use SSL" msgstr "" #: actions/pathsadminpanel.php:308 -msgid "SSL Server" +msgid "SSL server" msgstr "" #: actions/pathsadminpanel.php:309 @@ -2236,42 +2425,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 -#: lib/groupeditform.php:161 +#: actions/profilesettings.php:115 actions/register.php:453 +#: lib/applicationeditform.php:230 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 "" @@ -2562,7 +2751,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 "" @@ -2574,7 +2763,7 @@ msgstr "" msgid "Registration successful" msgstr "" -#: actions/register.php:114 actions/register.php:502 lib/action.php:457 +#: actions/register.php:114 actions/register.php:503 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "" @@ -2587,64 +2776,60 @@ 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, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -2663,7 +2848,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.)" @@ -2801,6 +2986,80 @@ msgstr "" msgid "User is already sandboxed." msgstr "" +#: actions/showapplication.php:82 +msgid "You must be logged in to view an application." +msgstr "" + +#: actions/showapplication.php:158 +msgid "Application profile" +msgstr "" + +#: actions/showapplication.php:160 lib/applicationeditform.php:182 +msgid "Icon" +msgstr "" + +#: actions/showapplication.php:170 actions/version.php:195 +#: lib/applicationeditform.php:197 +msgid "Name" +msgstr "" + +#: actions/showapplication.php:179 lib/applicationeditform.php:224 +msgid "Organization" +msgstr "" + +#: actions/showapplication.php:188 actions/version.php:198 +#: lib/applicationeditform.php:211 lib/groupeditform.php:172 +msgid "Description" +msgstr "" + +#: actions/showapplication.php:193 actions/showgroup.php:429 +#: lib/profileaction.php:174 +msgid "Statistics" +msgstr "" + +#: actions/showapplication.php:204 +#, php-format +msgid "created by %1$s - %2$s access by default - %3$d users" +msgstr "" + +#: actions/showapplication.php:214 +msgid "Application actions" +msgstr "" + +#: actions/showapplication.php:233 +msgid "Reset key & secret" +msgstr "" + +#: actions/showapplication.php:241 +msgid "Application info" +msgstr "" + +#: actions/showapplication.php:243 +msgid "Consumer key" +msgstr "" + +#: actions/showapplication.php:248 +msgid "Consumer secret" +msgstr "" + +#: actions/showapplication.php:253 +msgid "Request token URL" +msgstr "" + +#: actions/showapplication.php:258 +msgid "Access token URL" +msgstr "" + +#: actions/showapplication.php:263 +msgid "Authorize URL" +msgstr "" + +#: actions/showapplication.php:268 +msgid "" +"Note: We support HMAC-SHA1 signatures. We do not support the plaintext " +"signature method." +msgstr "" + #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "" @@ -2898,7 +3157,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 "" @@ -2906,10 +3165,6 @@ msgstr "" msgid "All members" msgstr "" -#: actions/showgroup.php:429 lib/profileaction.php:174 -msgid "Statistics" -msgstr "" - #: actions/showgroup.php:432 msgid "Created" msgstr "" @@ -3046,12 +3301,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 @@ -3231,7 +3486,7 @@ msgid "Save site settings" msgstr "" #: actions/smssettings.php:58 -msgid "SMS Settings" +msgid "SMS settings" msgstr "" #: actions/smssettings.php:69 @@ -3260,7 +3515,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 @@ -3496,10 +3751,6 @@ 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 "" @@ -3690,10 +3941,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 "" @@ -3769,10 +4016,6 @@ msgstr "" msgid "Plugins" msgstr "" -#: actions/version.php:195 -msgid "Name" -msgstr "" - #: actions/version.php:196 lib/action.php:741 msgid "Version" msgstr "" @@ -3781,27 +4024,40 @@ msgstr "" msgid "Author(s)" msgstr "" -#: actions/version.php:198 lib/groupeditform.php:172 -msgid "Description" -msgstr "" - -#: classes/File.php:137 +#: 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/Group_member.php:41 +msgid "Group join failed." +msgstr "" + +#: classes/Group_member.php:53 +msgid "Not part of group." +msgstr "" + +#: classes/Group_member.php:60 +msgid "Group leave failed." +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 "" @@ -3814,49 +4070,49 @@ msgstr "" msgid "Could not update message with new URI." msgstr "" -#: classes/Notice.php:172 +#: classes/Notice.php:171 #, php-format msgid "DB error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:226 +#: classes/Notice.php:225 msgid "Problem saving notice. Too long." msgstr "" -#: classes/Notice.php:230 +#: classes/Notice.php:229 msgid "Problem saving notice. Unknown user." msgstr "" -#: classes/Notice.php:235 +#: classes/Notice.php:234 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:241 +#: classes/Notice.php:240 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:247 +#: classes/Notice.php:246 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:309 classes/Notice.php:334 +#: classes/Notice.php:305 classes/Notice.php:330 msgid "Problem saving notice." msgstr "" -#: classes/Notice.php:1034 +#: classes/Notice.php:1052 #, php-format msgid "DB error inserting reply: %s" msgstr "" -#: classes/Notice.php:1359 +#: classes/Notice.php:1423 #, php-format msgid "RT @%1$s %2$s" msgstr "" -#: classes/User.php:368 +#: classes/User.php:382 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" @@ -3897,6 +4153,11 @@ msgstr "" msgid "Other options" msgstr "" +#: lib/action.php:144 +#, php-format +msgid "%1$s - %2$s" +msgstr "" + #: lib/action.php:159 msgid "Untitled page" msgstr "" @@ -3913,10 +4174,6 @@ msgstr "" msgid "Personal profile and friends timeline" msgstr "" -#: lib/action.php:435 -msgid "Account" -msgstr "" - #: lib/action.php:435 msgid "Change your email, avatar, password, profile" msgstr "" @@ -4066,10 +4323,6 @@ msgstr "" msgid "Before" msgstr "" -#: lib/action.php:1167 -msgid "There was a problem with your session token." -msgstr "" - #: lib/adminpanelaction.php:96 msgid "You cannot make changes to this site." msgstr "" @@ -4102,6 +4355,67 @@ msgstr "" msgid "Paths configuration" msgstr "" +#: lib/applicationeditform.php:186 +msgid "Icon for this application" +msgstr "" + +#: lib/applicationeditform.php:206 +#, php-format +msgid "Describe your application in %d characters" +msgstr "" + +#: lib/applicationeditform.php:209 +msgid "Describe your application" +msgstr "" + +#: lib/applicationeditform.php:218 +msgid "Source URL" +msgstr "" + +#: lib/applicationeditform.php:220 +msgid "URL of the homepage of this application" +msgstr "" + +#: lib/applicationeditform.php:226 +msgid "Organization responsible for this application" +msgstr "" + +#: lib/applicationeditform.php:232 +msgid "URL for the homepage of the organization" +msgstr "" + +#: lib/applicationeditform.php:238 +msgid "URL to redirect to after authentication" +msgstr "" + +#: lib/applicationeditform.php:260 +msgid "Browser" +msgstr "" + +#: lib/applicationeditform.php:276 +msgid "Desktop" +msgstr "" + +#: lib/applicationeditform.php:277 +msgid "Type of application, browser or desktop" +msgstr "" + +#: lib/applicationeditform.php:299 +msgid "Read-only" +msgstr "" + +#: lib/applicationeditform.php:317 +msgid "Read-write" +msgstr "" + +#: lib/applicationeditform.php:318 +msgid "Default access for this application: read-only, or read-write" +msgstr "" + +#: lib/applicationlist.php:154 +msgid "Revoke" +msgstr "" + #: lib/attachmentlist.php:87 msgid "Attachments" msgstr "" @@ -4122,11 +4436,11 @@ msgstr "" msgid "Tags for this attachment" msgstr "" -#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 +#: lib/authenticationplugin.php:214 lib/authenticationplugin.php:219 msgid "Password changing failed" msgstr "" -#: lib/authenticationplugin.php:197 +#: lib/authenticationplugin.php:229 msgid "Password changing is not allowed" msgstr "" @@ -4148,7 +4462,7 @@ msgstr "" #: lib/command.php:88 #, php-format -msgid "Could not find a user with nickname %s." +msgid "Could not find a user with nickname %s" msgstr "" #: lib/command.php:92 @@ -4157,7 +4471,7 @@ msgstr "" #: lib/command.php:99 #, php-format -msgid "Nudge sent to %s." +msgid "Nudge sent to %s" msgstr "" #: lib/command.php:126 @@ -4168,164 +4482,186 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:399 lib/command.php:460 -msgid "Notice with that id does not exist." +#: lib/command.php:152 lib/command.php:390 lib/command.php:451 +msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:415 lib/command.php:476 -#: lib/command.php:532 -msgid "User has no last notice." +#: lib/command.php:168 lib/command.php:406 lib/command.php:467 +#: lib/command.php:523 +msgid "User has no last notice" msgstr "" #: lib/command.php:190 msgid "Notice marked as fave." msgstr "" -#: lib/command.php:284 -#, php-format -msgid "Could not remove user %1$s to group %2$s." +#: lib/command.php:217 +msgid "You are already a member of that group" msgstr "" -#: lib/command.php:318 +#: lib/command.php:231 +#, php-format +msgid "Could not join user %s to group %s" +msgstr "" + +#: lib/command.php:236 +#, php-format +msgid "%s joined group %s" +msgstr "" + +#: lib/command.php:275 +#, php-format +msgid "Could not remove user %s to group %s" +msgstr "" + +#: lib/command.php:280 +#, php-format +msgid "%s left group %s" +msgstr "" + +#: lib/command.php:309 #, php-format msgid "Fullname: %s" msgstr "" -#: lib/command.php:321 +#: lib/command.php:312 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "" -#: lib/command.php:324 +#: lib/command.php:315 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "" -#: lib/command.php:327 +#: lib/command.php:318 #, php-format msgid "About: %s" msgstr "" -#: lib/command.php:358 +#: lib/command.php:349 #, php-format -msgid "Message too long - maximum is %1$d characters, you sent %2$d." +msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:376 +#: lib/command.php:367 #, php-format -msgid "Direct message to %s sent." +msgid "Direct message to %s sent" msgstr "" -#: lib/command.php:378 +#: lib/command.php:369 msgid "Error sending direct message." msgstr "" -#: lib/command.php:435 -#, php-format -msgid "Notice from %s repeated." +#: lib/command.php:413 +msgid "Cannot repeat your own notice" msgstr "" -#: lib/command.php:437 +#: lib/command.php:418 +msgid "Already repeated that notice" +msgstr "" + +#: lib/command.php:426 +#, php-format +msgid "Notice from %s repeated" +msgstr "" + +#: lib/command.php:428 msgid "Error repeating notice." msgstr "" +#: lib/command.php:482 +#, php-format +msgid "Notice too long - maximum is %d characters, you sent %d" +msgstr "" + #: lib/command.php:491 #, php-format -msgid "Notice too long - maximum is %1$d characters, you sent %2$d." +msgid "Reply to %s sent" msgstr "" -#: lib/command.php:500 -#, php-format -msgid "Reply to %s sent." -msgstr "" - -#: lib/command.php:502 +#: lib/command.php:493 msgid "Error saving notice." msgstr "" -#: lib/command.php:556 -msgid "Specify the name of the user to subscribe to." +#: lib/command.php:547 +msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:563 +#: lib/command.php:554 #, php-format msgid "Subscribed to %s" msgstr "" -#: lib/command.php:584 -msgid "Specify the name of the user to unsubscribe from." +#: lib/command.php:575 +msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:591 +#: lib/command.php:582 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:609 lib/command.php:632 +#: lib/command.php:600 lib/command.php:623 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:612 +#: lib/command.php:603 msgid "Notification off." msgstr "" -#: lib/command.php:614 +#: lib/command.php:605 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:635 +#: lib/command.php:626 msgid "Notification on." msgstr "" -#: lib/command.php:637 +#: lib/command.php:628 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:650 -msgid "Login command is disabled." +#: lib/command.php:641 +msgid "Login command is disabled" msgstr "" -#: lib/command.php:664 +#: lib/command.php:652 #, php-format -msgid "Could not create login token for %s." +msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:669 -#, 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:668 msgid "You are not subscribed to anyone." msgstr "" -#: lib/command.php:687 +#: lib/command.php:670 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:690 msgid "No one is subscribed to you." msgstr "" -#: lib/command.php:709 +#: lib/command.php:692 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:712 msgid "You are not a member of any groups." msgstr "" -#: lib/command.php:731 +#: lib/command.php:714 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:728 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4366,19 +4702,19 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:199 +#: lib/common.php:131 msgid "No configuration file found. " msgstr "" -#: lib/common.php:200 +#: lib/common.php:132 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:201 +#: lib/common.php:134 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:202 +#: lib/common.php:135 msgid "Go to the installer." msgstr "" @@ -4394,6 +4730,14 @@ msgstr "" msgid "Updates by SMS" msgstr "" +#: lib/connectsettingsaction.php:120 +msgid "Connections" +msgstr "" + +#: lib/connectsettingsaction.php:121 +msgid "Authorized connected applications" +msgstr "" + #: lib/dberroraction.php:60 msgid "Database error" msgstr "" @@ -4576,11 +4920,16 @@ msgstr "" msgid "kB" msgstr "" -#: lib/jabber.php:191 +#: lib/jabber.php:202 #, php-format msgid "[%s]" msgstr "" +#: lib/jabber.php:385 +#, php-format +msgid "Unknown inbox source %d." +msgstr "" + #: lib/joinform.php:114 msgid "Join" msgstr "" @@ -4638,21 +4987,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 @@ -4839,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 @@ -4847,7 +5184,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 @@ -4857,7 +5194,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 @@ -4890,15 +5227,17 @@ msgid "Attach a file" msgstr "" #: lib/noticeform.php:212 -msgid "Share my location." -msgstr "" - -#: lib/noticeform.php:214 -msgid "Do not share my location." +msgid "Share my location" msgstr "" #: lib/noticeform.php:215 -msgid "Hide this info" +msgid "Do not share my location" +msgstr "" + +#: lib/noticeform.php:216 +msgid "" +"Sorry, retrieving your geo location is taking longer than expected, please " +"try again later" msgstr "" #: lib/noticelist.php:428 @@ -5158,23 +5497,23 @@ msgstr "" msgid "User has blocked you." msgstr "" -#: lib/subs.php:60 +#: lib/subs.php:63 msgid "Could not subscribe." msgstr "" -#: lib/subs.php:79 +#: lib/subs.php:82 msgid "Could not subscribe other to you." msgstr "" -#: lib/subs.php:128 +#: lib/subs.php:137 msgid "Not subscribed!" msgstr "" -#: lib/subs.php:133 +#: lib/subs.php:142 msgid "Couldn't delete self-subscription." msgstr "" -#: lib/subs.php:146 +#: lib/subs.php:158 msgid "Couldn't delete subscription." msgstr "" @@ -5188,10 +5527,6 @@ msgstr "" msgid "People Tagcloud as tagged" msgstr "" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "" - #: lib/tagcloudsection.php:56 msgid "None" msgstr "" @@ -5252,47 +5587,47 @@ msgstr "" msgid "Moderate" msgstr "" -#: lib/util.php:837 +#: lib/util.php:875 msgid "a few seconds ago" msgstr "" -#: lib/util.php:839 +#: lib/util.php:877 msgid "about a minute ago" msgstr "" -#: lib/util.php:841 +#: lib/util.php:879 #, php-format msgid "about %d minutes ago" msgstr "" -#: lib/util.php:843 +#: lib/util.php:881 msgid "about an hour ago" msgstr "" -#: lib/util.php:845 +#: lib/util.php:883 #, php-format msgid "about %d hours ago" msgstr "" -#: lib/util.php:847 +#: lib/util.php:885 msgid "about a day ago" msgstr "" -#: lib/util.php:849 +#: lib/util.php:887 #, php-format msgid "about %d days ago" msgstr "" -#: lib/util.php:851 +#: lib/util.php:889 msgid "about a month ago" msgstr "" -#: lib/util.php:853 +#: lib/util.php:891 #, php-format msgid "about %d months ago" msgstr "" -#: lib/util.php:855 +#: lib/util.php:893 msgid "about a year ago" msgstr "" @@ -5308,5 +5643,5 @@ msgstr "" #: scripts/xmppdaemon.php:301 #, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po index d6cf172590..8d093bc493 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-10 00:46+0000\n" -"PO-Revision-Date: 2010-01-10 00:49:04+0000\n" +"POT-Creation-Date: 2010-01-15 19:15+0000\n" +"PO-Revision-Date: 2010-01-15 19:18:00+0000\n" "Language-Team: Swedish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60878); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r61101); 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" @@ -34,25 +34,30 @@ msgstr "Ingen sÃ¥dan sida" #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 +#: actions/apistatusesupdate.php:149 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 #: 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 #: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 -#: lib/command.php:163 lib/command.php:311 lib/command.php:364 -#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/command.php:163 lib/command.php:302 lib/command.php:355 +#: lib/command.php:401 lib/command.php:462 lib/command.php:518 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/subs.php:34 lib/subs.php:125 msgid "No such user." msgstr "Ingen sÃ¥dan användare." +#: actions/all.php:84 +#, fuzzy, php-format +msgid "%1$s and friends, page %2$d" +msgstr "%s blockerade profiler, sida %d" + #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 +#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -111,7 +116,7 @@ msgstr "" msgid "You and friends" msgstr "Du och vänner" -#: actions/allrss.php:119 actions/apitimelinefriends.php:122 +#: actions/allrss.php:119 actions/apitimelinefriends.php:121 #: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" @@ -122,6 +127,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:155 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" @@ -135,7 +157,7 @@ msgstr "API-metoden hittades inte" #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:114 +#: actions/apistatusesupdate.php:119 msgid "This method requires a POST." msgstr "Denna metod kräver en POST." @@ -164,8 +186,9 @@ msgstr "Kunde inte spara profil." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257 -#: actions/designadminpanel.php:122 actions/newnotice.php:94 +#: actions/apistatusesupdate.php:132 actions/avatarsettings.php:257 +#: actions/designadminpanel.php:122 actions/editapplication.php:118 +#: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format msgid "" @@ -179,6 +202,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." @@ -219,26 +245,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!" @@ -262,7 +268,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 @@ -270,7 +277,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 @@ -291,7 +299,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 @@ -325,7 +334,8 @@ msgstr "Smeknamnet används redan. Försök med ett annat." msgid "Not a valid nickname." msgstr "Inte ett giltigt smeknamn." -#: actions/apigroupcreate.php:196 actions/editgroup.php:195 +#: actions/apigroupcreate.php:196 actions/editapplication.php:212 +#: actions/editgroup.php:195 actions/newapplication.php:200 #: actions/newgroup.php:139 actions/profilesettings.php:222 #: actions/register.php:217 msgid "Homepage is not a valid URL." @@ -337,7 +347,8 @@ msgstr "Hemsida är inte en giltig URL." msgid "Full name is too long (max 255 chars)." msgstr "Fullständigt namn är för lÃ¥ngt (max 255 tecken)." -#: actions/apigroupcreate.php:213 +#: actions/apigroupcreate.php:213 actions/editapplication.php:187 +#: actions/newapplication.php:169 #, php-format msgid "Description is too long (max %d chars)." msgstr "Beskrivning är för lÃ¥ng (max 140 tecken)" @@ -377,7 +388,7 @@ msgstr "Alias kan inte vara samma som smeknamn." msgid "Group not found!" msgstr "Grupp hittades inte!" -#: actions/apigroupjoin.php:110 lib/command.php:217 +#: 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." @@ -385,7 +396,7 @@ 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 lib/command.php:234 +#: actions/apigroupjoin.php:138 actions/joingroup.php:124 #, fuzzy, php-format msgid "Could not join user %1$s to group %2$s." msgstr "Kunde inte ansluta användare % till grupp %s." @@ -394,7 +405,7 @@ msgstr "Kunde inte ansluta användare % till grupp %s." msgid "You are not a member of this group." msgstr "Du är inte en medlem i denna grupp." -#: actions/apigroupleave.php:124 actions/leavegroup.php:127 +#: actions/apigroupleave.php:124 actions/leavegroup.php:119 #, 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." @@ -414,6 +425,102 @@ msgstr "%s grupper" msgid "groups on %s" msgstr "grupper pÃ¥ %s" +#: actions/apioauthauthorize.php:108 actions/apioauthauthorize.php:114 +msgid "Bad request." +msgstr "" + +#: actions/apioauthauthorize.php:134 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:115 actions/makeadmin.php:66 +#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 +#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:139 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 +#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/subscribe.php:46 actions/tagother.php:166 +#: 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 "Det var ett problem med din sessions-token. Var vänlig försök igen." + +#: actions/apioauthauthorize.php:146 +#, fuzzy +msgid "Invalid nickname / password!" +msgstr "Ogiltigt användarnamn eller lösenord." + +#: actions/apioauthauthorize.php:170 +#, fuzzy +msgid "DB error deleting OAuth app user." +msgstr "Fel uppstog i användarens inställning" + +#: actions/apioauthauthorize.php:196 +#, fuzzy +msgid "DB error inserting OAuth app user." +msgstr "Databasfel vid infogning av hashtag: %s" + +#: actions/apioauthauthorize.php:231 +#, php-format +msgid "" +"The request token %s has been authorized. Please exchange it for an access " +"token." +msgstr "" + +#: actions/apioauthauthorize.php:241 +#, php-format +msgid "The request token %s has been denied." +msgstr "" + +#: actions/apioauthauthorize.php:246 actions/avatarsettings.php:281 +#: actions/designadminpanel.php:103 actions/editapplication.php:139 +#: actions/emailsettings.php:256 actions/grouplogo.php:319 +#: actions/imsettings.php:220 actions/newapplication.php:121 +#: actions/oauthconnectionssettings.php:151 actions/recoverpassword.php:44 +#: actions/smssettings.php:248 lib/designsettings.php:304 +msgid "Unexpected form submission." +msgstr "Oväntat inskick av formulär." + +#: actions/apioauthauthorize.php:273 +msgid "An application would like to connect to your account" +msgstr "" + +#: actions/apioauthauthorize.php:290 +msgid "Allow or deny access" +msgstr "" + +#: actions/apioauthauthorize.php:320 lib/action.php:435 +msgid "Account" +msgstr "Konto" + +#: actions/apioauthauthorize.php:323 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/apioauthauthorize.php:326 actions/login.php:233 +#: actions/register.php:429 lib/accountsettingsaction.php:116 +msgid "Password" +msgstr "Lösenord" + +#: actions/apioauthauthorize.php:338 +#, fuzzy +msgid "Deny" +msgstr "Utseende" + +#: actions/apioauthauthorize.php:344 +#, fuzzy +msgid "Allow" +msgstr "Alla" + +#: actions/apioauthauthorize.php:361 +msgid "Allow or deny access to your account information." +msgstr "" + #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." msgstr "Denna metod kräver en POST eller en DELETE." @@ -427,11 +534,11 @@ msgstr "Du kan inte ta bort en annan användares status." msgid "No such notice." msgstr "Ingen sÃ¥dan notis." -#: actions/apistatusesretweet.php:83 lib/command.php:422 +#: actions/apistatusesretweet.php:83 msgid "Cannot repeat your own notice." msgstr "Kan inte upprepa din egen notis." -#: actions/apistatusesretweet.php:91 lib/command.php:427 +#: actions/apistatusesretweet.php:91 msgid "Already repeated that notice." msgstr "Redan upprepat denna notis." @@ -443,17 +550,17 @@ msgstr "Status borttagen." msgid "No status with that ID found." msgstr "Ingen status med det ID:t hittades." -#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:162 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Det är för lÃ¥ngt. Maximal notisstorlek är %d tecken." -#: actions/apistatusesupdate.php:198 +#: actions/apistatusesupdate.php:203 msgid "Not found" msgstr "Hittades inte" -#: actions/apistatusesupdate.php:221 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:226 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "Maximal notisstorlek är %d tecken, inklusive bilage-URL." @@ -537,8 +644,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." @@ -562,8 +672,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" @@ -595,29 +705,6 @@ 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/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 -#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 -#: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 -#: actions/subscribe.php:46 actions/tagother.php:166 -#: 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 "Det var ett problem med din sessions-token. Var vänlig försök igen." - -#: actions/avatarsettings.php:281 actions/designadminpanel.php:103 -#: actions/emailsettings.php:256 actions/grouplogo.php:319 -#: actions/imsettings.php:220 actions/recoverpassword.php:44 -#: actions/smssettings.php:248 lib/designsettings.php:304 -msgid "Unexpected form submission." -msgstr "Oväntat inskick av formulär." - #: actions/avatarsettings.php:328 msgid "Pick a square area of the image to be your avatar" msgstr "Välj ett kvadratiskt omrÃ¥de i bilden som din avatar" @@ -679,19 +766,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:260 +msgid "No such group." +msgstr "Ingen sÃ¥dan grupp." #: actions/blockedfromgroup.php:90 #, php-format @@ -759,7 +842,8 @@ msgid "Couldn't delete email confirmation." msgstr "Kunde inte ta bort e-postbekräftelse." #: actions/confirmaddress.php:144 -msgid "Confirm Address" +#, fuzzy +msgid "Confirm address" msgstr "Bekräfta adress" #: actions/confirmaddress.php:159 @@ -814,10 +898,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." @@ -951,7 +1031,8 @@ msgstr "Ã…terställ till standardvärde" #: actions/pathsadminpanel.php:324 actions/profilesettings.php:174 #: actions/siteadminpanel.php:388 actions/smssettings.php:181 #: actions/subscriptions.php:203 actions/tagother.php:154 -#: actions/useradminpanel.php:313 lib/designsettings.php:256 +#: actions/useradminpanel.php:313 lib/applicationeditform.php:335 +#: lib/applicationeditform.php:336 lib/designsettings.php:256 #: lib/groupeditform.php:202 msgid "Save" msgstr "Spara" @@ -972,6 +1053,87 @@ msgstr "Lägg till i favoriter" msgid "No such document." msgstr "Inget sÃ¥dant dokument." +#: actions/editapplication.php:54 lib/applicationeditform.php:136 +msgid "Edit application" +msgstr "" + +#: actions/editapplication.php:66 +#, fuzzy +msgid "You must be logged in to edit an application." +msgstr "Du mÃ¥ste vara inloggad för att redigera en grupp." + +#: actions/editapplication.php:77 actions/showapplication.php:94 +#, fuzzy +msgid "You are not the owner of this application." +msgstr "Du är inte en medlem i denna grupp." + +#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:163 +#: actions/showapplication.php:87 +#, fuzzy +msgid "No such application." +msgstr "Ingen sÃ¥dan notis." + +#: actions/editapplication.php:127 actions/newapplication.php:110 +#: actions/showapplication.php:118 lib/action.php:1167 +msgid "There was a problem with your session token." +msgstr "Det var ett problem med din sessions-token." + +#: actions/editapplication.php:161 +#, fuzzy +msgid "Use this form to edit your application." +msgstr "Använd detta formulär för att redigera gruppen." + +#: actions/editapplication.php:177 actions/newapplication.php:159 +#, fuzzy +msgid "Name is required." +msgstr "Samma som lösenordet ovan. MÃ¥ste fyllas i." + +#: actions/editapplication.php:180 actions/newapplication.php:162 +#, fuzzy +msgid "Name is too long (max 255 chars)." +msgstr "Fullständigt namn är för lÃ¥ngt (max 255 tecken)." + +#: actions/editapplication.php:183 actions/newapplication.php:165 +#, fuzzy +msgid "Description is required." +msgstr "Beskrivning" + +#: actions/editapplication.php:191 +msgid "Source URL is too long." +msgstr "" + +#: actions/editapplication.php:197 actions/newapplication.php:182 +#, fuzzy +msgid "Source URL is not valid." +msgstr "Avatar-URL ‘%s’ är inte giltig." + +#: actions/editapplication.php:200 actions/newapplication.php:185 +msgid "Organization is required." +msgstr "" + +#: actions/editapplication.php:203 actions/newapplication.php:188 +#, fuzzy +msgid "Organization is too long (max 255 chars)." +msgstr "Beskrivning av plats är för lÃ¥ng (max 255 tecken)." + +#: actions/editapplication.php:206 actions/newapplication.php:191 +msgid "Organization homepage is required." +msgstr "" + +#: actions/editapplication.php:215 actions/newapplication.php:203 +msgid "Callback is too long." +msgstr "" + +#: actions/editapplication.php:222 actions/newapplication.php:212 +#, fuzzy +msgid "Callback URL is not valid." +msgstr "Avatar-URL ‘%s’ är inte giltig." + +#: actions/editapplication.php:255 +#, fuzzy +msgid "Could not update application." +msgstr "Kunde inte uppdatera grupp." + #: actions/editgroup.php:56 #, php-format msgid "Edit %s group" @@ -983,7 +1145,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 @@ -1008,7 +1171,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 @@ -1040,13 +1204,15 @@ msgstr "" "skräppostkorg!) efter ett meddelande med vidare instruktioner." #: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 +#: actions/smssettings.php:126 lib/applicationeditform.php:333 +#: lib/applicationeditform.php:334 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\"" @@ -1120,9 +1286,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." @@ -1305,13 +1472,6 @@ 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:79 msgid "No such file." msgstr "Ingen sÃ¥dan fil." @@ -1328,7 +1488,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." @@ -1376,9 +1536,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." @@ -1400,12 +1560,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." @@ -1422,6 +1576,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" @@ -1552,7 +1711,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 @@ -1582,7 +1742,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 @@ -1681,7 +1842,7 @@ 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 lib/command.php:315 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -1728,7 +1889,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:234 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236 msgid "Send" msgstr "Skicka" @@ -1772,16 +1933,7 @@ 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 -msgid "You are already a member of that group" -msgstr "Du är redan en medlem i denna grupp" - -#: actions/joingroup.php:128 -#, fuzzy, php-format -msgid "Could not join user %1$s to group %2$s" -msgstr "Kunde inte ansluta användare %s till groupp %s" - -#: actions/joingroup.php:135 lib/command.php:239 +#: actions/joingroup.php:131 #, fuzzy, php-format msgid "%1$s joined group %2$s" msgstr "%s gick med i grupp %s" @@ -1790,68 +1942,49 @@ msgstr "%s gick med i grupp %s" msgid "You must be logged in to leave a group." msgstr "Du mÃ¥ste vara inloggad för att lämna en grupp." -#: actions/leavegroup.php:90 lib/command.php:268 +#: actions/leavegroup.php:90 lib/command.php:265 msgid "You are not a member of that group." msgstr "Du är inte en medlem i den gruppen." -#: actions/leavegroup.php:119 lib/command.php:278 -msgid "Could not find membership record." -msgstr "Kunde inte hitta uppgift om medlemskap." - -#: actions/leavegroup.php:134 lib/command.php:289 +#: actions/leavegroup.php:127 #, 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:460 +#: 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 -#: lib/groupeditform.php:152 lib/userprofile.php:131 -msgid "Nickname" -msgstr "Smeknamn" - -#: actions/login.php:253 actions/register.php:428 -#: 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." @@ -1859,7 +1992,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]" @@ -1879,18 +2012,41 @@ msgstr "%s är redan en administratör för grupp \"%s\"." #: actions/makeadmin.php:132 #, fuzzy, php-format -msgid "Can't get membership record for %1$s in group %2$s" +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 #, fuzzy, php-format -msgid "Can't make %1$s an admin for group %2$s" +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 msgid "No current status" msgstr "Ingen aktuell status" +#: actions/newapplication.php:52 +msgid "New application" +msgstr "" + +#: actions/newapplication.php:64 +#, fuzzy +msgid "You must be logged in to register an application." +msgstr "Du mÃ¥ste vara inloggad för att skapa en grupp." + +#: actions/newapplication.php:143 +#, fuzzy +msgid "Use this form to register a new application." +msgstr "Använd detta formulär för att skapa en ny grupp." + +#: actions/newapplication.php:173 +msgid "Source URL is required." +msgstr "" + +#: actions/newapplication.php:255 actions/newapplication.php:264 +#, fuzzy +msgid "Could not create application." +msgstr "Kunde inte skapa alias." + #: actions/newgroup.php:53 msgid "New group" msgstr "Ny grupp" @@ -1903,12 +2059,12 @@ msgstr "Använd detta formulär för att skapa en ny grupp." msgid "New message" msgstr "Nytt meddelande" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 msgid "You can't send a message to this user." msgstr "Du kan inte skicka ett meddelande till den användaren." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:484 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 +#: lib/command.php:475 msgid "No content!" msgstr "Inget innehÃ¥ll!" @@ -1916,7 +2072,7 @@ msgstr "Inget innehÃ¥ll!" msgid "No recipient specified." msgstr "Ingen mottagare angiven." -#: actions/newmessage.php:164 lib/command.php:370 +#: actions/newmessage.php:164 lib/command.php:361 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -1928,8 +2084,8 @@ msgid "Message sent" msgstr "Meddelande skickat" #: actions/newmessage.php:185 -#, php-format -msgid "Direct message to %s sent" +#, fuzzy, php-format +msgid "Direct message to %s sent." msgstr "Direktmeddelande till %s skickat" #: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 @@ -2005,6 +2161,51 @@ msgstr "Knuff sänd" msgid "Nudge sent!" msgstr "Knuff sänd!" +#: actions/oauthappssettings.php:59 +#, fuzzy +msgid "You must be logged in to list your applications." +msgstr "Du mÃ¥ste vara inloggad för att redigera en grupp." + +#: actions/oauthappssettings.php:74 +#, fuzzy +msgid "OAuth applications" +msgstr "Övriga alternativ" + +#: actions/oauthappssettings.php:85 +msgid "Applications you have registered" +msgstr "" + +#: actions/oauthappssettings.php:135 +#, php-format +msgid "You have not registered any applications yet." +msgstr "" + +#: actions/oauthconnectionssettings.php:71 +msgid "Connected applications" +msgstr "" + +#: actions/oauthconnectionssettings.php:87 +msgid "You have allowed the following applications to access you account." +msgstr "" + +#: actions/oauthconnectionssettings.php:170 +#, fuzzy +msgid "You are not a user of that application." +msgstr "Du är inte en medlem i den gruppen." + +#: actions/oauthconnectionssettings.php:180 +msgid "Unable to revoke access for app: " +msgstr "" + +#: actions/oauthconnectionssettings.php:192 +#, php-format +msgid "You have not authorized any applications to use your account." +msgstr "" + +#: actions/oauthconnectionssettings.php:205 +msgid "Developers can edit the registration settings for their applications " +msgstr "" + #: actions/oembed.php:79 actions/shownotice.php:100 msgid "Notice has no profile" msgstr "Notisen har ingen profil" @@ -2022,8 +2223,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:1038 +#: lib/api.php:1066 lib/api.php:1176 msgid "Not a supported data format." msgstr "Ett dataformat som inte stödjs" @@ -2036,7 +2237,8 @@ msgid "Notice Search" msgstr "Notissökning" #: actions/othersettings.php:60 -msgid "Other Settings" +#, fuzzy +msgid "Other settings" msgstr "Övriga inställningar" #: actions/othersettings.php:71 @@ -2067,6 +2269,31 @@ 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/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 msgid "Outbox for %s" @@ -2101,7 +2328,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" @@ -2263,7 +2490,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 @@ -2325,42 +2553,42 @@ 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 -#: lib/groupeditform.php:161 +#: actions/profilesettings.php:115 actions/register.php:453 +#: lib/applicationeditform.php:230 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\"" @@ -2672,7 +2900,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." @@ -2684,7 +2912,7 @@ msgstr "Ledsen, ogiltig inbjudningskod." msgid "Registration successful" msgstr "Registreringen genomförd" -#: actions/register.php:114 actions/register.php:502 lib/action.php:457 +#: actions/register.php:114 actions/register.php:503 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Registrera" @@ -2697,19 +2925,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. " @@ -2717,44 +2941,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." @@ -2762,7 +2986,7 @@ 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, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -2781,7 +3005,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.)" @@ -2933,6 +3157,85 @@ msgstr "Du kan inte flytta användare till sandlÃ¥dan pÃ¥ denna webbplats." msgid "User is already sandboxed." msgstr "Användare är redan flyttad till sandlÃ¥dan." +#: actions/showapplication.php:82 +#, fuzzy +msgid "You must be logged in to view an application." +msgstr "Du mÃ¥ste vara inloggad för att lämna en grupp." + +#: actions/showapplication.php:158 +#, fuzzy +msgid "Application profile" +msgstr "Notisen har ingen profil" + +#: actions/showapplication.php:160 lib/applicationeditform.php:182 +msgid "Icon" +msgstr "" + +#: actions/showapplication.php:170 actions/version.php:195 +#: lib/applicationeditform.php:197 +#, fuzzy +msgid "Name" +msgstr "Smeknamn" + +#: actions/showapplication.php:179 lib/applicationeditform.php:224 +#, fuzzy +msgid "Organization" +msgstr "Numrering av sidor" + +#: actions/showapplication.php:188 actions/version.php:198 +#: lib/applicationeditform.php:211 lib/groupeditform.php:172 +msgid "Description" +msgstr "Beskrivning" + +#: actions/showapplication.php:193 actions/showgroup.php:429 +#: lib/profileaction.php:174 +msgid "Statistics" +msgstr "Statistik" + +#: actions/showapplication.php:204 +#, php-format +msgid "created by %1$s - %2$s access by default - %3$d users" +msgstr "" + +#: actions/showapplication.php:214 +msgid "Application actions" +msgstr "" + +#: actions/showapplication.php:233 +msgid "Reset key & secret" +msgstr "" + +#: actions/showapplication.php:241 +msgid "Application info" +msgstr "" + +#: actions/showapplication.php:243 +msgid "Consumer key" +msgstr "" + +#: actions/showapplication.php:248 +msgid "Consumer secret" +msgstr "" + +#: actions/showapplication.php:253 +msgid "Request token URL" +msgstr "" + +#: actions/showapplication.php:258 +msgid "Access token URL" +msgstr "" + +#: actions/showapplication.php:263 +#, fuzzy +msgid "Authorize URL" +msgstr "Författare" + +#: actions/showapplication.php:268 +msgid "" +"Note: We support HMAC-SHA1 signatures. We do not support the plaintext " +"signature method." +msgstr "" + #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "Kunde inte hämta favoritnotiser." @@ -3030,7 +3333,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)" @@ -3038,10 +3341,6 @@ msgstr "(Ingen)" msgid "All members" msgstr "Alla medlemmar" -#: actions/showgroup.php:429 lib/profileaction.php:174 -msgid "Statistics" -msgstr "Statistik" - #: actions/showgroup.php:432 msgid "Created" msgstr "Skapad" @@ -3198,12 +3497,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 @@ -3386,7 +3686,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 @@ -3415,7 +3716,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 @@ -3667,10 +3969,6 @@ 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" @@ -3874,10 +4172,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" @@ -3956,11 +4250,6 @@ msgstr "" msgid "Plugins" msgstr "" -#: actions/version.php:195 -#, fuzzy -msgid "Name" -msgstr "Smeknamn" - #: actions/version.php:196 lib/action.php:741 #, fuzzy msgid "Version" @@ -3971,11 +4260,7 @@ msgstr "Sessioner" msgid "Author(s)" msgstr "Författare" -#: actions/version.php:198 lib/groupeditform.php:172 -msgid "Description" -msgstr "Beskrivning" - -#: classes/File.php:137 +#: classes/File.php:144 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " @@ -3984,16 +4269,36 @@ 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/Group_member.php:41 +#, fuzzy +msgid "Group join failed." +msgstr "Grupprofil" + +#: classes/Group_member.php:53 +#, fuzzy +msgid "Not part of group." +msgstr "Kunde inte uppdatera grupp." + +#: classes/Group_member.php:60 +#, fuzzy +msgid "Group leave failed." +msgstr "Grupprofil" + +#: classes/Login_token.php:76 +#, 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." @@ -4006,27 +4311,27 @@ msgstr "Kunde inte infoga meddelande." msgid "Could not update message with new URI." msgstr "Kunde inte uppdatera meddelande med ny URI." -#: classes/Notice.php:172 +#: classes/Notice.php:171 #, php-format msgid "DB error inserting hashtag: %s" msgstr "Databasfel vid infogning av hashtag: %s" -#: classes/Notice.php:226 +#: classes/Notice.php:225 msgid "Problem saving notice. Too long." msgstr "Problem vid sparande av notis. För lÃ¥ngt." -#: classes/Notice.php:230 +#: classes/Notice.php:229 msgid "Problem saving notice. Unknown user." msgstr "Problem vid sparande av notis. Okänd användare." -#: classes/Notice.php:235 +#: classes/Notice.php:234 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "För mÃ¥nga notiser för snabbt; ta en vilopaus och posta igen om ett par " "minuter." -#: classes/Notice.php:241 +#: classes/Notice.php:240 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4034,25 +4339,25 @@ msgstr "" "För mÃ¥nga duplicerade meddelanden för snabbt; ta en vilopaus och posta igen " "om ett par minuter." -#: classes/Notice.php:247 +#: classes/Notice.php:246 msgid "You are banned from posting notices on this site." msgstr "Du är utestängd frÃ¥n att posta notiser pÃ¥ denna webbplats." -#: classes/Notice.php:309 classes/Notice.php:334 +#: classes/Notice.php:305 classes/Notice.php:330 msgid "Problem saving notice." msgstr "Problem med att spara notis." -#: classes/Notice.php:1034 +#: classes/Notice.php:1052 #, php-format msgid "DB error inserting reply: %s" msgstr "Databasfel vid infogning av svar: %s" -#: classes/Notice.php:1359 +#: classes/Notice.php:1423 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" -#: classes/User.php:368 +#: classes/User.php:382 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Välkommen till %1$s, @%2$s!" @@ -4093,6 +4398,11 @@ msgstr "Övrigt" msgid "Other options" msgstr "Övriga alternativ" +#: lib/action.php:144 +#, fuzzy, php-format +msgid "%1$s - %2$s" +msgstr "%1$s (%2$s)" + #: lib/action.php:159 msgid "Untitled page" msgstr "Namnlös sida" @@ -4109,10 +4419,6 @@ msgstr "Hem" msgid "Personal profile and friends timeline" msgstr "Personlig profil och vänners tidslinje" -#: lib/action.php:435 -msgid "Account" -msgstr "Konto" - #: lib/action.php:435 msgid "Change your email, avatar, password, profile" msgstr "Ändra din e-post, avatar, lösenord, profil" @@ -4267,10 +4573,6 @@ msgstr "Senare" msgid "Before" msgstr "Tidigare" -#: lib/action.php:1167 -msgid "There was a problem with your session token." -msgstr "Det var ett problem med din sessions-token." - #: lib/adminpanelaction.php:96 msgid "You cannot make changes to this site." msgstr "Du kan inte göra förändringar av denna webbplats." @@ -4304,6 +4606,72 @@ msgstr "Konfiguration av utseende" msgid "Paths configuration" msgstr "Konfiguration av sökvägar" +#: lib/applicationeditform.php:186 +msgid "Icon for this application" +msgstr "" + +#: lib/applicationeditform.php:206 +#, fuzzy, php-format +msgid "Describe your application in %d characters" +msgstr "Beskriv gruppen eller ämnet med högst %d tecken" + +#: lib/applicationeditform.php:209 +#, fuzzy +msgid "Describe your application" +msgstr "Beskriv gruppen eller ämnet" + +#: lib/applicationeditform.php:218 +#, fuzzy +msgid "Source URL" +msgstr "Källa" + +#: lib/applicationeditform.php:220 +#, fuzzy +msgid "URL of the homepage of this application" +msgstr "URL till gruppen eller ämnets hemsida eller blogg" + +#: lib/applicationeditform.php:226 +msgid "Organization responsible for this application" +msgstr "" + +#: lib/applicationeditform.php:232 +#, fuzzy +msgid "URL for the homepage of the organization" +msgstr "URL till gruppen eller ämnets hemsida eller blogg" + +#: lib/applicationeditform.php:238 +msgid "URL to redirect to after authentication" +msgstr "" + +#: lib/applicationeditform.php:260 +msgid "Browser" +msgstr "" + +#: lib/applicationeditform.php:276 +msgid "Desktop" +msgstr "" + +#: lib/applicationeditform.php:277 +msgid "Type of application, browser or desktop" +msgstr "" + +#: lib/applicationeditform.php:299 +msgid "Read-only" +msgstr "" + +#: lib/applicationeditform.php:317 +msgid "Read-write" +msgstr "" + +#: lib/applicationeditform.php:318 +msgid "Default access for this application: read-only, or read-write" +msgstr "" + +#: lib/applicationlist.php:154 +#, fuzzy +msgid "Revoke" +msgstr "Ta bort" + #: lib/attachmentlist.php:87 msgid "Attachments" msgstr "Bilagor" @@ -4324,11 +4692,11 @@ msgstr "Notiser där denna bilaga förekommer" msgid "Tags for this attachment" msgstr "Taggar för denna billaga" -#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 +#: lib/authenticationplugin.php:214 lib/authenticationplugin.php:219 msgid "Password changing failed" msgstr "Byte av lösenord misslyckades" -#: lib/authenticationplugin.php:197 +#: lib/authenticationplugin.php:229 msgid "Password changing is not allowed" msgstr "Byte av lösenord är inte tillÃ¥tet" @@ -4349,8 +4717,8 @@ msgid "Sorry, this command is not yet implemented." msgstr "Ledsen, detta kommando är inte implementerat än." #: lib/command.php:88 -#, fuzzy, php-format -msgid "Could not find a user with nickname %s." +#, php-format +msgid "Could not find a user with nickname %s" msgstr "Kunde inte hitta en användare med smeknamnet %s" #: lib/command.php:92 @@ -4358,8 +4726,8 @@ msgid "It does not make a lot of sense to nudge yourself!" msgstr "Det verkar inte vara särskilt meningsfullt att knuffa dig själv!" #: lib/command.php:99 -#, fuzzy, php-format -msgid "Nudge sent to %s." +#, php-format +msgid "Nudge sent to %s" msgstr "Knuff skickad till %s" #: lib/command.php:126 @@ -4373,170 +4741,187 @@ msgstr "" "Prenumeranter: %2$s\n" "Notiser: %3$s" -#: lib/command.php:152 lib/command.php:399 lib/command.php:460 -#, fuzzy -msgid "Notice with that id does not exist." +#: lib/command.php:152 lib/command.php:390 lib/command.php:451 +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." +#: lib/command.php:168 lib/command.php:406 lib/command.php:467 +#: lib/command.php:523 +msgid "User has no last notice" msgstr "Användare har ingen sista notis" #: lib/command.php:190 msgid "Notice marked as fave." msgstr "Notis markerad som favorit." -#: lib/command.php:284 -#, fuzzy, php-format -msgid "Could not remove user %1$s to group %2$s." +#: lib/command.php:217 +msgid "You are already a member of that group" +msgstr "Du är redan en medlem i denna grupp" + +#: lib/command.php:231 +#, php-format +msgid "Could not join user %s to group %s" +msgstr "Kunde inte ansluta användare %s till groupp %s" + +#: lib/command.php:236 +#, php-format +msgid "%s joined group %s" +msgstr "%s gick med i grupp %s" + +#: lib/command.php:275 +#, 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:318 +#: lib/command.php:280 +#, php-format +msgid "%s left group %s" +msgstr "%s lämnade grupp %s" + +#: lib/command.php:309 #, php-format msgid "Fullname: %s" msgstr "Fullständigt namn: %s" -#: lib/command.php:321 +#: lib/command.php:312 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "Plats: %s" -#: lib/command.php:324 +#: lib/command.php:315 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "Hemsida: %s" -#: lib/command.php:327 +#: lib/command.php:318 #, php-format msgid "About: %s" msgstr "Om: %s" -#: lib/command.php:358 -#, fuzzy, php-format -msgid "Message too long - maximum is %1$d characters, you sent %2$d." +#: lib/command.php:349 +#, 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." +#: lib/command.php:367 +#, php-format +msgid "Direct message to %s sent" msgstr "Direktmeddelande till %s skickat" -#: lib/command.php:378 +#: lib/command.php:369 msgid "Error sending direct message." msgstr "Fel vid sändning av direktmeddelande." -#: lib/command.php:435 -#, fuzzy, php-format -msgid "Notice from %s repeated." +#: lib/command.php:413 +msgid "Cannot repeat your own notice" +msgstr "Kan inte upprepa din egen notis" + +#: lib/command.php:418 +msgid "Already repeated that notice" +msgstr "Redan upprepat denna notis" + +#: lib/command.php:426 +#, php-format +msgid "Notice from %s repeated" msgstr "Notis fron %s upprepad" -#: lib/command.php:437 +#: lib/command.php:428 msgid "Error repeating notice." msgstr "Fel vid upprepning av notis." -#: lib/command.php:491 -#, fuzzy, php-format -msgid "Notice too long - maximum is %1$d characters, you sent %2$d." +#: lib/command.php:482 +#, 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 -#, fuzzy, php-format -msgid "Reply to %s sent." +#: lib/command.php:491 +#, php-format +msgid "Reply to %s sent" msgstr "Svar pÃ¥ %s skickat" -#: lib/command.php:502 +#: lib/command.php:493 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." +#: lib/command.php:547 +msgid "Specify the name of the user to subscribe to" msgstr "Ange namnet pÃ¥ användaren att prenumerara pÃ¥" -#: lib/command.php:563 +#: lib/command.php:554 #, php-format msgid "Subscribed to %s" msgstr "Prenumerar pÃ¥ %s" -#: lib/command.php:584 -#, fuzzy -msgid "Specify the name of the user to unsubscribe from." +#: lib/command.php:575 +msgid "Specify the name of the user to unsubscribe from" msgstr "Ange namnet pÃ¥ användaren att avsluta prenumeration pÃ¥" -#: lib/command.php:591 +#: lib/command.php:582 #, php-format msgid "Unsubscribed from %s" msgstr "Prenumeration hos %s avslutad" -#: lib/command.php:609 lib/command.php:632 +#: lib/command.php:600 lib/command.php:623 msgid "Command not yet implemented." msgstr "Kommando inte implementerat än." -#: lib/command.php:612 +#: lib/command.php:603 msgid "Notification off." msgstr "Notifikation av." -#: lib/command.php:614 +#: lib/command.php:605 msgid "Can't turn off notification." msgstr "Kan inte sätta pÃ¥ notifikation." -#: lib/command.php:635 +#: lib/command.php:626 msgid "Notification on." msgstr "Notifikation pÃ¥." -#: lib/command.php:637 +#: lib/command.php:628 msgid "Can't turn on notification." msgstr "Kan inte stänga av notifikation." -#: lib/command.php:650 -#, fuzzy -msgid "Login command is disabled." +#: lib/command.php:641 +msgid "Login command is disabled" msgstr "Inloggningskommando är inaktiverat" -#: lib/command.php:664 -#, fuzzy, php-format -msgid "Could not create login token for %s." -msgstr "Kunde inte skapa inloggnings-token för %s" - -#: lib/command.php:669 -#, fuzzy, php-format -msgid "This link is useable only once, and is good for only 2 minutes: %s." +#: lib/command.php:652 +#, 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:668 msgid "You are not subscribed to anyone." msgstr "Du prenumererar inte pÃ¥ nÃ¥gon." -#: lib/command.php:687 +#: lib/command.php:670 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:690 msgid "No one is subscribed to you." msgstr "Ingen prenumerar pÃ¥ dig." -#: lib/command.php:709 +#: lib/command.php:692 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:712 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:714 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:728 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4577,19 +4962,19 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:199 +#: lib/common.php:131 msgid "No configuration file found. " msgstr "Ingen konfigurationsfil hittades. " -#: lib/common.php:200 +#: lib/common.php:132 msgid "I looked for configuration files in the following places: " msgstr "Jag letade efter konfigurationsfiler pÃ¥ följande platser: " -#: lib/common.php:201 +#: lib/common.php:134 msgid "You may wish to run the installer to fix this." msgstr "Du kanske vill köra installeraren för att Ã¥tgärda detta." -#: lib/common.php:202 +#: lib/common.php:135 msgid "Go to the installer." msgstr "GÃ¥ till installeraren." @@ -4605,6 +4990,15 @@ msgstr "Uppdateringar via snabbmeddelande (IM)" msgid "Updates by SMS" msgstr "Uppdateringar via SMS" +#: lib/connectsettingsaction.php:120 +#, fuzzy +msgid "Connections" +msgstr "Anslut" + +#: lib/connectsettingsaction.php:121 +msgid "Authorized connected applications" +msgstr "" + #: lib/dberroraction.php:60 msgid "Database error" msgstr "Databasfel" @@ -4789,11 +5183,16 @@ msgstr "MB" msgid "kB" msgstr "kB" -#: lib/jabber.php:191 +#: lib/jabber.php:202 #, php-format msgid "[%s]" msgstr "[%s]" +#: lib/jabber.php:385 +#, fuzzy, php-format +msgid "Unknown inbox source %d." +msgstr "Okänt sprÃ¥k \"%s\"" + #: lib/joinform.php:114 msgid "Join" msgstr "GÃ¥ med" @@ -4851,21 +5250,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" @@ -5069,7 +5456,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 @@ -5077,7 +5465,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 @@ -5086,8 +5475,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 @@ -5121,16 +5510,18 @@ msgstr "Bifoga en fil" #: lib/noticeform.php:212 #, fuzzy -msgid "Share my location." -msgstr "Dela din plats" - -#: lib/noticeform.php:214 -#, fuzzy -msgid "Do not share my location." +msgid "Share my location" msgstr "Dela din plats" #: lib/noticeform.php:215 -msgid "Hide this info" +#, fuzzy +msgid "Do not share my location" +msgstr "Dela din plats" + +#: lib/noticeform.php:216 +msgid "" +"Sorry, retrieving your geo location is taking longer than expected, please " +"try again later" msgstr "" #: lib/noticelist.php:428 @@ -5391,23 +5782,23 @@ msgstr "Redan prenumerant!" msgid "User has blocked you." msgstr "Användaren har blockerat dig." -#: lib/subs.php:60 +#: lib/subs.php:63 msgid "Could not subscribe." msgstr "Kunde inte prenumerera." -#: lib/subs.php:79 +#: lib/subs.php:82 msgid "Could not subscribe other to you." msgstr "Kunde inte göra andra till prenumeranter hos dig." -#: lib/subs.php:128 +#: lib/subs.php:137 msgid "Not subscribed!" msgstr "Inte prenumerant!" -#: lib/subs.php:133 +#: lib/subs.php:142 msgid "Couldn't delete self-subscription." msgstr "Kunde inte ta bort själv-prenumeration." -#: lib/subs.php:146 +#: lib/subs.php:158 msgid "Couldn't delete subscription." msgstr "Kunde inte ta bort prenumeration." @@ -5421,10 +5812,6 @@ msgstr "" msgid "People Tagcloud as tagged" msgstr "" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(ingen)" - #: lib/tagcloudsection.php:56 msgid "None" msgstr "Ingen" @@ -5485,47 +5872,47 @@ msgstr "Meddelande" msgid "Moderate" msgstr "Moderera" -#: lib/util.php:837 +#: lib/util.php:875 msgid "a few seconds ago" msgstr "ett par sekunder sedan" -#: lib/util.php:839 +#: lib/util.php:877 msgid "about a minute ago" msgstr "för nÃ¥n minut sedan" -#: lib/util.php:841 +#: lib/util.php:879 #, php-format msgid "about %d minutes ago" msgstr "för %d minuter sedan" -#: lib/util.php:843 +#: lib/util.php:881 msgid "about an hour ago" msgstr "för en timma sedan" -#: lib/util.php:845 +#: lib/util.php:883 #, php-format msgid "about %d hours ago" msgstr "för %d timmar sedan" -#: lib/util.php:847 +#: lib/util.php:885 msgid "about a day ago" msgstr "för en dag sedan" -#: lib/util.php:849 +#: lib/util.php:887 #, php-format msgid "about %d days ago" msgstr "för %d dagar sedan" -#: lib/util.php:851 +#: lib/util.php:889 msgid "about a month ago" msgstr "för en mÃ¥nad sedan" -#: lib/util.php:853 +#: lib/util.php:891 #, php-format msgid "about %d months ago" msgstr "för %d mÃ¥nader sedan" -#: lib/util.php:855 +#: lib/util.php:893 msgid "about a year ago" msgstr "för ett Ã¥r sedan" @@ -5540,6 +5927,6 @@ 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/xmppdaemon.php:301 -#, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +#, fuzzy, php-format +msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "Meddelande för lÃ¥ngt - maximum är %d tecken, du skickade %d" diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po index 974f66b386..84b9402c1b 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-10 00:46+0000\n" -"PO-Revision-Date: 2010-01-10 00:49:08+0000\n" +"POT-Creation-Date: 2010-01-15 19:15+0000\n" +"PO-Revision-Date: 2010-01-16 17:53:10+0000\n" "Language-Team: Telugu\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60878); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r61138); 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" @@ -33,25 +33,30 @@ msgstr "à°…à°Ÿà±à°µà°‚à°Ÿà°¿ పేజీ లేదà±" #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 +#: actions/apistatusesupdate.php:149 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 #: 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 #: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 -#: lib/command.php:163 lib/command.php:311 lib/command.php:364 -#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/command.php:163 lib/command.php:302 lib/command.php:355 +#: lib/command.php:401 lib/command.php:462 lib/command.php:518 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/subs.php:34 lib/subs.php:125 msgid "No such user." msgstr "à°…à°Ÿà±à°µà°‚à°Ÿà°¿ వాడà±à°•à°°à°¿ లేరà±." +#: actions/all.php:84 +#, php-format +msgid "%1$s and friends, page %2$d" +msgstr "%1$s మరియౠమితà±à°°à±à°²à±, పేజీ %2$d" + #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 +#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -103,7 +108,7 @@ msgstr "" msgid "You and friends" msgstr "మీరౠమరియౠమీ à°¸à±à°¨à±‡à°¹à°¿à°¤à±à°²à±" -#: actions/allrss.php:119 actions/apitimelinefriends.php:122 +#: actions/allrss.php:119 actions/apitimelinefriends.php:121 #: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" @@ -114,6 +119,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:155 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 "నిరà±à°§à°¾à°°à°£ సంకేతం కనబడలేదà±." @@ -128,7 +150,7 @@ msgstr "నిరà±à°§à°¾à°°à°£ సంకేతం కనబడలేదà±." #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:114 +#: actions/apistatusesupdate.php:119 msgid "This method requires a POST." msgstr "" @@ -159,8 +181,9 @@ msgstr "à°ªà±à°°à±Šà°«à±ˆà°²à±à°¨à°¿ à°­à°¦à±à°°à°ªà°°à°šà°²à±‡à°•à±à°¨à± #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257 -#: actions/designadminpanel.php:122 actions/newnotice.php:94 +#: actions/apistatusesupdate.php:132 actions/avatarsettings.php:257 +#: actions/designadminpanel.php:122 actions/editapplication.php:118 +#: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format msgid "" @@ -172,6 +195,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 "" @@ -213,26 +239,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 "సందేశపౠపాఠà±à°¯à°‚ లేదà±!" @@ -256,16 +262,16 @@ msgid "No status found with that ID." msgstr "" #: 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." @@ -286,8 +292,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." @@ -320,7 +327,8 @@ msgstr "à°† పేరà±à°¨à°¿ ఇపà±à°ªà°Ÿà°¿à°•à±‡ వాడà±à°¤à±à°¨à± msgid "Not a valid nickname." msgstr "సరైన పేరౠకాదà±." -#: actions/apigroupcreate.php:196 actions/editgroup.php:195 +#: actions/apigroupcreate.php:196 actions/editapplication.php:212 +#: actions/editgroup.php:195 actions/newapplication.php:200 #: actions/newgroup.php:139 actions/profilesettings.php:222 #: actions/register.php:217 msgid "Homepage is not a valid URL." @@ -332,7 +340,8 @@ msgstr "హోమౠపేజీ URL సరైనది కాదà±." msgid "Full name is too long (max 255 chars)." msgstr "పూరà±à°¤à°¿ పేరౠచాలా పెదà±à°¦à°—à°¾ ఉంది (à°—à°°à°¿à°·à±à° à°‚à°—à°¾ 255 à°…à°•à±à°·à°°à°¾à°²à±)." -#: actions/apigroupcreate.php:213 +#: actions/apigroupcreate.php:213 actions/editapplication.php:187 +#: actions/newapplication.php:169 #, php-format msgid "Description is too long (max %d chars)." msgstr "వివరణ చాలా పెదà±à°¦à°—à°¾ ఉంది (%d à°…à°•à±à°·à°°à°¾à°²à± à°—à°°à°¿à°·à±à° à°‚)." @@ -372,7 +381,7 @@ msgstr "మారà±à°ªà±‡à°°à± పేరà±à°¤à±‹ సమానంగా ఉం msgid "Group not found!" msgstr "à°—à±à°‚పౠదొరకలేదà±!" -#: actions/apigroupjoin.php:110 lib/command.php:217 +#: actions/apigroupjoin.php:110 actions/joingroup.php:90 msgid "You are already a member of that group." msgstr "మీరౠఇపà±à°ªà°Ÿà°¿à°•à±‡ à°† à°—à±à°‚à°ªà±à°²à±‹ సభà±à°¯à±à°²à±." @@ -380,7 +389,7 @@ msgstr "మీరౠఇపà±à°ªà°Ÿà°¿à°•à±‡ à°† à°—à±à°‚à°ªà±à°²à±‹ సభ msgid "You have been blocked from that group by the admin." msgstr "నిరà±à°µà°¾à°¹à°•à±à°²à± à°† à°—à±à°‚పౠనà±à°‚à°¡à°¿ మిమà±à°®à°²à±à°¨à°¿ నిరోధించారà±." -#: actions/apigroupjoin.php:138 lib/command.php:234 +#: actions/apigroupjoin.php:138 actions/joingroup.php:124 #, fuzzy, php-format msgid "Could not join user %1$s to group %2$s." msgstr "ఓపెనà±à°à°¡à±€ ఫారమà±à°¨à± సృషà±à°Ÿà°¿à°‚చలేకపోయాం: %s" @@ -389,7 +398,7 @@ msgstr "ఓపెనà±à°à°¡à±€ ఫారమà±à°¨à± సృషà±à°Ÿà°¿à°‚à°š msgid "You are not a member of this group." msgstr "మీరౠఈ à°—à±à°‚à°ªà±à°²à±‹ సభà±à°¯à±à°²à± కాదà±." -#: actions/apigroupleave.php:124 actions/leavegroup.php:127 +#: actions/apigroupleave.php:124 actions/leavegroup.php:119 #, fuzzy, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "వాడà±à°•à°°à°¿ %sని %s à°—à±à°‚పౠనà±à°‚à°¡à°¿ తొలగించలేకపోయాం." @@ -409,6 +418,99 @@ msgstr "%s à°—à±à°‚à°ªà±à°²à±" msgid "groups on %s" msgstr "%s పై à°—à±à°‚à°ªà±à°²à±" +#: actions/apioauthauthorize.php:108 actions/apioauthauthorize.php:114 +msgid "Bad request." +msgstr "తపà±à°ªà±à°¡à± à°…à°­à±à°¯à°°à±à°¥à°¨." + +#: actions/apioauthauthorize.php:134 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:115 actions/makeadmin.php:66 +#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 +#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:139 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 +#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/subscribe.php:46 actions/tagother.php:166 +#: 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 "" + +#: actions/apioauthauthorize.php:146 +#, fuzzy +msgid "Invalid nickname / password!" +msgstr "వాడà±à°•à°°à°¿à°ªà±‡à°°à± లేదా సంకేతపదం తపà±à°ªà±." + +#: actions/apioauthauthorize.php:170 +msgid "DB error deleting OAuth app user." +msgstr "" + +#: actions/apioauthauthorize.php:196 +#, fuzzy +msgid "DB error inserting OAuth app user." +msgstr "అవతారానà±à°¨à°¿ పెటà±à°Ÿà°¡à°‚లో పొరపాటà±" + +#: actions/apioauthauthorize.php:231 +#, php-format +msgid "" +"The request token %s has been authorized. Please exchange it for an access " +"token." +msgstr "" + +#: actions/apioauthauthorize.php:241 +#, php-format +msgid "The request token %s has been denied." +msgstr "" + +#: actions/apioauthauthorize.php:246 actions/avatarsettings.php:281 +#: actions/designadminpanel.php:103 actions/editapplication.php:139 +#: actions/emailsettings.php:256 actions/grouplogo.php:319 +#: actions/imsettings.php:220 actions/newapplication.php:121 +#: actions/oauthconnectionssettings.php:151 actions/recoverpassword.php:44 +#: actions/smssettings.php:248 lib/designsettings.php:304 +msgid "Unexpected form submission." +msgstr "" + +#: actions/apioauthauthorize.php:273 +msgid "An application would like to connect to your account" +msgstr "" + +#: actions/apioauthauthorize.php:290 +msgid "Allow or deny access" +msgstr "" + +#: actions/apioauthauthorize.php:320 lib/action.php:435 +msgid "Account" +msgstr "ఖాతా" + +#: actions/apioauthauthorize.php:323 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/apioauthauthorize.php:326 actions/login.php:233 +#: actions/register.php:429 lib/accountsettingsaction.php:116 +msgid "Password" +msgstr "సంకేతపదం" + +#: actions/apioauthauthorize.php:338 +msgid "Deny" +msgstr "తిరసà±à°•à°°à°¿à°‚à°šà±" + +#: actions/apioauthauthorize.php:344 +msgid "Allow" +msgstr "à°…à°¨à±à°®à°¤à°¿à°‚à°šà±" + +#: actions/apioauthauthorize.php:361 +msgid "Allow or deny access to your account information." +msgstr "" + #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." msgstr "" @@ -422,12 +524,12 @@ msgstr "ఇతర వాడà±à°•à°°à±à°² à°¸à±à°¥à°¿à°¤à°¿à°¨à°¿ మీరౠmsgid "No such notice." msgstr "à°…à°Ÿà±à°µà°‚à°Ÿà°¿ సందేశమేమీ లేదà±." -#: actions/apistatusesretweet.php:83 lib/command.php:422 +#: actions/apistatusesretweet.php:83 #, fuzzy msgid "Cannot repeat your own notice." msgstr "à°ˆ లైసెనà±à°¸à±à°•à°¿ అంగీకరించకపోతే మీరౠనమోదà±à°šà±‡à°¸à±à°•à±‹à°²à±‡à°°à±." -#: actions/apistatusesretweet.php:91 lib/command.php:427 +#: actions/apistatusesretweet.php:91 #, fuzzy msgid "Already repeated that notice." msgstr "à°ˆ నోటీసà±à°¨à°¿ తొలగించà±" @@ -440,17 +542,17 @@ msgstr "à°¸à±à°¥à°¿à°¤à°¿à°¨à°¿ తొలగించాం." msgid "No status with that ID found." msgstr "" -#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:162 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "అది చాలా పొడవà±à°‚ది. à°—à°°à°¿à°·à±à°  నోటీసౠపరిమాణం %d à°…à°•à±à°·à°°à°¾à°²à±." -#: actions/apistatusesupdate.php:198 +#: actions/apistatusesupdate.php:203 msgid "Not found" msgstr "దొరకలేదà±" -#: actions/apistatusesupdate.php:221 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:226 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "à°—à°°à°¿à°·à±à°  నోటీసౠపొడవౠ%d à°…à°•à±à°·à°°à°¾à°²à±, జోడింపౠURLని à°•à°²à±à°ªà±à°•à±à°¨à°¿." @@ -512,9 +614,9 @@ msgid "Repeated to %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 @@ -534,8 +636,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 "పేరౠలేదà±." @@ -559,8 +664,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 "" @@ -592,29 +697,6 @@ 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/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 -#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 -#: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 -#: actions/subscribe.php:46 actions/tagother.php:166 -#: 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 "" - -#: actions/avatarsettings.php:281 actions/designadminpanel.php:103 -#: actions/emailsettings.php:256 actions/grouplogo.php:319 -#: actions/imsettings.php:220 actions/recoverpassword.php:44 -#: actions/smssettings.php:248 lib/designsettings.php:304 -msgid "Unexpected form submission." -msgstr "" - #: actions/avatarsettings.php:328 msgid "Pick a square area of the image to be your avatar" msgstr "మీ అవతారానికి గానూ à°ˆ à°šà°¿à°¤à±à°°à°‚ à°¨à±à°‚à°¡à°¿ à°’à°• à°šà°¤à±à°°à°¸à±à°°à°ªà± à°ªà±à°°à°¦à±‡à°¶à°¾à°¨à±à°¨à°¿ à°Žà°‚à°šà±à°•à±‹à°‚à°¡à°¿" @@ -673,20 +755,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:260 +msgid "No such group." +msgstr "à°…à°Ÿà±à°µà°‚à°Ÿà°¿ à°—à±à°‚పౠలేదà±." #: actions/blockedfromgroup.php:90 #, fuzzy, php-format @@ -755,7 +832,7 @@ msgid "Couldn't delete email confirmation." msgstr "ఈమెయిలౠనిరà±à°§à°¾à°°à°£à°¨à°¿ తొలగించలేకà±à°¨à±à°¨à°¾à°‚." #: actions/confirmaddress.php:144 -msgid "Confirm Address" +msgid "Confirm address" msgstr "à°šà°¿à°°à±à°¨à°¾à°®à°¾à°¨à°¿ నిరà±à°§à°¾à°°à°¿à°‚à°šà±" #: actions/confirmaddress.php:159 @@ -808,10 +885,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 "మీరౠవాడà±à°•à°°à±à°²à°¨à°¿ తొలగించలేరà±." @@ -943,7 +1016,8 @@ msgstr "" #: actions/pathsadminpanel.php:324 actions/profilesettings.php:174 #: actions/siteadminpanel.php:388 actions/smssettings.php:181 #: actions/subscriptions.php:203 actions/tagother.php:154 -#: actions/useradminpanel.php:313 lib/designsettings.php:256 +#: actions/useradminpanel.php:313 lib/applicationeditform.php:335 +#: lib/applicationeditform.php:336 lib/designsettings.php:256 #: lib/groupeditform.php:202 msgid "Save" msgstr "à°­à°¦à±à°°à°ªà°°à°šà±" @@ -964,6 +1038,84 @@ msgstr "ఇషà±à°Ÿà°¾à°‚శాలకౠచేరà±à°šà±" msgid "No such document." msgstr "à°…à°Ÿà±à°µà°‚à°Ÿà°¿ పతà±à°°à°®à±‡à°®à±€ లేదà±." +#: actions/editapplication.php:54 lib/applicationeditform.php:136 +msgid "Edit application" +msgstr "" + +#: actions/editapplication.php:66 +#, fuzzy +msgid "You must be logged in to edit an application." +msgstr "à°—à±à°‚à°ªà±à°¨à°¿ మారà±à°šà°¡à°¾à°¨à°¿à°•à°¿ మీరౠపà±à°°à°µà±‡à°¶à°¿à°‚à°šà°¿ ఉండాలి." + +#: actions/editapplication.php:77 actions/showapplication.php:94 +#, fuzzy +msgid "You are not the owner of this application." +msgstr "మీరౠఈ à°—à±à°‚à°ªà±à°²à±‹ సభà±à°¯à±à°²à± కాదà±." + +#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:163 +#: actions/showapplication.php:87 +#, fuzzy +msgid "No such application." +msgstr "à°…à°Ÿà±à°µà°‚à°Ÿà°¿ సందేశమేమీ లేదà±." + +#: actions/editapplication.php:127 actions/newapplication.php:110 +#: actions/showapplication.php:118 lib/action.php:1167 +msgid "There was a problem with your session token." +msgstr "" + +#: actions/editapplication.php:161 +#, fuzzy +msgid "Use this form to edit your application." +msgstr "à°—à±à°‚à°ªà±à°¨à°¿ మారà±à°šà°¡à°¾à°¨à°¿à°•à°¿ à°ˆ ఫారానà±à°¨à°¿ ఉపయోగించండి." + +#: actions/editapplication.php:177 actions/newapplication.php:159 +#, fuzzy +msgid "Name is required." +msgstr "పై సంకేతపదం మరోసారి. తపà±à°ªà°¨à°¿à°¸à°°à°¿." + +#: actions/editapplication.php:180 actions/newapplication.php:162 +msgid "Name is too long (max 255 chars)." +msgstr "పేరౠచాలా పెదà±à°¦à°—à°¾ ఉంది (à°—à°°à°¿à°·à±à° à°‚à°—à°¾ 255 à°…à°•à±à°·à°°à°¾à°²à±)." + +#: actions/editapplication.php:183 actions/newapplication.php:165 +msgid "Description is required." +msgstr "వివరణ తపà±à°ªà°¨à°¿à°¸à°°à°¿." + +#: actions/editapplication.php:191 +msgid "Source URL is too long." +msgstr "" + +#: actions/editapplication.php:197 actions/newapplication.php:182 +#, fuzzy +msgid "Source URL is not valid." +msgstr "హోమౠపేజీ URL సరైనది కాదà±." + +#: actions/editapplication.php:200 actions/newapplication.php:185 +msgid "Organization is required." +msgstr "సంసà±à°¥ తపà±à°ªà°¨à°¿à°¸à°°à°¿." + +#: actions/editapplication.php:203 actions/newapplication.php:188 +#, fuzzy +msgid "Organization is too long (max 255 chars)." +msgstr "à°ªà±à°°à°¾à°‚తం పేరౠమరీ పెదà±à°¦à°—à°¾ ఉంది (255 à°…à°•à±à°·à°°à°¾à°²à± à°—à°°à°¿à°·à±à° à°‚)." + +#: actions/editapplication.php:206 actions/newapplication.php:191 +msgid "Organization homepage is required." +msgstr "" + +#: actions/editapplication.php:215 actions/newapplication.php:203 +msgid "Callback is too long." +msgstr "" + +#: actions/editapplication.php:222 actions/newapplication.php:212 +msgid "Callback URL is not valid." +msgstr "" + +#: actions/editapplication.php:255 +#, fuzzy +msgid "Could not update application." +msgstr "à°—à±à°‚à°ªà±à°¨à°¿ తాజాకరించలేకà±à°¨à±à°¨à°¾à°‚." + #: actions/editgroup.php:56 #, php-format msgid "Edit %s group" @@ -975,7 +1127,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 @@ -1000,7 +1152,7 @@ msgid "Options saved." msgstr "ఎంపికలౠభదà±à°°à°®à°¯à±à°¯à°¾à°¯à°¿." #: actions/emailsettings.php:60 -msgid "Email Settings" +msgid "Email settings" msgstr "ఈమెయిలౠఅమరికలà±" #: actions/emailsettings.php:71 @@ -1030,13 +1182,14 @@ msgid "" msgstr "" #: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 +#: actions/smssettings.php:126 lib/applicationeditform.php:333 +#: lib/applicationeditform.php:334 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\"" @@ -1109,9 +1262,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." @@ -1286,13 +1440,6 @@ 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:79 msgid "No such file." msgstr "à°…à°Ÿà±à°µà°‚à°Ÿà°¿ ఫైలౠలేదà±." @@ -1309,7 +1456,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 "" @@ -1354,9 +1501,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." @@ -1377,12 +1525,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." @@ -1398,6 +1540,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 "à°šà°¿à°¹à±à°¨à°‚à°—à°¾ ఉండాలà±à°¸à°¿à°¨ à°šà°¤à±à°°à°¸à±à°¤à±à°° à°ªà±à°°à°¦à±‡à°¶à°¾à°¨à±à°¨à°¿ బొమà±à°® à°¨à±à°‚à°¡à°¿ à°Žà°‚à°šà±à°•à±‹à°‚à°¡à°¿." @@ -1519,7 +1666,7 @@ msgid "Error removing the block." msgstr "నిరోధానà±à°¨à°¿ తొలగించడంలో పొరపాటà±." #: actions/imsettings.php:59 -msgid "IM Settings" +msgid "IM settings" msgstr "IM అమరికలà±" #: actions/imsettings.php:70 @@ -1545,7 +1692,7 @@ msgid "" msgstr "" #: actions/imsettings.php:124 -msgid "IM Address" +msgid "IM address" msgstr "IM à°šà°¿à°°à±à°¨à°¾à°®à°¾" #: actions/imsettings.php:126 @@ -1637,7 +1784,7 @@ msgstr "కొతà±à°¤ వాడà±à°•à°°à±à°²à°¨à°¿ ఆహà±à°µà°¾à°¨à°¿à°‚ msgid "You are already subscribed to these users:" msgstr "మీరౠఇపà±à°ªà°Ÿà°¿à°•à±‡ à°ˆ వాడà±à°•à°°à±à°²à°•à± చందాచేరి ఉనà±à°¨à°¾à°°à±:" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:315 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -1678,7 +1825,7 @@ msgstr "à°µà±à°¯à°•à±à°¤à°¿à°—à°¤ సందేశం" msgid "Optionally add a personal message to the invitation." msgstr "à°à°šà±à°›à°¿à°•à°‚à°—à°¾ ఆహà±à°µà°¾à°¨à°¾à°¨à°¿à°•à°¿ à°µà±à°¯à°•à±à°¤à°¿à°—à°¤ సందేశం చేరà±à°šà°‚à°¡à°¿." -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236 msgid "Send" msgstr "పంపించà±" @@ -1722,94 +1869,65 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "à°—à±à°‚à°ªà±à°²à±à°²à±‹ చేరడానికి మీరౠపà±à°°à°µà±‡à°¶à°¿à°‚à°šà°¿ ఉండాలి." -#: actions/joingroup.php:90 -msgid "You are already a member of that group" -msgstr "మీరౠఇపà±à°ªà°Ÿà°¿à°•à±‡ à°† à°—à±à°‚à°ªà±à°²à±‹ సభà±à°¯à±à°²à±" - -#: actions/joingroup.php:128 -#, fuzzy, php-format -msgid "Could not join user %1$s to group %2$s" -msgstr "వాడà±à°•à°°à°¿ %sని %s à°—à±à°‚à°ªà±à°²à±‹ చేరà±à°šà°²à±‡à°•à°ªà±‹à°¯à°¾à°‚" - -#: actions/joingroup.php:135 lib/command.php:239 -#, fuzzy, php-format +#: actions/joingroup.php:131 +#, php-format msgid "%1$s joined group %2$s" -msgstr "%s %s à°—à±à°‚à°ªà±à°²à±‹ చేరారà±" +msgstr "%1$s %2$s à°—à±à°‚à°ªà±à°²à±‹ చేరారà±" #: actions/leavegroup.php:60 msgid "You must be logged in to leave a group." msgstr "à°—à±à°‚à°ªà±à°¨à°¿ వదిలివెళà±à°³à°¡à°¾à°¨à°¿à°•à°¿ మీరౠపà±à°°à°µà±‡à°¶à°¿à°‚à°šà°¿ ఉండాలి." -#: actions/leavegroup.php:90 lib/command.php:268 +#: actions/leavegroup.php:90 lib/command.php:265 msgid "You are not a member of that group." msgstr "మీరౠఆ à°—à±à°‚à°ªà±à°²à±‹ సభà±à°¯à±à°²à± కాదà±." -#: actions/leavegroup.php:119 lib/command.php:278 -msgid "Could not find membership record." -msgstr "" - -#: actions/leavegroup.php:134 lib/command.php:289 -#, fuzzy, php-format +#: actions/leavegroup.php:127 +#, 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:460 +#: 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 -#: lib/groupeditform.php:152 lib/userprofile.php:131 -msgid "Nickname" -msgstr "పేరà±" - -#: actions/login.php:253 actions/register.php:428 -#: 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,24 +1941,47 @@ msgid "Only an admin can make another user an admin." msgstr "నిరà±à°µà°¾à°¹à°•à±à°²à± మాతà±à°°à°®à±‡ మరొక వాడà±à°•à°°à°¿à°¨à°¿ నిరà±à°µà°¾à°¹à°•à±à°¨à°¿à°—à°¾ చేయగలరà±." #: actions/makeadmin.php:95 -#, fuzzy, php-format +#, php-format msgid "%1$s is already an admin for group \"%2$s\"." -msgstr "%s ఇపà±à°ªà°Ÿà°¿à°•à±‡ \"%s\" à°—à±à°‚పౠయొకà±à°• à°’à°• నిరà±à°µà°¾à°•à±à°²à±." +msgstr "%1$s ఇపà±à°ªà°Ÿà°¿à°•à±‡ \"%2$s\" à°—à±à°‚పౠయొకà±à°• à°’à°• నిరà±à°µà°¾à°•à±à°²à±." #: actions/makeadmin.php:132 -#, php-format -msgid "Can't get membership record for %1$s in group %2$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 #, fuzzy, php-format -msgid "Can't make %1$s an admin for group %2$s" +msgid "Can't make %1$s an admin for group %2$s." msgstr "%s ఇపà±à°ªà°Ÿà°¿à°•à±‡ \"%s\" à°—à±à°‚పౠయొకà±à°• à°’à°• నిరà±à°µà°¾à°•à±à°²à±." #: actions/microsummary.php:69 msgid "No current status" msgstr "à°ªà±à°°à°¸à±à°¤à±à°¤ à°¸à±à°¥à°¿à°¤à°¿ à°à°®à±€ లేదà±" +#: actions/newapplication.php:52 +msgid "New application" +msgstr "" + +#: actions/newapplication.php:64 +#, fuzzy +msgid "You must be logged in to register an application." +msgstr "à°—à±à°‚à°ªà±à°¨à°¿ సృషà±à°Ÿà°¿à°‚చడానికి మీరౠలోనికి à°ªà±à°°à°µà±‡à°¶à°¿à°‚చాలి." + +#: actions/newapplication.php:143 +#, fuzzy +msgid "Use this form to register a new application." +msgstr "కొతà±à°¤ à°—à±à°‚à°ªà±à°¨à°¿ సృషà±à°Ÿà°¿à°‚డానికి à°ˆ ఫారానà±à°¨à°¿ ఉపయోగించండి." + +#: actions/newapplication.php:173 +msgid "Source URL is required." +msgstr "" + +#: actions/newapplication.php:255 actions/newapplication.php:264 +#, fuzzy +msgid "Could not create application." +msgstr "మారà±à°ªà±‡à°°à±à°²à°¨à°¿ సృషà±à°Ÿà°¿à°‚చలేకపోయాం." + #: actions/newgroup.php:53 msgid "New group" msgstr "కొతà±à°¤ à°—à±à°‚à°ªà±" @@ -1853,12 +1994,12 @@ msgstr "కొతà±à°¤ à°—à±à°‚à°ªà±à°¨à°¿ సృషà±à°Ÿà°¿à°‚డాని msgid "New message" msgstr "కొతà±à°¤ సందేశం" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 msgid "You can't send a message to this user." msgstr "à°ˆ వాడà±à°•à°°à°¿à°•à°¿ మీరౠసందేశానà±à°¨à°¿ పంపించలేరà±." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:484 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 +#: lib/command.php:475 msgid "No content!" msgstr "విషయం లేదà±!" @@ -1866,7 +2007,7 @@ msgstr "విషయం లేదà±!" msgid "No recipient specified." msgstr "" -#: actions/newmessage.php:164 lib/command.php:370 +#: actions/newmessage.php:164 lib/command.php:361 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "మీకౠమీరే సందేశానà±à°¨à°¿ పంపà±à°•à±‹à°•à°‚à°¡à°¿; దాని బదà±à°²à± మీలో మీరే మెలà±à°²à°—à°¾ చెపà±à°ªà±à°•à±‹à°‚à°¡à°¿." @@ -1876,8 +2017,8 @@ msgid "Message sent" msgstr "సందేశానà±à°¨à°¿ పంపించాం" #: actions/newmessage.php:185 -#, php-format -msgid "Direct message to %s sent" +#, fuzzy, php-format +msgid "Direct message to %s sent." msgstr "%sà°•à°¿ నేరౠసందేశానà±à°¨à°¿ పంపించాం" #: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 @@ -1948,6 +2089,51 @@ msgstr "" msgid "Nudge sent!" msgstr "" +#: actions/oauthappssettings.php:59 +#, fuzzy +msgid "You must be logged in to list your applications." +msgstr "à°—à±à°‚à°ªà±à°¨à°¿ మారà±à°šà°¡à°¾à°¨à°¿à°•à°¿ మీరౠపà±à°°à°µà±‡à°¶à°¿à°‚à°šà°¿ ఉండాలి." + +#: actions/oauthappssettings.php:74 +#, fuzzy +msgid "OAuth applications" +msgstr "ఇతర ఎంపికలà±" + +#: actions/oauthappssettings.php:85 +msgid "Applications you have registered" +msgstr "" + +#: actions/oauthappssettings.php:135 +#, php-format +msgid "You have not registered any applications yet." +msgstr "" + +#: actions/oauthconnectionssettings.php:71 +msgid "Connected applications" +msgstr "" + +#: actions/oauthconnectionssettings.php:87 +msgid "You have allowed the following applications to access you account." +msgstr "" + +#: actions/oauthconnectionssettings.php:170 +#, fuzzy +msgid "You are not a user of that application." +msgstr "మీరౠఆ à°—à±à°‚à°ªà±à°²à±‹ సభà±à°¯à±à°²à± కాదà±." + +#: actions/oauthconnectionssettings.php:180 +msgid "Unable to revoke access for app: " +msgstr "" + +#: actions/oauthconnectionssettings.php:192 +#, php-format +msgid "You have not authorized any applications to use your account." +msgstr "" + +#: actions/oauthconnectionssettings.php:205 +msgid "Developers can edit the registration settings for their applications " +msgstr "" + #: actions/oembed.php:79 actions/shownotice.php:100 msgid "Notice has no profile" msgstr "" @@ -1965,8 +2151,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:1038 +#: lib/api.php:1066 lib/api.php:1176 msgid "Not a supported data format." msgstr "" @@ -1979,7 +2165,7 @@ msgid "Notice Search" msgstr "నోటీసà±à°² à°…à°¨à±à°µà±‡à°·à°£" #: actions/othersettings.php:60 -msgid "Other Settings" +msgid "Other settings" msgstr "ఇతర అమరికలà±" #: actions/othersettings.php:71 @@ -2011,6 +2197,30 @@ msgstr "" msgid "URL shortening service is too long (max 50 chars)." msgstr "URL à°•à±à°¦à°¿à°‚పౠసేవ మరీ పెదà±à°¦à°—à°¾ ఉంది (50 à°…à°•à±à°·à°°à°¾à°²à± à°—à°°à°¿à°·à±à° à°‚)." +#: 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" @@ -2045,7 +2255,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 "నిరà±à°¥à°¾à°°à°¿à°‚à°šà±" @@ -2141,7 +2351,7 @@ msgstr "అలంకారం" #: actions/pathsadminpanel.php:237 msgid "Theme server" -msgstr "" +msgstr "అలంకారాల సేవకి" #: actions/pathsadminpanel.php:241 msgid "Theme path" @@ -2156,9 +2366,8 @@ msgid "Avatars" msgstr "అవతారాలà±" #: actions/pathsadminpanel.php:257 -#, fuzzy msgid "Avatar server" -msgstr "అవతారపౠఅమరికలà±" +msgstr "అవతారాల సేవకి" #: actions/pathsadminpanel.php:261 #, fuzzy @@ -2174,9 +2383,8 @@ msgid "Backgrounds" msgstr "నేపథà±à°¯à°¾à°²à±" #: actions/pathsadminpanel.php:278 -#, fuzzy msgid "Background server" -msgstr "నేపథà±à°¯à°‚" +msgstr "నేపథà±à°¯à°¾à°² సేవకి" #: actions/pathsadminpanel.php:282 #, fuzzy @@ -2213,8 +2421,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" @@ -2276,42 +2485,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 -#: lib/groupeditform.php:161 +#: actions/profilesettings.php:115 actions/register.php:453 +#: lib/applicationeditform.php:230 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 "మీరౠఎకà±à°•à°¡ à°¨à±à°‚à°¡à°¿, \"నగరం, రాషà±à°Ÿà±à°°à°‚ (లేదా à°ªà±à°°à°¾à°‚తం), దేశం\"" @@ -2556,7 +2765,7 @@ msgstr "" #: actions/recoverpassword.php:213 msgid "Unknown action" -msgstr "" +msgstr "తెలియని à°šà°°à±à°¯" #: actions/recoverpassword.php:236 msgid "6 or more characters, and don't forget it!" @@ -2608,7 +2817,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 "à°•à±à°·à°®à°¿à°‚à°šà°‚à°¡à°¿, ఆహà±à°µà°¾à°¨à°¿à°¤à±à°²à± మాతà±à°°à°®à±‡ నమోదà±à°•à°¾à°—లరà±." @@ -2620,77 +2829,73 @@ msgstr "à°•à±à°·à°®à°¿à°‚à°šà°‚à°¡à°¿, తపà±à°ªà± ఆహà±à°µà°¾à°¨ à°¸ msgid "Registration successful" msgstr "నమోదౠవిజయవంతం" -#: actions/register.php:114 actions/register.php:502 lib/action.php:457 +#: 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 "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, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -2709,7 +2914,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.)" @@ -2855,6 +3060,82 @@ msgstr "మీరౠఇపà±à°ªà°Ÿà°¿à°•à±‡ లోనికి à°ªà±à°°à°µà±‡ msgid "User is already sandboxed." msgstr "వాడà±à°•à°°à°¿à°¨à°¿ ఇపà±à°ªà°Ÿà°¿à°•à±‡ à°—à±à°‚à°ªà±à°¨à±à°‚à°¡à°¿ నిరోధించారà±." +#: actions/showapplication.php:82 +#, fuzzy +msgid "You must be logged in to view an application." +msgstr "à°—à±à°‚à°ªà±à°¨à°¿ వదిలివెళà±à°³à°¡à°¾à°¨à°¿à°•à°¿ మీరౠపà±à°°à°µà±‡à°¶à°¿à°‚à°šà°¿ ఉండాలి." + +#: actions/showapplication.php:158 +msgid "Application profile" +msgstr "" + +#: actions/showapplication.php:160 lib/applicationeditform.php:182 +msgid "Icon" +msgstr "à°ªà±à°°à°¤à±€à°•à°‚" + +#: actions/showapplication.php:170 actions/version.php:195 +#: lib/applicationeditform.php:197 +msgid "Name" +msgstr "పేరà±" + +#: actions/showapplication.php:179 lib/applicationeditform.php:224 +msgid "Organization" +msgstr "సంసà±à°§" + +#: actions/showapplication.php:188 actions/version.php:198 +#: lib/applicationeditform.php:211 lib/groupeditform.php:172 +msgid "Description" +msgstr "వివరణ" + +#: actions/showapplication.php:193 actions/showgroup.php:429 +#: lib/profileaction.php:174 +msgid "Statistics" +msgstr "గణాంకాలà±" + +#: actions/showapplication.php:204 +#, php-format +msgid "created by %1$s - %2$s access by default - %3$d users" +msgstr "" + +#: actions/showapplication.php:214 +msgid "Application actions" +msgstr "" + +#: actions/showapplication.php:233 +msgid "Reset key & secret" +msgstr "" + +#: actions/showapplication.php:241 +msgid "Application info" +msgstr "" + +#: actions/showapplication.php:243 +msgid "Consumer key" +msgstr "" + +#: actions/showapplication.php:248 +msgid "Consumer secret" +msgstr "" + +#: actions/showapplication.php:253 +msgid "Request token URL" +msgstr "" + +#: actions/showapplication.php:258 +msgid "Access token URL" +msgstr "" + +#: actions/showapplication.php:263 +#, fuzzy +msgid "Authorize URL" +msgstr "రచయిత" + +#: actions/showapplication.php:268 +msgid "" +"Note: We support HMAC-SHA1 signatures. We do not support the plaintext " +"signature method." +msgstr "" + #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "" @@ -2952,7 +3233,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 "(à°à°®à±€à°²à±‡à°¦à±)" @@ -2960,10 +3241,6 @@ msgstr "(à°à°®à±€à°²à±‡à°¦à±)" msgid "All members" msgstr "అందరౠసభà±à°¯à±à°²à±‚" -#: actions/showgroup.php:429 lib/profileaction.php:174 -msgid "Statistics" -msgstr "గణాంకాలà±" - #: actions/showgroup.php:432 msgid "Created" msgstr "సృషà±à°Ÿà°¿à°¤à°‚" @@ -3098,16 +3375,16 @@ msgstr "" #: actions/siteadminpanel.php:146 msgid "Site name must have non-zero length." -msgstr "" +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." @@ -3163,22 +3440,20 @@ msgid "Contact email address for your site" msgstr "à°ˆ వాడà±à°•à°°à°¿à°•à±ˆ నమోదైన ఈమెయిలౠచిరà±à°¨à°¾à°®à°¾à°²à± à°à°®à±€ లేవà±." #: actions/siteadminpanel.php:277 -#, fuzzy msgid "Local" -msgstr "à°ªà±à°°à°¾à°‚తం" +msgstr "à°¸à±à°¥à°¾à°¨à°¿à°•" #: actions/siteadminpanel.php:288 msgid "Default timezone" -msgstr "" +msgstr "à°…à°ªà±à°°à°®à±‡à°¯ కాలమండలం" #: actions/siteadminpanel.php:289 msgid "Default timezone for the site; usually UTC." msgstr "" #: actions/siteadminpanel.php:295 -#, fuzzy msgid "Default site language" -msgstr "à°ªà±à°°à°¾à°¥à°¾à°¨à±à°¯à°¤à°¾ భాష" +msgstr "à°…à°ªà±à°°à°®à±‡à°¯ సైటౠభాష" #: actions/siteadminpanel.php:303 msgid "URLs" @@ -3229,7 +3504,7 @@ msgstr "à°…à°Ÿà±à°µà°‚à°Ÿà°¿ వాడà±à°•à°°à°¿ లేరà±." #: actions/siteadminpanel.php:335 msgid "Disable new registrations." -msgstr "" +msgstr "కొతà±à°¤ నమోదà±à°²à°¨à± అచేతనంచేయి." #: actions/siteadminpanel.php:341 msgid "Snapshots" @@ -3292,7 +3567,7 @@ msgid "Save site settings" msgstr "సైటౠఅమరికలనౠభదà±à°°à°ªà°°à°šà±" #: actions/smssettings.php:58 -msgid "SMS Settings" +msgid "SMS settings" msgstr "SMS అమరికలà±" #: actions/smssettings.php:69 @@ -3322,7 +3597,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 @@ -3337,7 +3612,7 @@ msgstr "" #: actions/smssettings.php:306 msgid "No phone number." -msgstr "" +msgstr "ఫోనౠనెంబరౠలేదà±." #: actions/smssettings.php:311 msgid "No carrier selected." @@ -3345,7 +3620,7 @@ 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." @@ -3564,10 +3839,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" @@ -3608,11 +3879,11 @@ 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" @@ -3762,11 +4033,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 "à°«à±à°°à±Šà°«à±ˆà°²à± రూపà±à°°à±‡à°–à°²à±" @@ -3796,9 +4062,9 @@ msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "[à°—à±à°‚à°ªà±à°²à°¨à°¿ వెతికి](%%action.groupsearch%%) వాటిలో చేరడానికి à°ªà±à°°à°¯à°¤à±à°¨à°¿à°‚à°šà°‚à°¡à°¿." #: actions/version.php:73 -#, fuzzy, php-format +#, php-format msgid "StatusNet %s" -msgstr "గణాంకాలà±" +msgstr "à°¸à±à°Ÿà±‡à°Ÿà°¸à±â€Œà°¨à±†à°Ÿà± %s" #: actions/version.php:153 #, php-format @@ -3808,9 +4074,8 @@ msgid "" msgstr "" #: actions/version.php:157 -#, fuzzy msgid "StatusNet" -msgstr "à°¸à±à°¥à°¿à°¤à°¿à°¨à°¿ తొలగించాం." +msgstr "à°¸à±à°Ÿà±‡à°Ÿà°¸à±â€Œà°¨à±†à°Ÿà±" #: actions/version.php:161 msgid "Contributors" @@ -3843,42 +4108,49 @@ msgstr "" msgid "Plugins" msgstr "" -#: actions/version.php:195 -#, fuzzy -msgid "Name" -msgstr "పేరà±" - #: actions/version.php:196 lib/action.php:741 -#, fuzzy msgid "Version" -msgstr "à°µà±à°¯à°•à±à°¤à°¿à°—à°¤" +msgstr "సంచిక" #: actions/version.php:197 -#, fuzzy msgid "Author(s)" -msgstr "రచయిత" +msgstr "రచయిత(à°²à±)" -#: actions/version.php:198 lib/groupeditform.php:172 -msgid "Description" -msgstr "వివరణ" - -#: classes/File.php:137 +#: 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/Group_member.php:41 +msgid "Group join failed." +msgstr "à°—à±à°‚à°ªà±à°²à±‹ చేరడం విఫలమైంది." + +#: classes/Group_member.php:53 +#, fuzzy +msgid "Not part of group." +msgstr "à°—à±à°‚à°ªà±à°¨à°¿ తాజాకరించలేకà±à°¨à±à°¨à°¾à°‚." + +#: classes/Group_member.php:60 +msgid "Group leave failed." +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 "నేరà±à°—à°¾ సందేశాలౠపంపడం à°¨à±à°‚à°¡à°¿ మిమà±à°®à°²à±à°¨à°¿ నిషేధించారà±." @@ -3891,51 +4163,51 @@ msgstr "" msgid "Could not update message with new URI." msgstr "" -#: classes/Notice.php:172 +#: classes/Notice.php:171 #, php-format msgid "DB error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:226 +#: classes/Notice.php:225 #, fuzzy msgid "Problem saving notice. Too long." msgstr "సందేశానà±à°¨à°¿ à°­à°¦à±à°°à°ªà°°à°šà°¡à°‚లో పొరపాటà±." -#: classes/Notice.php:230 +#: classes/Notice.php:229 #, fuzzy msgid "Problem saving notice. Unknown user." msgstr "సందేశానà±à°¨à°¿ à°­à°¦à±à°°à°ªà°°à°šà°¡à°‚లో పొరపాటà±." -#: classes/Notice.php:235 +#: classes/Notice.php:234 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:241 +#: classes/Notice.php:240 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:247 +#: classes/Notice.php:246 msgid "You are banned from posting notices on this site." msgstr "à°ˆ సైటà±à°²à±‹ నోటీసà±à°²à± రాయడం à°¨à±à°‚à°¡à°¿ మిమà±à°®à°²à±à°¨à°¿ నిషేధించారà±." -#: classes/Notice.php:309 classes/Notice.php:334 +#: classes/Notice.php:305 classes/Notice.php:330 msgid "Problem saving notice." msgstr "సందేశానà±à°¨à°¿ à°­à°¦à±à°°à°ªà°°à°šà°¡à°‚లో పొరపాటà±." -#: classes/Notice.php:1034 +#: classes/Notice.php:1052 #, php-format msgid "DB error inserting reply: %s" msgstr "" -#: classes/Notice.php:1359 +#: classes/Notice.php:1423 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" -#: classes/User.php:368 +#: classes/User.php:382 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "@%2$s, %1$sà°•à°¿ à°¸à±à°µà°¾à°—తం!" @@ -3978,6 +4250,11 @@ msgstr "ఇతర" msgid "Other options" msgstr "ఇతర ఎంపికలà±" +#: lib/action.php:144 +#, php-format +msgid "%1$s - %2$s" +msgstr "%1$s - %2$s" + #: lib/action.php:159 msgid "Untitled page" msgstr "" @@ -3994,10 +4271,6 @@ msgstr "à°®à±à°‚గిలి" msgid "Personal profile and friends timeline" msgstr "" -#: lib/action.php:435 -msgid "Account" -msgstr "ఖాతా" - #: lib/action.php:435 msgid "Change your email, avatar, password, profile" msgstr "మీ ఈమెయిలà±, అవతారం, సంకేతపదం మరియౠపà±à°°à±Œà°«à±ˆà°³à±à°³à°¨à± మారà±à°šà±à°•à±‹à°‚à°¡à°¿" @@ -4105,7 +4378,7 @@ msgstr "బాడà±à°œà°¿" #: lib/action.php:773 msgid "StatusNet software license" -msgstr "" +msgstr "à°¸à±à°Ÿà±‡à°Ÿà°¸à±â€Œà°¨à±†à°Ÿà± మృదూపకరణ లైసెనà±à°¸à±" #: lib/action.php:776 #, php-format @@ -4157,10 +4430,6 @@ msgstr "తరà±à°µà°¾à°¤" msgid "Before" msgstr "ఇంతకà±à°°à°¿à°¤à°‚" -#: lib/action.php:1167 -msgid "There was a problem with your session token." -msgstr "" - #: lib/adminpanelaction.php:96 msgid "You cannot make changes to this site." msgstr "à°ˆ సైటà±à°•à°¿ మీరౠమారà±à°ªà±à°²à± చేయలేరà±." @@ -4195,6 +4464,72 @@ msgstr "SMS నిరà±à°§à°¾à°°à°£" msgid "Paths configuration" msgstr "SMS నిరà±à°§à°¾à°°à°£" +#: lib/applicationeditform.php:186 +msgid "Icon for this application" +msgstr "" + +#: lib/applicationeditform.php:206 +#, fuzzy, php-format +msgid "Describe your application in %d characters" +msgstr "మీ à°—à±à°°à°¿à°‚à°šà°¿ మరియౠమీ ఆసకà±à°¤à±à°² à°—à±à°°à°¿à°‚à°šà°¿ 140 à°…à°•à±à°·à°°à°¾à°²à±à°²à±‹ చెపà±à°ªà°‚à°¡à°¿" + +#: lib/applicationeditform.php:209 +#, fuzzy +msgid "Describe your application" +msgstr "మీ à°—à±à°°à°¿à°‚à°šà°¿ మరియౠమీ ఆసకà±à°¤à±à°² à°—à±à°°à°¿à°‚à°šà°¿ 140 à°…à°•à±à°·à°°à°¾à°²à±à°²à±‹ చెపà±à°ªà°‚à°¡à°¿" + +#: lib/applicationeditform.php:218 +#, fuzzy +msgid "Source URL" +msgstr "మూలమà±" + +#: lib/applicationeditform.php:220 +#, fuzzy +msgid "URL of the homepage of this application" +msgstr "మీ హోమౠపేజీ, à°¬à±à°²à°¾à°—à±, లేదా వేరే సేటà±à°²à±‹à°¨à°¿ మీ à°ªà±à°°à±Šà°«à±ˆà°²à± యొకà±à°• à°šà°¿à°°à±à°¨à°¾à°®à°¾" + +#: lib/applicationeditform.php:226 +msgid "Organization responsible for this application" +msgstr "" + +#: lib/applicationeditform.php:232 +#, fuzzy +msgid "URL for the homepage of the organization" +msgstr "మీ హోమౠపేజీ, à°¬à±à°²à°¾à°—à±, లేదా వేరే సేటà±à°²à±‹à°¨à°¿ మీ à°ªà±à°°à±Šà°«à±ˆà°²à± యొకà±à°• à°šà°¿à°°à±à°¨à°¾à°®à°¾" + +#: lib/applicationeditform.php:238 +msgid "URL to redirect to after authentication" +msgstr "" + +#: lib/applicationeditform.php:260 +msgid "Browser" +msgstr "విహారిణి" + +#: lib/applicationeditform.php:276 +msgid "Desktop" +msgstr "" + +#: lib/applicationeditform.php:277 +msgid "Type of application, browser or desktop" +msgstr "" + +#: lib/applicationeditform.php:299 +msgid "Read-only" +msgstr "" + +#: lib/applicationeditform.php:317 +msgid "Read-write" +msgstr "" + +#: lib/applicationeditform.php:318 +msgid "Default access for this application: read-only, or read-write" +msgstr "" + +#: lib/applicationlist.php:154 +#, fuzzy +msgid "Revoke" +msgstr "తొలగించà±" + #: lib/attachmentlist.php:87 msgid "Attachments" msgstr "జోడింపà±à°²à±" @@ -4216,12 +4551,12 @@ msgstr "" msgid "Tags for this attachment" msgstr "" -#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 +#: lib/authenticationplugin.php:214 lib/authenticationplugin.php:219 #, fuzzy msgid "Password changing failed" msgstr "సంకేతపదం మారà±à°ªà±" -#: lib/authenticationplugin.php:197 +#: lib/authenticationplugin.php:229 #, fuzzy msgid "Password changing is not allowed" msgstr "సంకేతపదం మారà±à°ªà±" @@ -4243,8 +4578,8 @@ msgid "Sorry, this command is not yet implemented." msgstr "" #: lib/command.php:88 -#, fuzzy, php-format -msgid "Could not find a user with nickname %s." +#, php-format +msgid "Could not find a user with nickname %s" msgstr "వాడà±à°•à°°à°¿à°¨à°¿ తాజాకరించలేకà±à°¨à±à°¨à°¾à°‚." #: lib/command.php:92 @@ -4252,9 +4587,9 @@ msgid "It does not make a lot of sense to nudge yourself!" msgstr "" #: lib/command.php:99 -#, php-format -msgid "Nudge sent to %s." -msgstr "" +#, fuzzy, php-format +msgid "Nudge sent to %s" +msgstr "%sà°•à°¿ à°¸à±à°ªà°‚దనలà±" #: lib/command.php:126 #, php-format @@ -4267,168 +4602,192 @@ msgstr "" "చందాదారà±à°²à±: %2$s\n" "నోటీసà±à°²à±: %3$s" -#: lib/command.php:152 lib/command.php:399 lib/command.php:460 +#: lib/command.php:152 lib/command.php:390 lib/command.php:451 #, fuzzy -msgid "Notice with that id does not exist." +msgid "Notice with that id does not exist" msgstr "à°† ఈమెయిలౠచిరà±à°¨à°¾à°®à°¾ లేదా వాడà±à°•à°°à°¿à°ªà±‡à°°à±à°¤à±‹ వాడà±à°•à°°à±à°²à±†à°µà°°à±‚ లేరà±." -#: lib/command.php:168 lib/command.php:415 lib/command.php:476 -#: lib/command.php:532 +#: lib/command.php:168 lib/command.php:406 lib/command.php:467 +#: lib/command.php:523 #, fuzzy -msgid "User has no last notice." +msgid "User has no last notice" msgstr "వాడà±à°•à°°à°¿à°•à°¿ à°ªà±à°°à±Šà°«à±ˆà°²à± లేదà±." #: lib/command.php:190 msgid "Notice marked as fave." msgstr "" -#: lib/command.php:284 -#, fuzzy, php-format -msgid "Could not remove user %1$s to group %2$s." +#: lib/command.php:217 +msgid "You are already a member of that group" +msgstr "మీరౠఇపà±à°ªà°Ÿà°¿à°•à±‡ à°† à°—à±à°‚à°ªà±à°²à±‹ సభà±à°¯à±à°²à±" + +#: lib/command.php:231 +#, php-format +msgid "Could not join user %s to group %s" +msgstr "వాడà±à°•à°°à°¿ %sని %s à°—à±à°‚à°ªà±à°²à±‹ చేరà±à°šà°²à±‡à°•à°ªà±‹à°¯à°¾à°‚" + +#: lib/command.php:236 +#, php-format +msgid "%s joined group %s" +msgstr "%s %s à°—à±à°‚à°ªà±à°²à±‹ చేరారà±" + +#: lib/command.php:275 +#, php-format +msgid "Could not remove user %s to group %s" msgstr "వాడà±à°•à°°à°¿ %sని %s à°—à±à°‚పౠనà±à°‚à°¡à°¿ తొలగించలేకపోయాం" -#: lib/command.php:318 +#: lib/command.php:280 +#, php-format +msgid "%s left group %s" +msgstr "%2$s à°—à±à°‚పౠనà±à°‚à°¡à°¿ %1$s వైదొలిగారà±" + +#: lib/command.php:309 #, php-format msgid "Fullname: %s" msgstr "పూరà±à°¤à°¿à°ªà±‡à°°à±: %s" -#: lib/command.php:321 +#: lib/command.php:312 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "à°ªà±à°°à°¾à°‚తం: %s" -#: lib/command.php:324 +#: lib/command.php:315 lib/mail.php:256 #, php-format msgid "Homepage: %s" -msgstr "" +msgstr "హోంపేజీ: %s" -#: lib/command.php:327 +#: lib/command.php:318 #, php-format msgid "About: %s" msgstr "à°—à±à°°à°¿à°‚à°šà°¿: %s" -#: lib/command.php:358 +#: lib/command.php:349 #, fuzzy, php-format -msgid "Message too long - maximum is %1$d characters, you sent %2$d." +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." +#: lib/command.php:367 +#, php-format +msgid "Direct message to %s sent" msgstr "%sà°•à°¿ నేరౠసందేశానà±à°¨à°¿ పంపించాం" -#: lib/command.php:378 +#: lib/command.php:369 msgid "Error sending direct message." msgstr "" -#: lib/command.php:435 +#: lib/command.php:413 +#, fuzzy +msgid "Cannot repeat your own notice" +msgstr "à°ˆ లైసెనà±à°¸à±à°•à°¿ అంగీకరించకపోతే మీరౠనమోదà±à°šà±‡à°¸à±à°•à±‹à°²à±‡à°°à±." + +#: lib/command.php:418 +#, fuzzy +msgid "Already repeated that notice" +msgstr "à°ˆ నోటీసà±à°¨à°¿ తొలగించà±" + +#: lib/command.php:426 #, fuzzy, php-format -msgid "Notice from %s repeated." +msgid "Notice from %s repeated" msgstr "సందేశాలà±" -#: lib/command.php:437 +#: lib/command.php:428 #, fuzzy msgid "Error repeating notice." msgstr "సందేశానà±à°¨à°¿ à°­à°¦à±à°°à°ªà°°à°šà°¡à°‚లో పొరపాటà±." -#: lib/command.php:491 -#, fuzzy, php-format -msgid "Notice too long - maximum is %1$d characters, you sent %2$d." +#: lib/command.php:482 +#, php-format +msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "నోటిసౠచాలా పొడవà±à°—à°¾ ఉంది - %d à°…à°•à±à°·à°°à°¾à°²à± à°—à°°à°¿à°·à±à° à°‚, మీరౠ%d పంపించారà±" -#: lib/command.php:500 +#: lib/command.php:491 #, fuzzy, php-format -msgid "Reply to %s sent." +msgid "Reply to %s sent" msgstr "%sà°•à°¿ à°¸à±à°ªà°‚దనలà±" -#: lib/command.php:502 +#: lib/command.php:493 #, fuzzy msgid "Error saving notice." msgstr "సందేశానà±à°¨à°¿ à°­à°¦à±à°°à°ªà°°à°šà°¡à°‚లో పొరపాటà±." -#: lib/command.php:556 -msgid "Specify the name of the user to subscribe to." -msgstr "" +#: lib/command.php:547 +msgid "Specify the name of the user to subscribe to" +msgstr "à°à°µà°°à°¿à°•à°¿ చందా చేరాలనà±à°•à±à°‚à°Ÿà±à°¨à±à°¨à°¾à°°à±‹ à°† వాడà±à°•à°°à°¿ పేరౠతెలియజేయండి" -#: lib/command.php:563 +#: lib/command.php:554 #, php-format msgid "Subscribed to %s" msgstr "%sà°•à°¿ చందా చేరారà±" -#: lib/command.php:584 -msgid "Specify the name of the user to unsubscribe from." -msgstr "" +#: lib/command.php:575 +msgid "Specify the name of the user to unsubscribe from" +msgstr "ఎవరి à°¨à±à°‚à°¡à°¿ చందా విరమించాలనà±à°•à±à°‚à°Ÿà±à°¨à±à°¨à°¾à°°à±‹ à°† వాడà±à°•à°°à°¿ పేరౠతెలియజేయండి" -#: lib/command.php:591 +#: lib/command.php:582 #, php-format msgid "Unsubscribed from %s" -msgstr "" +msgstr "%s à°¨à±à°‚à°¡à°¿ చందా విరమించారà±" -#: lib/command.php:609 lib/command.php:632 +#: lib/command.php:600 lib/command.php:623 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:612 +#: lib/command.php:603 msgid "Notification off." msgstr "" -#: lib/command.php:614 +#: lib/command.php:605 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:635 +#: lib/command.php:626 msgid "Notification on." msgstr "" -#: lib/command.php:637 +#: lib/command.php:628 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:650 -msgid "Login command is disabled." +#: lib/command.php:641 +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 -#, fuzzy, php-format -msgid "This link is useable only once, and is good for only 2 minutes: %s." +#: lib/command.php:652 +#, 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:668 msgid "You are not subscribed to anyone." msgstr "మీరౠఎవరికీ చందాచేరలేదà±." -#: lib/command.php:687 +#: lib/command.php:670 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:690 msgid "No one is subscribed to you." msgstr "మీకౠచందాదారà±à°²à± ఎవరూ లేరà±." -#: lib/command.php:709 +#: lib/command.php:692 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:712 msgid "You are not a member of any groups." msgstr "మీరౠఠగà±à°‚à°ªà±à°²à±‹à°¨à±‚ సభà±à°¯à±à°²à± కాదà±." -#: lib/command.php:731 +#: lib/command.php:714 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:728 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4469,20 +4828,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:199 +#: lib/common.php:131 #, fuzzy msgid "No configuration file found. " msgstr "నిరà±à°§à°¾à°°à°£ సంకేతం లేదà±." -#: lib/common.php:200 +#: lib/common.php:132 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:201 +#: lib/common.php:134 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:202 +#: lib/common.php:135 msgid "Go to the installer." msgstr "" @@ -4498,6 +4857,15 @@ msgstr "" msgid "Updates by SMS" msgstr "" +#: lib/connectsettingsaction.php:120 +#, fuzzy +msgid "Connections" +msgstr "à°…à°¨à±à°¸à°‚ధానించà±" + +#: lib/connectsettingsaction.php:121 +msgid "Authorized connected applications" +msgstr "" + #: lib/dberroraction.php:60 msgid "Database error" msgstr "" @@ -4507,10 +4875,9 @@ msgid "Upload file" msgstr "ఫైలà±à°¨à°¿ à°Žà°•à±à°•à°¿à°‚à°šà±" #: lib/designsettings.php:109 -#, fuzzy msgid "" "You can upload your personal background image. The maximum file size is 2MB." -msgstr "మీ à°¸à±à°µà°‚à°¤ నేపథà±à°¯à°ªà± à°šà°¿à°¤à±à°°à°¾à°¨à±à°¨à°¿ మీరౠఎకà±à°•à°¿à°‚చవచà±à°šà±. à°—à°°à°¿à°·à±à°  ఫైలౠపరిమాణం 2మెబై." +msgstr "మీ à°µà±à°¯à°•à±à°¤à°¿à°—à°¤ నేపథà±à°¯à°ªà± à°šà°¿à°¤à±à°°à°¾à°¨à±à°¨à°¿ మీరౠఎకà±à°•à°¿à°‚చవచà±à°šà±. à°—à°°à°¿à°·à±à°  ఫైలౠపరిమాణం 2మెబై." #: lib/designsettings.php:418 msgid "Design defaults restored." @@ -4584,15 +4951,14 @@ msgid "Describe the group or topic" msgstr "మీ à°—à±à°°à°¿à°‚à°šà°¿ మరియౠమీ ఆసకà±à°¤à±à°² à°—à±à°°à°¿à°‚à°šà°¿ 140 à°…à°•à±à°·à°°à°¾à°²à±à°²à±‹ చెపà±à°ªà°‚à°¡à°¿" #: lib/groupeditform.php:170 -#, fuzzy, php-format +#, php-format msgid "Describe the group or topic in %d characters" -msgstr "మీ à°—à±à°°à°¿à°‚à°šà°¿ మరియౠమీ ఆసకà±à°¤à±à°² à°—à±à°°à°¿à°‚à°šà°¿ 140 à°…à°•à±à°·à°°à°¾à°²à±à°²à±‹ చెపà±à°ªà°‚à°¡à°¿" +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 @@ -4687,11 +5053,16 @@ msgstr "మెబై" msgid "kB" msgstr "కిబై" -#: lib/jabber.php:191 +#: lib/jabber.php:202 #, php-format msgid "[%s]" msgstr "[%s]" +#: lib/jabber.php:385 +#, fuzzy, php-format +msgid "Unknown inbox source %d." +msgstr "à°—à±à°°à±à°¤à± తెలియని భాష \"%s\"" + #: lib/joinform.php:114 msgid "Join" msgstr "చేరà±" @@ -4750,21 +5121,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" @@ -4953,7 +5312,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 @@ -4962,7 +5321,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 @@ -4972,7 +5331,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 @@ -5007,16 +5366,18 @@ msgstr "à°’à°• ఫైలà±à°¨à°¿ జోడించà±" #: lib/noticeform.php:212 #, fuzzy -msgid "Share my location." -msgstr "à°Ÿà±à°¯à°¾à°—à±à°²à°¨à°¿ à°­à°¦à±à°°à°ªà°°à°šà°²à±‡à°•à±à°¨à±à°¨à°¾à°‚." - -#: lib/noticeform.php:214 -#, fuzzy -msgid "Do not share my location." +msgid "Share my location" msgstr "à°Ÿà±à°¯à°¾à°—à±à°²à°¨à°¿ à°­à°¦à±à°°à°ªà°°à°šà°²à±‡à°•à±à°¨à±à°¨à°¾à°‚." #: lib/noticeform.php:215 -msgid "Hide this info" +#, fuzzy +msgid "Do not share my location" +msgstr "à°Ÿà±à°¯à°¾à°—à±à°²à°¨à°¿ à°­à°¦à±à°°à°ªà°°à°šà°²à±‡à°•à±à°¨à±à°¨à°¾à°‚." + +#: lib/noticeform.php:216 +msgid "" +"Sorry, retrieving your geo location is taking longer than expected, please " +"try again later" msgstr "" #: lib/noticelist.php:428 @@ -5286,25 +5647,25 @@ msgstr "ఇపà±à°ªà°Ÿà°¿à°•à±‡ చందాచేరారà±!" msgid "User has blocked you." msgstr "వాడà±à°•à°°à°¿ మిమà±à°®à°²à±à°¨à°¿ నిరోధించారà±." -#: lib/subs.php:60 +#: lib/subs.php:63 msgid "Could not subscribe." msgstr "చందా చేరà±à°šà°²à±‡à°•à°ªà±‹à°¯à°¾à°‚." -#: lib/subs.php:79 +#: lib/subs.php:82 msgid "Could not subscribe other to you." msgstr "" -#: lib/subs.php:128 +#: lib/subs.php:137 #, fuzzy msgid "Not subscribed!" msgstr "చందాదారà±à°²à±" -#: lib/subs.php:133 +#: lib/subs.php:142 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "చందాని తొలగించలేకపోయాం." -#: lib/subs.php:146 +#: lib/subs.php:158 msgid "Couldn't delete subscription." msgstr "చందాని తొలగించలేకపోయాం." @@ -5318,10 +5679,6 @@ msgstr "" msgid "People Tagcloud as tagged" msgstr "" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(à°à°®à±€à°²à±‡à°µà±)" - #: lib/tagcloudsection.php:56 msgid "None" msgstr "à°à°®à±€à°²à±‡à°¦à±" @@ -5385,47 +5742,47 @@ msgstr "సందేశం" msgid "Moderate" msgstr "" -#: lib/util.php:837 +#: lib/util.php:875 msgid "a few seconds ago" msgstr "కొనà±à°¨à°¿ à°•à±à°·à°£à°¾à°² à°•à±à°°à°¿à°¤à°‚" -#: lib/util.php:839 +#: lib/util.php:877 msgid "about a minute ago" msgstr "à°“ నిమిషం à°•à±à°°à°¿à°¤à°‚" -#: lib/util.php:841 +#: lib/util.php:879 #, php-format msgid "about %d minutes ago" msgstr "%d నిమిషాల à°•à±à°°à°¿à°¤à°‚" -#: lib/util.php:843 +#: lib/util.php:881 msgid "about an hour ago" msgstr "à°’à°• à°—à°‚à°Ÿ à°•à±à°°à°¿à°¤à°‚" -#: lib/util.php:845 +#: lib/util.php:883 #, php-format msgid "about %d hours ago" msgstr "%d à°—à°‚à°Ÿà°² à°•à±à°°à°¿à°¤à°‚" -#: lib/util.php:847 +#: lib/util.php:885 msgid "about a day ago" msgstr "à°“ రోజౠకà±à°°à°¿à°¤à°‚" -#: lib/util.php:849 +#: lib/util.php:887 #, php-format msgid "about %d days ago" msgstr "%d రోజà±à°² à°•à±à°°à°¿à°¤à°‚" -#: lib/util.php:851 +#: lib/util.php:889 msgid "about a month ago" msgstr "à°“ నెల à°•à±à°°à°¿à°¤à°‚" -#: lib/util.php:853 +#: lib/util.php:891 #, php-format msgid "about %d months ago" msgstr "%d నెలల à°•à±à°°à°¿à°¤à°‚" -#: lib/util.php:855 +#: lib/util.php:893 msgid "about a year ago" msgstr "à°’à°• సంవతà±à°¸à°°à°‚ à°•à±à°°à°¿à°¤à°‚" @@ -5441,5 +5798,5 @@ msgstr "%s అనేది సరైన రంగౠకాదà±! 3 లేద #: scripts/xmppdaemon.php:301 #, php-format -msgid "Message too long - maximum is %d characters, you sent %d" -msgstr "" +msgid "Message too long - maximum is %1$d characters, you sent %2$d." +msgstr "నోటిసౠచాలా పొడవà±à°—à°¾ ఉంది - %1$d à°…à°•à±à°·à°°à°¾à°²à± à°—à°°à°¿à°·à±à° à°‚, మీరౠ%2$d పంపించారà±." diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po index f4451e9aed..99c4243880 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-10 00:46+0000\n" -"PO-Revision-Date: 2010-01-10 00:49:12+0000\n" +"POT-Creation-Date: 2010-01-15 19:15+0000\n" +"PO-Revision-Date: 2010-01-15 19:18:07+0000\n" "Language-Team: Turkish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60878); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r61101); 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" @@ -34,25 +34,30 @@ msgstr "Böyle bir durum mesajı yok." #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 +#: actions/apistatusesupdate.php:149 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 #: 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 #: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 -#: lib/command.php:163 lib/command.php:311 lib/command.php:364 -#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/command.php:163 lib/command.php:302 lib/command.php:355 +#: lib/command.php:401 lib/command.php:462 lib/command.php:518 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/subs.php:34 lib/subs.php:125 msgid "No such user." msgstr "Böyle bir kullanıcı yok." +#: actions/all.php:84 +#, fuzzy, php-format +msgid "%1$s and friends, page %2$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 +#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -105,7 +110,7 @@ msgstr "" msgid "You and friends" msgstr "%s ve arkadaÅŸları" -#: actions/allrss.php:119 actions/apitimelinefriends.php:122 +#: actions/allrss.php:119 actions/apitimelinefriends.php:121 #: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" @@ -116,6 +121,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:155 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ı." @@ -130,7 +152,7 @@ msgstr "Onay kodu bulunamadı." #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:114 +#: actions/apistatusesupdate.php:119 msgid "This method requires a POST." msgstr "" @@ -161,8 +183,9 @@ msgstr "Profil kaydedilemedi." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257 -#: actions/designadminpanel.php:122 actions/newnotice.php:94 +#: actions/apistatusesupdate.php:132 actions/avatarsettings.php:257 +#: actions/designadminpanel.php:122 actions/editapplication.php:118 +#: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format msgid "" @@ -174,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 "" @@ -216,26 +242,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 "" @@ -260,15 +266,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 @@ -290,8 +297,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." @@ -327,7 +335,8 @@ msgstr "Takma ad kullanımda. BaÅŸka bir tane deneyin." msgid "Not a valid nickname." msgstr "Geçersiz bir takma ad." -#: actions/apigroupcreate.php:196 actions/editgroup.php:195 +#: actions/apigroupcreate.php:196 actions/editapplication.php:212 +#: actions/editgroup.php:195 actions/newapplication.php:200 #: actions/newgroup.php:139 actions/profilesettings.php:222 #: actions/register.php:217 msgid "Homepage is not a valid URL." @@ -339,7 +348,8 @@ msgstr "BaÅŸlangıç sayfası adresi geçerli bir URL deÄŸil." msgid "Full name is too long (max 255 chars)." msgstr "Tam isim çok uzun (azm: 255 karakter)." -#: actions/apigroupcreate.php:213 +#: actions/apigroupcreate.php:213 actions/editapplication.php:187 +#: actions/newapplication.php:169 #, fuzzy, php-format msgid "Description is too long (max %d chars)." msgstr "Hakkında bölümü çok uzun (azm 140 karakter)." @@ -380,7 +390,7 @@ msgstr "" msgid "Group not found!" msgstr "Ä°stek bulunamadı!" -#: actions/apigroupjoin.php:110 lib/command.php:217 +#: 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!" @@ -389,7 +399,7 @@ msgstr "Zaten giriÅŸ yapmış durumdasıznız!" msgid "You have been blocked from that group by the admin." msgstr "" -#: actions/apigroupjoin.php:138 lib/command.php:234 +#: actions/apigroupjoin.php:138 actions/joingroup.php:124 #, fuzzy, php-format msgid "Could not join user %1$s to group %2$s." msgstr "Sunucuya yönlendirme yapılamadı: %s" @@ -399,7 +409,7 @@ 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/leavegroup.php:127 +#: actions/apigroupleave.php:124 actions/leavegroup.php:119 #, fuzzy, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "OpenID formu yaratılamadı: %s" @@ -419,6 +429,101 @@ msgstr "" msgid "groups on %s" msgstr "" +#: actions/apioauthauthorize.php:108 actions/apioauthauthorize.php:114 +msgid "Bad request." +msgstr "" + +#: actions/apioauthauthorize.php:134 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:115 actions/makeadmin.php:66 +#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 +#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:139 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 +#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/subscribe.php:46 actions/tagother.php:166 +#: 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 "" + +#: actions/apioauthauthorize.php:146 +#, fuzzy +msgid "Invalid nickname / password!" +msgstr "Geçersiz kullanıcı adı veya parola." + +#: actions/apioauthauthorize.php:170 +#, fuzzy +msgid "DB error deleting OAuth app user." +msgstr "Kullanıcı ayarlamada hata oluÅŸtu." + +#: actions/apioauthauthorize.php:196 +#, fuzzy +msgid "DB error inserting OAuth app user." +msgstr "Cevap eklenirken veritabanı hatası: %s" + +#: actions/apioauthauthorize.php:231 +#, php-format +msgid "" +"The request token %s has been authorized. Please exchange it for an access " +"token." +msgstr "" + +#: actions/apioauthauthorize.php:241 +#, php-format +msgid "The request token %s has been denied." +msgstr "" + +#: actions/apioauthauthorize.php:246 actions/avatarsettings.php:281 +#: actions/designadminpanel.php:103 actions/editapplication.php:139 +#: actions/emailsettings.php:256 actions/grouplogo.php:319 +#: actions/imsettings.php:220 actions/newapplication.php:121 +#: actions/oauthconnectionssettings.php:151 actions/recoverpassword.php:44 +#: actions/smssettings.php:248 lib/designsettings.php:304 +msgid "Unexpected form submission." +msgstr "BeklenmeÄŸen form girdisi." + +#: actions/apioauthauthorize.php:273 +msgid "An application would like to connect to your account" +msgstr "" + +#: actions/apioauthauthorize.php:290 +msgid "Allow or deny access" +msgstr "" + +#: actions/apioauthauthorize.php:320 lib/action.php:435 +#, fuzzy +msgid "Account" +msgstr "Hakkında" + +#: actions/apioauthauthorize.php:323 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/apioauthauthorize.php:326 actions/login.php:233 +#: actions/register.php:429 lib/accountsettingsaction.php:116 +msgid "Password" +msgstr "Parola" + +#: actions/apioauthauthorize.php:338 +msgid "Deny" +msgstr "" + +#: actions/apioauthauthorize.php:344 +msgid "Allow" +msgstr "" + +#: actions/apioauthauthorize.php:361 +msgid "Allow or deny access to your account information." +msgstr "" + #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." msgstr "" @@ -432,12 +537,12 @@ msgstr "" msgid "No such notice." msgstr "Böyle bir durum mesajı yok." -#: actions/apistatusesretweet.php:83 lib/command.php:422 +#: actions/apistatusesretweet.php:83 #, fuzzy msgid "Cannot repeat your own notice." msgstr "EÄŸer lisansı kabul etmezseniz kayıt olamazsınız." -#: actions/apistatusesretweet.php:91 lib/command.php:427 +#: actions/apistatusesretweet.php:91 #, fuzzy msgid "Already repeated that notice." msgstr "Zaten giriÅŸ yapmış durumdasıznız!" @@ -451,18 +556,18 @@ msgstr "Avatar güncellendi." msgid "No status with that ID found." msgstr "" -#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:162 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" "Ah, durumunuz biraz uzun kaçtı. Azami 180 karaktere sığdırmaya ne dersiniz?" -#: actions/apistatusesupdate.php:198 +#: actions/apistatusesupdate.php:203 msgid "Not found" msgstr "" -#: actions/apistatusesupdate.php:221 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:226 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -549,8 +654,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" @@ -573,8 +681,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 "" @@ -607,29 +715,6 @@ 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/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 -#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 -#: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 -#: actions/subscribe.php:46 actions/tagother.php:166 -#: 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 "" - -#: actions/avatarsettings.php:281 actions/designadminpanel.php:103 -#: actions/emailsettings.php:256 actions/grouplogo.php:319 -#: actions/imsettings.php:220 actions/recoverpassword.php:44 -#: actions/smssettings.php:248 lib/designsettings.php:304 -msgid "Unexpected form submission." -msgstr "BeklenmeÄŸen form girdisi." - #: actions/avatarsettings.php:328 msgid "Pick a square area of the image to be your avatar" msgstr "" @@ -693,20 +778,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:260 #, fuzzy -msgid "No such group" +msgid "No such group." msgstr "Böyle bir durum mesajı yok." #: actions/blockedfromgroup.php:90 @@ -776,7 +856,8 @@ msgid "Couldn't delete email confirmation." msgstr "Eposta onayı silinemedi." #: actions/confirmaddress.php:144 -msgid "Confirm Address" +#, fuzzy +msgid "Confirm address" msgstr "Adresi Onayla" #: actions/confirmaddress.php:159 @@ -831,10 +912,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." @@ -977,7 +1054,8 @@ msgstr "" #: actions/pathsadminpanel.php:324 actions/profilesettings.php:174 #: actions/siteadminpanel.php:388 actions/smssettings.php:181 #: actions/subscriptions.php:203 actions/tagother.php:154 -#: actions/useradminpanel.php:313 lib/designsettings.php:256 +#: actions/useradminpanel.php:313 lib/applicationeditform.php:335 +#: lib/applicationeditform.php:336 lib/designsettings.php:256 #: lib/groupeditform.php:202 msgid "Save" msgstr "Kaydet" @@ -998,6 +1076,83 @@ msgstr "" msgid "No such document." msgstr "Böyle bir belge yok." +#: actions/editapplication.php:54 lib/applicationeditform.php:136 +msgid "Edit application" +msgstr "" + +#: actions/editapplication.php:66 +msgid "You must be logged in to edit an application." +msgstr "" + +#: actions/editapplication.php:77 actions/showapplication.php:94 +#, fuzzy +msgid "You are not the owner of this application." +msgstr "Bize o profili yollamadınız" + +#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:163 +#: actions/showapplication.php:87 +#, fuzzy +msgid "No such application." +msgstr "Böyle bir durum mesajı yok." + +#: actions/editapplication.php:127 actions/newapplication.php:110 +#: actions/showapplication.php:118 lib/action.php:1167 +msgid "There was a problem with your session token." +msgstr "" + +#: actions/editapplication.php:161 +msgid "Use this form to edit your application." +msgstr "" + +#: actions/editapplication.php:177 actions/newapplication.php:159 +msgid "Name is required." +msgstr "" + +#: actions/editapplication.php:180 actions/newapplication.php:162 +#, fuzzy +msgid "Name is too long (max 255 chars)." +msgstr "Tam isim çok uzun (azm: 255 karakter)." + +#: actions/editapplication.php:183 actions/newapplication.php:165 +#, fuzzy +msgid "Description is required." +msgstr "Abonelikler" + +#: actions/editapplication.php:191 +msgid "Source URL is too long." +msgstr "" + +#: actions/editapplication.php:197 actions/newapplication.php:182 +#, fuzzy +msgid "Source URL is not valid." +msgstr "BaÅŸlangıç sayfası adresi geçerli bir URL deÄŸil." + +#: actions/editapplication.php:200 actions/newapplication.php:185 +msgid "Organization is required." +msgstr "" + +#: actions/editapplication.php:203 actions/newapplication.php:188 +#, fuzzy +msgid "Organization is too long (max 255 chars)." +msgstr "Yer bilgisi çok uzun (azm: 255 karakter)." + +#: actions/editapplication.php:206 actions/newapplication.php:191 +msgid "Organization homepage is required." +msgstr "" + +#: actions/editapplication.php:215 actions/newapplication.php:203 +msgid "Callback is too long." +msgstr "" + +#: actions/editapplication.php:222 actions/newapplication.php:212 +msgid "Callback URL is not valid." +msgstr "" + +#: actions/editapplication.php:255 +#, fuzzy +msgid "Could not update application." +msgstr "Kullanıcı güncellenemedi." + #: actions/editgroup.php:56 #, php-format msgid "Edit %s group" @@ -1009,7 +1164,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 +1192,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 @@ -1067,13 +1223,15 @@ msgid "" msgstr "" #: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 +#: actions/smssettings.php:126 lib/applicationeditform.php:333 +#: lib/applicationeditform.php:334 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\"" @@ -1146,9 +1304,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." @@ -1329,14 +1488,6 @@ 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:79 #, fuzzy msgid "No such file." @@ -1355,7 +1506,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 "" @@ -1405,9 +1556,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." @@ -1429,12 +1581,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." @@ -1450,6 +1596,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 "" @@ -1578,7 +1729,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 @@ -1609,7 +1761,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 @@ -1706,7 +1859,7 @@ msgstr "" msgid "You are already subscribed to these users:" msgstr "" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:315 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 #, php-format msgid "%1$s (%2$s)" msgstr "" @@ -1747,7 +1900,7 @@ msgstr "" msgid "Optionally add a personal message to the invitation." msgstr "" -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236 msgid "Send" msgstr "Gönder" @@ -1791,17 +1944,7 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "" -#: actions/joingroup.php:90 -#, fuzzy -msgid "You are already a member of that group" -msgstr "Zaten giriÅŸ yapmış durumdasıznız!" - -#: actions/joingroup.php:128 -#, fuzzy, php-format -msgid "Could not join user %1$s to group %2$s" -msgstr "Sunucuya yönlendirme yapılamadı: %s" - -#: actions/joingroup.php:135 lib/command.php:239 +#: actions/joingroup.php:131 #, php-format msgid "%1$s joined group %2$s" msgstr "" @@ -1810,72 +1953,52 @@ msgstr "" msgid "You must be logged in to leave a group." msgstr "" -#: actions/leavegroup.php:90 lib/command.php:268 +#: actions/leavegroup.php:90 lib/command.php:265 #, fuzzy msgid "You are not a member of that group." msgstr "Bize o profili yollamadınız" -#: actions/leavegroup.php:119 lib/command.php:278 -msgid "Could not find membership record." -msgstr "" - -#: actions/leavegroup.php:134 lib/command.php:289 +#: actions/leavegroup.php:127 #, fuzzy, php-format msgid "%1$s left group %2$s" msgstr "%1$s'in %2$s'deki durum mesajları " -#: actions/login.php:83 actions/register.php:137 +#: 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:460 +#: 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 -#: lib/groupeditform.php:152 lib/userprofile.php:131 -msgid "Nickname" -msgstr "Takma ad" - -#: actions/login.php:253 actions/register.php:428 -#: 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." @@ -1883,7 +2006,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]" @@ -1903,19 +2026,40 @@ 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 %1$s in group %2$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 %1$s an admin for group %2$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" msgstr "" +#: actions/newapplication.php:52 +msgid "New application" +msgstr "" + +#: actions/newapplication.php:64 +msgid "You must be logged in to register an application." +msgstr "" + +#: actions/newapplication.php:143 +msgid "Use this form to register a new application." +msgstr "" + +#: actions/newapplication.php:173 +msgid "Source URL is required." +msgstr "" + +#: actions/newapplication.php:255 actions/newapplication.php:264 +#, fuzzy +msgid "Could not create application." +msgstr "Avatar bilgisi kaydedilemedi" + #: actions/newgroup.php:53 msgid "New group" msgstr "" @@ -1928,12 +2072,12 @@ msgstr "" msgid "New message" msgstr "" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 msgid "You can't send a message to this user." msgstr "" -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:484 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 +#: lib/command.php:475 msgid "No content!" msgstr "İçerik yok!" @@ -1941,7 +2085,7 @@ msgstr "İçerik yok!" msgid "No recipient specified." msgstr "" -#: actions/newmessage.php:164 lib/command.php:370 +#: actions/newmessage.php:164 lib/command.php:361 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -1952,7 +2096,7 @@ msgstr "" #: 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 @@ -2023,6 +2167,49 @@ msgstr "" msgid "Nudge sent!" msgstr "" +#: actions/oauthappssettings.php:59 +msgid "You must be logged in to list your applications." +msgstr "" + +#: actions/oauthappssettings.php:74 +msgid "OAuth applications" +msgstr "" + +#: actions/oauthappssettings.php:85 +msgid "Applications you have registered" +msgstr "" + +#: actions/oauthappssettings.php:135 +#, php-format +msgid "You have not registered any applications yet." +msgstr "" + +#: actions/oauthconnectionssettings.php:71 +msgid "Connected applications" +msgstr "" + +#: actions/oauthconnectionssettings.php:87 +msgid "You have allowed the following applications to access you account." +msgstr "" + +#: actions/oauthconnectionssettings.php:170 +#, fuzzy +msgid "You are not a user of that application." +msgstr "Bize o profili yollamadınız" + +#: actions/oauthconnectionssettings.php:180 +msgid "Unable to revoke access for app: " +msgstr "" + +#: actions/oauthconnectionssettings.php:192 +#, php-format +msgid "You have not authorized any applications to use your account." +msgstr "" + +#: actions/oauthconnectionssettings.php:205 +msgid "Developers can edit the registration settings for their applications " +msgstr "" + #: actions/oembed.php:79 actions/shownotice.php:100 msgid "Notice has no profile" msgstr "Bu durum mesajının ait oldugu kullanıcı profili yok" @@ -2041,8 +2228,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:1038 +#: lib/api.php:1066 lib/api.php:1176 msgid "Not a supported data format." msgstr "" @@ -2056,7 +2243,7 @@ msgstr "" #: actions/othersettings.php:60 #, fuzzy -msgid "Other Settings" +msgid "Other settings" msgstr "Ayarlar" #: actions/othersettings.php:71 @@ -2089,6 +2276,30 @@ msgstr "" msgid "URL shortening service is too long (max 50 chars)." msgstr "Yer bilgisi çok uzun (azm: 255 karakter)." +#: 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 #, php-format msgid "Outbox for %s" @@ -2125,7 +2336,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" @@ -2294,8 +2505,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" @@ -2361,44 +2573,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 -#: lib/groupeditform.php:161 +#: actions/profilesettings.php:115 actions/register.php:453 +#: lib/applicationeditform.php:230 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" @@ -2697,7 +2909,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 "" @@ -2710,7 +2922,7 @@ msgstr "Onay kodu hatası." msgid "Registration successful" msgstr "" -#: actions/register.php:114 actions/register.php:502 lib/action.php:457 +#: actions/register.php:114 actions/register.php:503 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Kayıt" @@ -2723,59 +2935,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 " @@ -2784,7 +2992,7 @@ msgstr "" "bu özel veriler haricinde: parola, eposta adresi, IM adresi, telefon " "numarası." -#: actions/register.php:537 +#: actions/register.php:538 #, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -2803,7 +3011,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.)" @@ -2950,6 +3158,84 @@ msgstr "Bize o profili yollamadınız" msgid "User is already sandboxed." msgstr "Kullanıcının profili yok." +#: actions/showapplication.php:82 +msgid "You must be logged in to view an application." +msgstr "" + +#: actions/showapplication.php:158 +#, fuzzy +msgid "Application profile" +msgstr "Bu durum mesajının ait oldugu kullanıcı profili yok" + +#: actions/showapplication.php:160 lib/applicationeditform.php:182 +msgid "Icon" +msgstr "" + +#: actions/showapplication.php:170 actions/version.php:195 +#: lib/applicationeditform.php:197 +#, fuzzy +msgid "Name" +msgstr "Takma ad" + +#: actions/showapplication.php:179 lib/applicationeditform.php:224 +#, fuzzy +msgid "Organization" +msgstr "Yer" + +#: actions/showapplication.php:188 actions/version.php:198 +#: lib/applicationeditform.php:211 lib/groupeditform.php:172 +#, fuzzy +msgid "Description" +msgstr "Abonelikler" + +#: actions/showapplication.php:193 actions/showgroup.php:429 +#: lib/profileaction.php:174 +msgid "Statistics" +msgstr "Ä°statistikler" + +#: actions/showapplication.php:204 +#, php-format +msgid "created by %1$s - %2$s access by default - %3$d users" +msgstr "" + +#: actions/showapplication.php:214 +msgid "Application actions" +msgstr "" + +#: actions/showapplication.php:233 +msgid "Reset key & secret" +msgstr "" + +#: actions/showapplication.php:241 +msgid "Application info" +msgstr "" + +#: actions/showapplication.php:243 +msgid "Consumer key" +msgstr "" + +#: actions/showapplication.php:248 +msgid "Consumer secret" +msgstr "" + +#: actions/showapplication.php:253 +msgid "Request token URL" +msgstr "" + +#: actions/showapplication.php:258 +msgid "Access token URL" +msgstr "" + +#: actions/showapplication.php:263 +msgid "Authorize URL" +msgstr "" + +#: actions/showapplication.php:268 +msgid "" +"Note: We support HMAC-SHA1 signatures. We do not support the plaintext " +"signature method." +msgstr "" + #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "" @@ -3050,7 +3336,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 "" @@ -3058,10 +3344,6 @@ msgstr "" msgid "All members" msgstr "" -#: actions/showgroup.php:429 lib/profileaction.php:174 -msgid "Statistics" -msgstr "Ä°statistikler" - #: actions/showgroup.php:432 #, fuzzy msgid "Created" @@ -3202,12 +3484,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 @@ -3395,8 +3677,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 @@ -3425,7 +3708,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 @@ -3675,10 +3958,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" @@ -3879,11 +4158,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" @@ -3961,11 +4235,6 @@ msgstr "" msgid "Plugins" msgstr "" -#: actions/version.php:195 -#, fuzzy -msgid "Name" -msgstr "Takma ad" - #: actions/version.php:196 lib/action.php:741 #, fuzzy msgid "Version" @@ -3975,28 +4244,43 @@ msgstr "KiÅŸisel" msgid "Author(s)" msgstr "" -#: actions/version.php:198 lib/groupeditform.php:172 -#, fuzzy -msgid "Description" -msgstr "Abonelikler" - -#: classes/File.php:137 +#: 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/Group_member.php:41 +#, fuzzy +msgid "Group join failed." +msgstr "Böyle bir durum mesajı yok." + +#: classes/Group_member.php:53 +#, fuzzy +msgid "Not part of group." +msgstr "Kullanıcı güncellenemedi." + +#: classes/Group_member.php:60 +#, fuzzy +msgid "Group leave failed." +msgstr "Böyle bir durum mesajı yok." + +#: 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 "" @@ -4009,51 +4293,51 @@ msgstr "" msgid "Could not update message with new URI." msgstr "" -#: classes/Notice.php:172 +#: classes/Notice.php:171 #, php-format msgid "DB error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:226 +#: classes/Notice.php:225 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Durum mesajını kaydederken hata oluÅŸtu." -#: classes/Notice.php:230 +#: classes/Notice.php:229 #, fuzzy msgid "Problem saving notice. Unknown user." msgstr "Durum mesajını kaydederken hata oluÅŸtu." -#: classes/Notice.php:235 +#: classes/Notice.php:234 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:241 +#: classes/Notice.php:240 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:247 +#: classes/Notice.php:246 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:309 classes/Notice.php:334 +#: classes/Notice.php:305 classes/Notice.php:330 msgid "Problem saving notice." msgstr "Durum mesajını kaydederken hata oluÅŸtu." -#: classes/Notice.php:1034 +#: classes/Notice.php:1052 #, php-format msgid "DB error inserting reply: %s" msgstr "Cevap eklenirken veritabanı hatası: %s" -#: classes/Notice.php:1359 +#: classes/Notice.php:1423 #, php-format msgid "RT @%1$s %2$s" msgstr "" -#: classes/User.php:368 +#: classes/User.php:382 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" @@ -4098,6 +4382,11 @@ msgstr "" msgid "Other options" msgstr "" +#: lib/action.php:144 +#, 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 "" @@ -4114,11 +4403,6 @@ msgstr "BaÅŸlangıç" msgid "Personal profile and friends timeline" msgstr "" -#: lib/action.php:435 -#, fuzzy -msgid "Account" -msgstr "Hakkında" - #: lib/action.php:435 msgid "Change your email, avatar, password, profile" msgstr "" @@ -4283,10 +4567,6 @@ msgstr "« Sonra" msgid "Before" msgstr "Önce »" -#: lib/action.php:1167 -msgid "There was a problem with your session token." -msgstr "" - #: lib/adminpanelaction.php:96 msgid "You cannot make changes to this site." msgstr "" @@ -4322,6 +4602,74 @@ msgstr "Eposta adresi onayı" msgid "Paths configuration" msgstr "Eposta adresi onayı" +#: lib/applicationeditform.php:186 +msgid "Icon for this application" +msgstr "" + +#: lib/applicationeditform.php:206 +#, fuzzy, php-format +msgid "Describe your application in %d characters" +msgstr "Kendinizi ve ilgi alanlarınızı 140 karakter ile anlatın" + +#: lib/applicationeditform.php:209 +#, fuzzy +msgid "Describe your application" +msgstr "Kendinizi ve ilgi alanlarınızı 140 karakter ile anlatın" + +#: lib/applicationeditform.php:218 +#, fuzzy +msgid "Source URL" +msgstr "Kaynak" + +#: lib/applicationeditform.php:220 +#, fuzzy +msgid "URL of the homepage of this application" +msgstr "" +"Web Sitenizin, blogunuzun ya da varsa baÅŸka bir sitedeki profilinizin adresi" + +#: lib/applicationeditform.php:226 +msgid "Organization responsible for this application" +msgstr "" + +#: lib/applicationeditform.php:232 +#, fuzzy +msgid "URL for the homepage of the organization" +msgstr "" +"Web Sitenizin, blogunuzun ya da varsa baÅŸka bir sitedeki profilinizin adresi" + +#: lib/applicationeditform.php:238 +msgid "URL to redirect to after authentication" +msgstr "" + +#: lib/applicationeditform.php:260 +msgid "Browser" +msgstr "" + +#: lib/applicationeditform.php:276 +msgid "Desktop" +msgstr "" + +#: lib/applicationeditform.php:277 +msgid "Type of application, browser or desktop" +msgstr "" + +#: lib/applicationeditform.php:299 +msgid "Read-only" +msgstr "" + +#: lib/applicationeditform.php:317 +msgid "Read-write" +msgstr "" + +#: lib/applicationeditform.php:318 +msgid "Default access for this application: read-only, or read-write" +msgstr "" + +#: lib/applicationlist.php:154 +#, fuzzy +msgid "Revoke" +msgstr "Kaldır" + #: lib/attachmentlist.php:87 msgid "Attachments" msgstr "" @@ -4343,12 +4691,12 @@ msgstr "" msgid "Tags for this attachment" msgstr "" -#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 +#: lib/authenticationplugin.php:214 lib/authenticationplugin.php:219 #, fuzzy msgid "Password changing failed" msgstr "Parola kaydedildi." -#: lib/authenticationplugin.php:197 +#: lib/authenticationplugin.php:229 #, fuzzy msgid "Password changing is not allowed" msgstr "Parola kaydedildi." @@ -4370,8 +4718,8 @@ msgid "Sorry, this command is not yet implemented." msgstr "" #: lib/command.php:88 -#, fuzzy, php-format -msgid "Could not find a user with nickname %s." +#, php-format +msgid "Could not find a user with nickname %s" msgstr "Kullanıcı güncellenemedi." #: lib/command.php:92 @@ -4379,9 +4727,9 @@ msgid "It does not make a lot of sense to nudge yourself!" msgstr "" #: lib/command.php:99 -#, php-format -msgid "Nudge sent to %s." -msgstr "" +#, fuzzy, php-format +msgid "Nudge sent to %s" +msgstr "%s için cevaplar" #: lib/command.php:126 #, php-format @@ -4391,167 +4739,192 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:399 lib/command.php:460 -msgid "Notice with that id does not exist." +#: lib/command.php:152 lib/command.php:390 lib/command.php:451 +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 +#: lib/command.php:168 lib/command.php:406 lib/command.php:467 +#: lib/command.php:523 #, fuzzy -msgid "User has no last notice." +msgid "User has no last notice" msgstr "Kullanıcının profili yok." #: lib/command.php:190 msgid "Notice marked as fave." msgstr "" -#: lib/command.php:284 +#: lib/command.php:217 +#, fuzzy +msgid "You are already a member of that group" +msgstr "Zaten giriÅŸ yapmış durumdasıznız!" + +#: lib/command.php:231 #, fuzzy, php-format -msgid "Could not remove user %1$s to group %2$s." +msgid "Could not join user %s to group %s" +msgstr "Sunucuya yönlendirme yapılamadı: %s" + +#: lib/command.php:236 +#, fuzzy, php-format +msgid "%s joined group %s" +msgstr "%1$s'in %2$s'deki durum mesajları " + +#: lib/command.php:275 +#, fuzzy, php-format +msgid "Could not remove user %s to group %s" msgstr "OpenID formu yaratılamadı: %s" -#: lib/command.php:318 -#, php-format -msgid "Fullname: %s" -msgstr "" +#: lib/command.php:280 +#, fuzzy, php-format +msgid "%s left group %s" +msgstr "%1$s'in %2$s'deki durum mesajları " -#: lib/command.php:321 +#: lib/command.php:309 +#, fuzzy, php-format +msgid "Fullname: %s" +msgstr "Tam Ä°sim" + +#: lib/command.php:312 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "" -#: lib/command.php:324 +#: lib/command.php:315 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "" -#: lib/command.php:327 +#: lib/command.php:318 #, php-format msgid "About: %s" msgstr "" -#: lib/command.php:358 +#: lib/command.php:349 #, php-format -msgid "Message too long - maximum is %1$d characters, you sent %2$d." +msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:376 +#: lib/command.php:367 #, php-format -msgid "Direct message to %s sent." +msgid "Direct message to %s sent" msgstr "" -#: lib/command.php:378 +#: lib/command.php:369 msgid "Error sending direct message." msgstr "" -#: lib/command.php:435 +#: lib/command.php:413 +#, fuzzy +msgid "Cannot repeat your own notice" +msgstr "EÄŸer lisansı kabul etmezseniz kayıt olamazsınız." + +#: lib/command.php:418 +#, fuzzy +msgid "Already repeated that notice" +msgstr "Zaten giriÅŸ yapmış durumdasıznız!" + +#: lib/command.php:426 #, fuzzy, php-format -msgid "Notice from %s repeated." +msgid "Notice from %s repeated" msgstr "Durum mesajları" -#: lib/command.php:437 +#: lib/command.php:428 #, fuzzy msgid "Error repeating notice." msgstr "Durum mesajını kaydederken hata oluÅŸtu." -#: lib/command.php:491 +#: lib/command.php:482 #, php-format -msgid "Notice too long - maximum is %1$d characters, you sent %2$d." +msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:500 +#: lib/command.php:491 #, fuzzy, php-format -msgid "Reply to %s sent." +msgid "Reply to %s sent" msgstr "%s için cevaplar" -#: lib/command.php:502 +#: lib/command.php:493 #, fuzzy msgid "Error saving notice." msgstr "Durum mesajını kaydederken hata oluÅŸtu." -#: lib/command.php:556 -msgid "Specify the name of the user to subscribe to." +#: lib/command.php:547 +msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:563 +#: lib/command.php:554 #, php-format msgid "Subscribed to %s" msgstr "" -#: lib/command.php:584 -msgid "Specify the name of the user to unsubscribe from." +#: lib/command.php:575 +msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:591 +#: lib/command.php:582 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:609 lib/command.php:632 +#: lib/command.php:600 lib/command.php:623 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:612 +#: lib/command.php:603 msgid "Notification off." msgstr "" -#: lib/command.php:614 +#: lib/command.php:605 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:635 +#: lib/command.php:626 msgid "Notification on." msgstr "" -#: lib/command.php:637 +#: lib/command.php:628 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:650 -msgid "Login command is disabled." +#: lib/command.php:641 +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:652 #, php-format -msgid "This link is useable only once, and is good for only 2 minutes: %s." +msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:685 +#: lib/command.php:668 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Bize o profili yollamadınız" -#: lib/command.php:687 +#: lib/command.php:670 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:690 #, fuzzy msgid "No one is subscribed to you." msgstr "Uzaktan abonelik" -#: lib/command.php:709 +#: lib/command.php:692 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:712 #, fuzzy msgid "You are not a member of any groups." msgstr "Bize o profili yollamadınız" -#: lib/command.php:731 +#: lib/command.php:714 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:728 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4592,20 +4965,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:199 +#: lib/common.php:131 #, fuzzy msgid "No configuration file found. " msgstr "Onay kodu yok." -#: lib/common.php:200 +#: lib/common.php:132 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:201 +#: lib/common.php:134 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:202 +#: lib/common.php:135 msgid "Go to the installer." msgstr "" @@ -4621,6 +4994,15 @@ msgstr "" msgid "Updates by SMS" msgstr "" +#: lib/connectsettingsaction.php:120 +#, fuzzy +msgid "Connections" +msgstr "BaÄŸlan" + +#: lib/connectsettingsaction.php:121 +msgid "Authorized connected applications" +msgstr "" + #: lib/dberroraction.php:60 msgid "Database error" msgstr "" @@ -4815,11 +5197,16 @@ msgstr "" msgid "kB" msgstr "" -#: lib/jabber.php:191 +#: lib/jabber.php:202 #, php-format msgid "[%s]" msgstr "" +#: lib/jabber.php:385 +#, php-format +msgid "Unknown inbox source %d." +msgstr "" + #: lib/joinform.php:114 #, fuzzy msgid "Join" @@ -4887,22 +5274,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 @@ -5088,7 +5463,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 @@ -5097,7 +5472,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 @@ -5107,7 +5482,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 @@ -5143,16 +5518,18 @@ msgstr "" #: lib/noticeform.php:212 #, fuzzy -msgid "Share my location." -msgstr "Profil kaydedilemedi." - -#: lib/noticeform.php:214 -#, fuzzy -msgid "Do not share my location." +msgid "Share my location" msgstr "Profil kaydedilemedi." #: lib/noticeform.php:215 -msgid "Hide this info" +#, fuzzy +msgid "Do not share my location" +msgstr "Profil kaydedilemedi." + +#: lib/noticeform.php:216 +msgid "" +"Sorry, retrieving your geo location is taking longer than expected, please " +"try again later" msgstr "" #: lib/noticelist.php:428 @@ -5428,25 +5805,25 @@ msgstr "" msgid "User has blocked you." msgstr "Kullanıcının profili yok." -#: lib/subs.php:60 +#: lib/subs.php:63 msgid "Could not subscribe." msgstr "" -#: lib/subs.php:79 +#: lib/subs.php:82 msgid "Could not subscribe other to you." msgstr "" -#: lib/subs.php:128 +#: lib/subs.php:137 #, fuzzy msgid "Not subscribed!" msgstr "Bu kullanıcıyı zaten takip etmiyorsunuz!" -#: lib/subs.php:133 +#: lib/subs.php:142 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "Abonelik silinemedi." -#: lib/subs.php:146 +#: lib/subs.php:158 msgid "Couldn't delete subscription." msgstr "Abonelik silinemedi." @@ -5460,10 +5837,6 @@ msgstr "" msgid "People Tagcloud as tagged" msgstr "" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "" - #: lib/tagcloudsection.php:56 msgid "None" msgstr "" @@ -5528,47 +5901,47 @@ msgstr "" msgid "Moderate" msgstr "" -#: lib/util.php:837 +#: lib/util.php:875 msgid "a few seconds ago" msgstr "birkaç saniye önce" -#: lib/util.php:839 +#: lib/util.php:877 msgid "about a minute ago" msgstr "yaklaşık bir dakika önce" -#: lib/util.php:841 +#: lib/util.php:879 #, php-format msgid "about %d minutes ago" msgstr "yaklaşık %d dakika önce" -#: lib/util.php:843 +#: lib/util.php:881 msgid "about an hour ago" msgstr "yaklaşık bir saat önce" -#: lib/util.php:845 +#: lib/util.php:883 #, php-format msgid "about %d hours ago" msgstr "yaklaşık %d saat önce" -#: lib/util.php:847 +#: lib/util.php:885 msgid "about a day ago" msgstr "yaklaşık bir gün önce" -#: lib/util.php:849 +#: lib/util.php:887 #, php-format msgid "about %d days ago" msgstr "yaklaşık %d gün önce" -#: lib/util.php:851 +#: lib/util.php:889 msgid "about a month ago" msgstr "yaklaşık bir ay önce" -#: lib/util.php:853 +#: lib/util.php:891 #, php-format msgid "about %d months ago" msgstr "yaklaşık %d ay önce" -#: lib/util.php:855 +#: lib/util.php:893 msgid "about a year ago" msgstr "yaklaşık bir yıl önce" @@ -5584,5 +5957,5 @@ msgstr "" #: scripts/xmppdaemon.php:301 #, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po index 5c2a8771d3..4d8de517c5 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-10 00:46+0000\n" -"PO-Revision-Date: 2010-01-10 00:49:16+0000\n" +"POT-Creation-Date: 2010-01-15 19:15+0000\n" +"PO-Revision-Date: 2010-01-16 17:53:16+0000\n" "Language-Team: Ukrainian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60878); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r61138); 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" @@ -36,25 +36,30 @@ msgstr "Ðемає такої Ñторінки" #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 +#: actions/apistatusesupdate.php:149 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 #: 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 #: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 -#: lib/command.php:163 lib/command.php:311 lib/command.php:364 -#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/command.php:163 lib/command.php:302 lib/command.php:355 +#: lib/command.php:401 lib/command.php:462 lib/command.php:518 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/subs.php:34 lib/subs.php:125 msgid "No such user." msgstr "Такого кориÑтувача немає." +#: actions/all.php:84 +#, php-format +msgid "%1$s and friends, page %2$d" +msgstr "%1$s та друзі, Ñторінка %2$d" + #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 +#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -91,13 +96,13 @@ msgstr "" "або напишіть щоÑÑŒ Ñамі." #: actions/all.php:134 -#, fuzzy, php-format +#, php-format msgid "" "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 @@ -112,7 +117,7 @@ msgstr "" msgid "You and friends" msgstr "Ви з друзÑми" -#: actions/allrss.php:119 actions/apitimelinefriends.php:122 +#: actions/allrss.php:119 actions/apitimelinefriends.php:121 #: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" @@ -123,6 +128,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:155 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 метод не знайдено." @@ -136,7 +158,7 @@ msgstr "API метод не знайдено." #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:114 +#: actions/apistatusesupdate.php:119 msgid "This method requires a POST." msgstr "Цей метод потребує POST." @@ -166,8 +188,9 @@ msgstr "Ðе вдалоÑÑ Ð·Ð±ÐµÑ€ÐµÐ³Ñ‚Ð¸ профіль." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257 -#: actions/designadminpanel.php:122 actions/newnotice.php:94 +#: actions/apistatusesupdate.php:132 actions/avatarsettings.php:257 +#: actions/designadminpanel.php:122 actions/editapplication.php:118 +#: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format msgid "" @@ -181,6 +204,9 @@ msgstr "" #: actions/apiaccountupdateprofilebackgroundimage.php:146 #: actions/apiaccountupdateprofilecolors.php:164 #: actions/apiaccountupdateprofilecolors.php:174 +#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 +#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 +#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 msgid "Unable to save your design settings." msgstr "Ðе маю можливоÑÑ‚Ñ– зберегти Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð´Ð¸Ð·Ð°Ð¹Ð½Ñƒ." @@ -221,26 +247,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,16 +271,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." @@ -294,8 +300,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." @@ -329,7 +335,8 @@ msgstr "Це Ñ–Ð¼â€™Ñ Ð²Ð¶Ðµ викориÑтовуєтьÑÑ. Спробуйт msgid "Not a valid nickname." msgstr "Це недійÑне Ñ–Ð¼â€™Ñ ÐºÐ¾Ñ€Ð¸Ñтувача." -#: actions/apigroupcreate.php:196 actions/editgroup.php:195 +#: actions/apigroupcreate.php:196 actions/editapplication.php:212 +#: actions/editgroup.php:195 actions/newapplication.php:200 #: actions/newgroup.php:139 actions/profilesettings.php:222 #: actions/register.php:217 msgid "Homepage is not a valid URL." @@ -341,7 +348,8 @@ msgstr "Веб-Ñторінка має недійÑну URL-адреÑу." msgid "Full name is too long (max 255 chars)." msgstr "Повне Ñ–Ð¼â€™Ñ Ð·Ð°Ð´Ð¾Ð²Ð³Ðµ (255 знаків макÑимум)" -#: actions/apigroupcreate.php:213 +#: actions/apigroupcreate.php:213 actions/editapplication.php:187 +#: actions/newapplication.php:169 #, php-format msgid "Description is too long (max %d chars)." msgstr "ÐžÐ¿Ð¸Ñ Ð½Ð°Ð´Ñ‚Ð¾ довгий (%d знаків макÑимум)." @@ -381,7 +389,7 @@ msgstr "Додаткове Ñ–Ð¼â€™Ñ Ð½Ðµ може бути таким Ñами msgid "Group not found!" msgstr "Групу не знайдено!" -#: actions/apigroupjoin.php:110 lib/command.php:217 +#: actions/apigroupjoin.php:110 actions/joingroup.php:90 msgid "You are already a member of that group." msgstr "Ви вже Ñ” учаÑником цієї групи." @@ -389,19 +397,19 @@ msgstr "Ви вже Ñ” учаÑником цієї групи." msgid "You have been blocked from that group by the admin." msgstr "Ðдмін цієї групи заблокував Вашу приÑутніÑÑ‚ÑŒ в ній." -#: actions/apigroupjoin.php:138 lib/command.php:234 -#, fuzzy, php-format +#: actions/apigroupjoin.php:138 actions/joingroup.php:124 +#, php-format msgid "Could not join user %1$s to group %2$s." -msgstr "Ðе вдалоÑÑŒ долучити кориÑтувача %s до групи %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/leavegroup.php:127 -#, fuzzy, php-format +#: actions/apigroupleave.php:124 actions/leavegroup.php:119 +#, php-format msgid "Could not remove user %1$s from group %2$s." -msgstr "Ðе вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ кориÑтувача %s з групи %s." +msgstr "Ðе вдалоÑÑŒ видалити кориÑтувача %1$s з групи %2$s." #: actions/apigrouplist.php:95 #, php-format @@ -418,6 +426,100 @@ msgstr "%s групи" msgid "groups on %s" msgstr "групи на %s" +#: actions/apioauthauthorize.php:108 actions/apioauthauthorize.php:114 +msgid "Bad request." +msgstr "Ðевірний запит." + +#: actions/apioauthauthorize.php:134 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:115 actions/makeadmin.php:66 +#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 +#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:139 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 +#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/subscribe.php:46 actions/tagother.php:166 +#: 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 "" +"Виникли певні проблеми з токеном поточної ÑеÑÑ–Ñ—. Спробуйте знов, будь лаÑка." + +#: actions/apioauthauthorize.php:146 +msgid "Invalid nickname / password!" +msgstr "ÐедійÑне Ñ–Ð¼â€™Ñ / пароль!" + +#: actions/apioauthauthorize.php:170 +msgid "DB error deleting OAuth app user." +msgstr "Помилка бази даних при видаленні OAuth кориÑтувача." + +#: actions/apioauthauthorize.php:196 +msgid "DB error inserting OAuth app user." +msgstr "Помилка бази даних при додаванні OAuth кориÑтувача." + +#: actions/apioauthauthorize.php:231 +#, php-format +msgid "" +"The request token %s has been authorized. Please exchange it for an access " +"token." +msgstr "" +"Токен запиту %s було авторизовано. Будь лаÑка, обмінÑйте його на токен " +"доÑтупу." + +#: actions/apioauthauthorize.php:241 +#, php-format +msgid "The request token %s has been denied." +msgstr "Токен запиту %s було відхилено." + +#: actions/apioauthauthorize.php:246 actions/avatarsettings.php:281 +#: actions/designadminpanel.php:103 actions/editapplication.php:139 +#: actions/emailsettings.php:256 actions/grouplogo.php:319 +#: actions/imsettings.php:220 actions/newapplication.php:121 +#: actions/oauthconnectionssettings.php:151 actions/recoverpassword.php:44 +#: actions/smssettings.php:248 lib/designsettings.php:304 +msgid "Unexpected form submission." +msgstr "ÐеÑподіване предÑÑ‚Ð°Ð²Ð»ÐµÐ½Ð½Ñ Ñ„Ð¾Ñ€Ð¼Ð¸." + +#: actions/apioauthauthorize.php:273 +msgid "An application would like to connect to your account" +msgstr "Запит на дозвіл під’єднатиÑÑ Ð´Ð¾ Вашого облікового запиÑу" + +#: actions/apioauthauthorize.php:290 +msgid "Allow or deny access" +msgstr "Дозволити або заборонити доÑтуп" + +#: actions/apioauthauthorize.php:320 lib/action.php:435 +msgid "Account" +msgstr "Ðкаунт" + +#: actions/apioauthauthorize.php:323 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/apioauthauthorize.php:326 actions/login.php:233 +#: actions/register.php:429 lib/accountsettingsaction.php:116 +msgid "Password" +msgstr "Пароль" + +#: actions/apioauthauthorize.php:338 +msgid "Deny" +msgstr "Відхилити" + +#: actions/apioauthauthorize.php:344 +msgid "Allow" +msgstr "Дозволити" + +#: actions/apioauthauthorize.php:361 +msgid "Allow or deny access to your account information." +msgstr "Дозволити або заборонити доÑтуп до Вашого облікового запиÑу." + #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." msgstr "Цей метод потребує або ÐÐПИСÐТИ, або ВИДÐЛИТИ." @@ -431,11 +533,11 @@ msgstr "Ви не можете видалити ÑÑ‚Ð°Ñ‚ÑƒÑ Ñ–Ð½ÑˆÐ¾Ð³Ð¾ кор msgid "No such notice." msgstr "Такого допиÑу немає." -#: actions/apistatusesretweet.php:83 lib/command.php:422 +#: actions/apistatusesretweet.php:83 msgid "Cannot repeat your own notice." msgstr "Ðе можу вторувати Вашому влаÑному допиÑу." -#: actions/apistatusesretweet.php:91 lib/command.php:427 +#: actions/apistatusesretweet.php:91 msgid "Already repeated that notice." msgstr "Цьому допиÑу вже вторували." @@ -447,17 +549,17 @@ msgstr "Ð¡Ñ‚Ð°Ñ‚ÑƒÑ Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð¾." msgid "No status with that ID found." msgstr "Ðе знайдено жодних ÑтатуÑів з таким ID." -#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:162 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Ðадто довго. МакÑимальний розмір допиÑу — %d знаків." -#: actions/apistatusesupdate.php:198 +#: actions/apistatusesupdate.php:203 msgid "Not found" msgstr "Ðе знайдено" -#: actions/apistatusesupdate.php:221 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:226 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -469,14 +571,14 @@ msgid "Unsupported format." msgstr "Формат не підтримуєтьÑÑ." #: actions/apitimelinefavorites.php:108 -#, fuzzy, php-format +#, php-format msgid "%1$s / Favorites from %2$s" -msgstr "%s / Обрані від %s" +msgstr "%1$s / Обрані від %2$s" #: actions/apitimelinefavorites.php:120 -#, fuzzy, php-format +#, php-format msgid "%1$s updates favorited by %2$s / %2$s." -msgstr "%s Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð¾Ð±Ñ€Ð°Ð½Ð¸Ñ… від %s / %s." +msgstr "%1$s Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð¾Ð±Ñ€Ð°Ð½Ð¸Ñ… від %2$s / %2$s." #: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 #: actions/grouprss.php:131 actions/userrss.php:90 @@ -543,8 +645,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 "Ðемає імені." @@ -567,8 +672,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 "КориÑтувач з невідповідним профілем" @@ -600,30 +705,6 @@ 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/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 -#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 -#: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 -#: actions/subscribe.php:46 actions/tagother.php:166 -#: 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 "" -"Виникли певні проблеми з токеном поточної ÑеÑÑ–Ñ—. Спробуйте знов, будь лаÑка." - -#: actions/avatarsettings.php:281 actions/designadminpanel.php:103 -#: actions/emailsettings.php:256 actions/grouplogo.php:319 -#: actions/imsettings.php:220 actions/recoverpassword.php:44 -#: actions/smssettings.php:248 lib/designsettings.php:304 -msgid "Unexpected form submission." -msgstr "ÐеÑподіване предÑÑ‚Ð°Ð²Ð»ÐµÐ½Ð½Ñ Ñ„Ð¾Ñ€Ð¼Ð¸." - #: actions/avatarsettings.php:328 msgid "Pick a square area of the image to be your avatar" msgstr "Оберіть квадратну ділÑнку зображеннÑ, Ñка й буде Вашою автарою." @@ -685,19 +766,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:260 +msgid "No such group." +msgstr "Такої групи немає." #: actions/blockedfromgroup.php:90 #, php-format @@ -705,9 +782,9 @@ msgid "%s blocked profiles" msgstr "Заблоковані профілі %s" #: actions/blockedfromgroup.php:93 -#, fuzzy, php-format +#, php-format msgid "%1$s blocked profiles, page %2$d" -msgstr "Заблоковані профілі %s, Ñторінка %d" +msgstr "Заблоковані профілі %1$s, Ñторінка %2$d" #: actions/blockedfromgroup.php:108 msgid "A list of the users blocked from joining this group." @@ -764,7 +841,7 @@ msgid "Couldn't delete email confirmation." msgstr "Ðе вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ Ð¿Ñ–Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¶ÐµÐ½Ð½Ñ Ð¿Ð¾ÑˆÑ‚Ð¾Ð²Ð¾Ñ— адреÑи." #: actions/confirmaddress.php:144 -msgid "Confirm Address" +msgid "Confirm address" msgstr "Підтвердити адреÑу" #: actions/confirmaddress.php:159 @@ -817,11 +894,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 "Ви не можете видалÑти кориÑтувачів." @@ -955,7 +1027,8 @@ msgstr "ПовернутиÑÑŒ до початкових налаштувань" #: actions/pathsadminpanel.php:324 actions/profilesettings.php:174 #: actions/siteadminpanel.php:388 actions/smssettings.php:181 #: actions/subscriptions.php:203 actions/tagother.php:154 -#: actions/useradminpanel.php:313 lib/designsettings.php:256 +#: actions/useradminpanel.php:313 lib/applicationeditform.php:335 +#: lib/applicationeditform.php:336 lib/designsettings.php:256 #: lib/groupeditform.php:202 msgid "Save" msgstr "Зберегти" @@ -976,6 +1049,76 @@ msgstr "Додати до обраних" msgid "No such document." msgstr "Такого документа немає." +#: actions/editapplication.php:54 lib/applicationeditform.php:136 +msgid "Edit application" +msgstr "Керувати додатками" + +#: actions/editapplication.php:66 +msgid "You must be logged in to edit an application." +msgstr "Ви маєте Ñпочатку увійти, аби мати змогу керувати додатком." + +#: actions/editapplication.php:77 actions/showapplication.php:94 +msgid "You are not the owner of this application." +msgstr "Ви не Ñ” влаÑником цього додатку." + +#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:163 +#: actions/showapplication.php:87 +msgid "No such application." +msgstr "Такого додатку немає." + +#: actions/editapplication.php:127 actions/newapplication.php:110 +#: actions/showapplication.php:118 lib/action.php:1167 +msgid "There was a problem with your session token." +msgstr "Виникли певні проблеми з токеном поточної ÑеÑÑ–Ñ—." + +#: actions/editapplication.php:161 +msgid "Use this form to edit your application." +msgstr "СкориÑтайтеÑÑŒ цією формою, щоб відредагувати додаток." + +#: actions/editapplication.php:177 actions/newapplication.php:159 +msgid "Name is required." +msgstr "Потрібне ім’Ñ." + +#: actions/editapplication.php:180 actions/newapplication.php:162 +msgid "Name is too long (max 255 chars)." +msgstr "Ð†Ð¼â€™Ñ Ð·Ð°Ð´Ð¾Ð²Ð³Ðµ (255 знаків макÑимум)." + +#: actions/editapplication.php:183 actions/newapplication.php:165 +msgid "Description is required." +msgstr "Потрібен опиÑ." + +#: actions/editapplication.php:191 +msgid "Source URL is too long." +msgstr "URL-адреÑа надто довга." + +#: actions/editapplication.php:197 actions/newapplication.php:182 +msgid "Source URL is not valid." +msgstr "URL-адреÑа не Ñ” дійÑною." + +#: actions/editapplication.php:200 actions/newapplication.php:185 +msgid "Organization is required." +msgstr "Потрібна організаціÑ." + +#: actions/editapplication.php:203 actions/newapplication.php:188 +msgid "Organization is too long (max 255 chars)." +msgstr "Ðазва організації надто довга (255 знаків макÑимум)." + +#: actions/editapplication.php:206 actions/newapplication.php:191 +msgid "Organization homepage is required." +msgstr "Потрібна Ð´Ð¾Ð¼Ð°ÑˆÐ½Ñ Ñторінка організації." + +#: actions/editapplication.php:215 actions/newapplication.php:203 +msgid "Callback is too long." +msgstr "Форма зворотнього дзвінка надто довга." + +#: actions/editapplication.php:222 actions/newapplication.php:212 +msgid "Callback URL is not valid." +msgstr "URL-адреÑа Ð´Ð»Ñ Ð·Ð²Ð¾Ñ€Ð¾Ñ‚Ð½ÑŒÐ¾Ð³Ð¾ дзвінка не Ñ” дійÑною." + +#: actions/editapplication.php:255 +msgid "Could not update application." +msgstr "Ðе вдалоÑÑ Ð¾Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ додаток." + #: actions/editgroup.php:56 #, php-format msgid "Edit %s group" @@ -987,7 +1130,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 @@ -1012,7 +1155,7 @@ msgid "Options saved." msgstr "Опції збережено." #: actions/emailsettings.php:60 -msgid "Email Settings" +msgid "Email settings" msgstr "ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ð¾ÑˆÑ‚Ð¸" #: actions/emailsettings.php:71 @@ -1044,12 +1187,13 @@ msgstr "" "Ñпамом також!), там має бути Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð· подальшими інÑтрукціÑми." #: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 +#: actions/smssettings.php:126 lib/applicationeditform.php:333 +#: lib/applicationeditform.php:334 msgid "Cancel" msgstr "СкаÑувати" #: actions/emailsettings.php:121 -msgid "Email Address" +msgid "Email address" msgstr "Електронна адреÑа" #: actions/emailsettings.php:123 @@ -1123,9 +1267,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." @@ -1306,13 +1451,6 @@ 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:79 msgid "No such file." msgstr "Такого файлу немає." @@ -1329,7 +1467,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." @@ -1355,15 +1493,15 @@ msgid "Block user from group" msgstr "Блокувати кориÑтувача в групі" #: actions/groupblock.php:162 -#, fuzzy, php-format +#, php-format msgid "" "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " "will be removed from the group, unable to post, and unable to subscribe to " "the group in the future." msgstr "" -"Впевнені, що бажаєте блокувати кориÑтувача \"%s\" у групі \"%s\"? Його буде " -"позбавлено членÑтва у групі, він не зможе Ñюди пиÑати, а також не зможе " -"знову вÑтупити до групи." +"Впевнені, що бажаєте блокувати кориÑтувача «%1$s» у групі «%2$s»? Його буде " +"позбавлено членÑтва в групі, він не зможе Ñюди пиÑати, Ñ– не зможе вÑтупити " +"до групи знов." #: actions/groupblock.php:178 msgid "Do not block this user from this group" @@ -1377,9 +1515,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." @@ -1402,12 +1540,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 "Преференції дизайну збережно." @@ -1424,6 +1556,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 "Оберіть квадратну ділÑнку зображеннÑ, Ñка й буде логотипом групи." @@ -1442,9 +1578,9 @@ msgid "%s group members" msgstr "УчаÑники групи %s" #: actions/groupmembers.php:96 -#, fuzzy, php-format +#, php-format msgid "%1$s group members, page %2$d" -msgstr "УчаÑники групи %s, Ñторінка %d" +msgstr "УчаÑники групи %1$s, Ñторінка %2$d" #: actions/groupmembers.php:111 msgid "A list of the users in this group." @@ -1554,8 +1690,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 @@ -1585,8 +1721,8 @@ msgstr "" "Вашого ÑпиÑку контактів?)" #: actions/imsettings.php:124 -msgid "IM Address" -msgstr "ÐдреÑа IM" +msgid "IM address" +msgstr "ІМ-адреÑа" #: actions/imsettings.php:126 #, php-format @@ -1685,7 +1821,7 @@ msgstr "ЗапроÑити нових кориÑтувачів" msgid "You are already subscribed to these users:" msgstr "Ви вже підпиÑані до цих кориÑтувачів:" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:315 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -1731,7 +1867,7 @@ msgstr "ОÑобиÑÑ‚Ñ– повідомленнÑ" msgid "Optionally add a personal message to the invitation." msgstr "Можна додати перÑональне Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð´Ð¾ Ð·Ð°Ð¿Ñ€Ð¾ÑˆÐµÐ½Ð½Ñ (опціонально)." -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236 msgid "Send" msgstr "Так!" @@ -1802,88 +1938,60 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "Ви повинні Ñпочатку увійти на Ñайт, аби приєднатиÑÑ Ð´Ð¾ групи." -#: actions/joingroup.php:90 -msgid "You are already a member of that group" -msgstr "Ви вже Ñ” учаÑником цієї групи" - -#: actions/joingroup.php:128 -#, fuzzy, php-format -msgid "Could not join user %1$s to group %2$s" -msgstr "КориÑтувачеві %s не вдалоÑÑŒ приєднатиÑÑŒ до групи %s" - -#: actions/joingroup.php:135 lib/command.php:239 -#, fuzzy, php-format +#: actions/joingroup.php:131 +#, php-format msgid "%1$s joined group %2$s" -msgstr "%s приєднавÑÑ Ð´Ð¾ групи %s" +msgstr "%1$s приєднавÑÑ Ð´Ð¾ групи %2$s" #: actions/leavegroup.php:60 msgid "You must be logged in to leave a group." msgstr "Ви повинні Ñпочатку увійти на Ñайт, аби залишити групу." -#: actions/leavegroup.php:90 lib/command.php:268 +#: actions/leavegroup.php:90 lib/command.php:265 msgid "You are not a member of that group." msgstr "Ви не Ñ” учаÑником цієї групи." -#: actions/leavegroup.php:119 lib/command.php:278 -msgid "Could not find membership record." -msgstr "Ðе вдалоÑÑ Ð·Ð½Ð°Ð¹Ñ‚Ð¸ Ð·Ð°Ð¿Ð¸Ñ Ñ‰Ð¾Ð´Ð¾ членÑтва." - -#: actions/leavegroup.php:134 lib/command.php:289 -#, fuzzy, php-format +#: actions/leavegroup.php:127 +#, php-format msgid "%1$s left group %2$s" -msgstr "%s залишив групу %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:460 +#: 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 -#: lib/groupeditform.php:152 lib/userprofile.php:131 -msgid "Nickname" -msgstr "Ð†Ð¼â€™Ñ ÐºÐ¾Ñ€Ð¸Ñтувача" - -#: actions/login.php:253 actions/register.php:428 -#: 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." @@ -1891,7 +1999,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]" @@ -1906,24 +2014,44 @@ msgstr "" "Лише кориÑтувач з правами адмініÑтратора може призначити інших адмінів групи." #: actions/makeadmin.php:95 -#, fuzzy, php-format +#, php-format msgid "%1$s is already an admin for group \"%2$s\"." -msgstr "%s вже Ñ” адміном у групі \"%s\"." +msgstr "%1$s вже Ñ” адміном у групі «%2$s»." #: actions/makeadmin.php:132 -#, fuzzy, php-format -msgid "Can't get membership record for %1$s in group %2$s" -msgstr "Ðеможна отримати Ð·Ð°Ð¿Ð¸Ñ Ð´Ð»Ñ %s щодо членÑтва у групі %s" +#, php-format +msgid "Can't get membership record for %1$s in group %2$s." +msgstr "Ðе можна отримати Ð·Ð°Ð¿Ð¸Ñ Ð´Ð»Ñ %1$s щодо членÑтва у групі %2$s." #: actions/makeadmin.php:145 -#, fuzzy, php-format -msgid "Can't make %1$s an admin for group %2$s" -msgstr "Ðеможна %s надати права адміна у групі %s" +#, php-format +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 "ÐÑ–Ñкого поточного ÑтатуÑу" +#: actions/newapplication.php:52 +msgid "New application" +msgstr "Ðовий додаток" + +#: actions/newapplication.php:64 +msgid "You must be logged in to register an application." +msgstr "Ви маєте Ñпочатку увійти, аби мати змогу зареєÑтрувати додаток." + +#: actions/newapplication.php:143 +msgid "Use this form to register a new application." +msgstr "СкориÑтайтеÑÑŒ цією формою, щоб зареєÑтрувати новий додаток." + +#: actions/newapplication.php:173 +msgid "Source URL is required." +msgstr "Потрібна URL-адреÑа." + +#: actions/newapplication.php:255 actions/newapplication.php:264 +msgid "Could not create application." +msgstr "Ðе вдалоÑÑ Ñтворити додаток." + #: actions/newgroup.php:53 msgid "New group" msgstr "Ðова група" @@ -1936,12 +2064,12 @@ msgstr "СкориÑтайтеÑÑŒ цією формою Ð´Ð»Ñ Ñтворенн msgid "New message" msgstr "Ðове повідомленнÑ" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 msgid "You can't send a message to this user." msgstr "Ви не можете надіÑлати Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ñ†ÑŒÐ¾Ð¼Ñƒ кориÑтувачеві." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:484 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 +#: lib/command.php:475 msgid "No content!" msgstr "Ðемає зміÑту!" @@ -1949,7 +2077,7 @@ msgstr "Ðемає зміÑту!" msgid "No recipient specified." msgstr "Жодного отримувача не визначено." -#: actions/newmessage.php:164 lib/command.php:370 +#: actions/newmessage.php:164 lib/command.php:361 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -1961,8 +2089,8 @@ msgstr "ÐŸÐ¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð½Ð°Ð´Ñ–Ñлано" #: 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" @@ -1990,9 +2118,9 @@ msgid "Text search" msgstr "Пошук текÑтів" #: actions/noticesearch.php:91 -#, fuzzy, php-format +#, php-format msgid "Search results for \"%1$s\" on %2$s" -msgstr "Результати пошуку Ð´Ð»Ñ \"%s\" на %s" +msgstr "Результати пошуку на запит «%1$s» на %2$s" #: actions/noticesearch.php:121 #, php-format @@ -2037,6 +2165,49 @@ msgstr "Спробу «розштовхати» зараховано" msgid "Nudge sent!" msgstr "Спробу «розштовхати» зараховано!" +#: actions/oauthappssettings.php:59 +msgid "You must be logged in to list your applications." +msgstr "Ви повинні увійти, аби переглÑнути ÑпиÑок Ваших додатків." + +#: actions/oauthappssettings.php:74 +msgid "OAuth applications" +msgstr "Додатки OAuth" + +#: actions/oauthappssettings.php:85 +msgid "Applications you have registered" +msgstr "Додатки, Ñкі Ви зареєÑтрували" + +#: actions/oauthappssettings.php:135 +#, php-format +msgid "You have not registered any applications yet." +msgstr "Поки що Ви не зареєÑтрували жодних додатків." + +#: actions/oauthconnectionssettings.php:71 +msgid "Connected applications" +msgstr "Під’єднані додатки" + +#: actions/oauthconnectionssettings.php:87 +msgid "You have allowed the following applications to access you account." +msgstr "" +"Ви маєте дозволити наÑтупним додаткам доÑтуп до Вашого облікового запиÑу." + +#: actions/oauthconnectionssettings.php:170 +msgid "You are not a user of that application." +msgstr "Ви не Ñ” кориÑтувачем даного додатку." + +#: actions/oauthconnectionssettings.php:180 +msgid "Unable to revoke access for app: " +msgstr "Ðе вдалоÑÑ ÑкаÑувати доÑтуп Ð´Ð»Ñ Ð´Ð¾Ð´Ð°Ñ‚ÐºÑƒ: " + +#: actions/oauthconnectionssettings.php:192 +#, php-format +msgid "You have not authorized any applications to use your account." +msgstr "Ви не дозволили жодним додаткам викориÑтовувати Ваш акаунт." + +#: actions/oauthconnectionssettings.php:205 +msgid "Developers can edit the registration settings for their applications " +msgstr "Розробники можуть змінити Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ñ€ÐµÑ”Ñтрації Ð´Ð»Ñ Ñ—Ñ…Ð½Ñ–Ñ… додатків " + #: actions/oembed.php:79 actions/shownotice.php:100 msgid "Notice has no profile" msgstr "Ð”Ð¾Ð¿Ð¸Ñ Ð½Ðµ має профілю" @@ -2054,8 +2225,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:1038 +#: lib/api.php:1066 lib/api.php:1176 msgid "Not a supported data format." msgstr "Такий формат даних не підтримуєтьÑÑ." @@ -2068,7 +2239,7 @@ msgid "Notice Search" msgstr "Пошук допиÑів" #: actions/othersettings.php:60 -msgid "Other Settings" +msgid "Other settings" msgstr "Інші опції" #: actions/othersettings.php:71 @@ -2099,6 +2270,26 @@ msgstr "Показувати або приховувати дизайни Ñто msgid "URL shortening service is too long (max 50 chars)." msgstr "Ð¡ÐµÑ€Ð²Ñ–Ñ ÑÐºÐ¾Ñ€Ð¾Ñ‡ÐµÐ½Ð½Ñ URL-Ð°Ð´Ñ€ÐµÑ Ð½Ð°Ð´Ñ‚Ð¾ довгий (50 знаків макÑимум)." +#: actions/otp.php:69 +msgid "No user ID specified." +msgstr "ID кориÑтувача не визначено." + +#: 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 #, php-format msgid "Outbox for %s" @@ -2135,7 +2326,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 "Підтвердити" @@ -2297,7 +2488,7 @@ msgid "When to use SSL" msgstr "Тоді викориÑтовувати SSL" #: actions/pathsadminpanel.php:308 -msgid "SSL Server" +msgid "SSL server" msgstr "SSL-Ñервер" #: actions/pathsadminpanel.php:309 @@ -2328,18 +2519,18 @@ msgid "Not a valid people tag: %s" msgstr "Це недійÑний оÑобиÑтий теґ: %s" #: actions/peopletag.php:144 -#, fuzzy, php-format +#, php-format msgid "Users self-tagged with %1$s - page %2$d" -msgstr "КориÑтувачі з оÑобиÑтим теґом %s — Ñторінка %d" +msgstr "КориÑтувачі з оÑобиÑтим теґом %1$s — Ñторінка %2$d" #: actions/postnotice.php:84 msgid "Invalid notice content" msgstr "ÐедійÑний зміÑÑ‚ допиÑу" #: actions/postnotice.php:90 -#, fuzzy, php-format +#, php-format msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’." -msgstr "Ð›Ñ–Ñ†ÐµÐ½Ð·Ñ–Ñ Ð´Ð¾Ð¿Ð¸Ñу ‘%s’ Ñ” неÑуміÑною з ліцензією Ñайту ‘%s’." +msgstr "Ð›Ñ–Ñ†ÐµÐ½Ð·Ñ–Ñ Ð´Ð¾Ð¿Ð¸Ñу «%1$s» Ñ” неÑуміÑною з ліцензією Ñайту «%2$s»." #: actions/profilesettings.php:60 msgid "Profile settings" @@ -2360,42 +2551,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 -#: lib/groupeditform.php:161 +#: actions/profilesettings.php:115 actions/register.php:453 +#: lib/applicationeditform.php:230 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 "Де Ви живете, штибу \"МіÑто, облаÑÑ‚ÑŒ (регіон), країна\"" @@ -2707,7 +2898,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 "" "Пробачте, але лише Ñ‚Ñ–, кого було запрошено, мають змогу зареєÑтруватиÑÑŒ тут." @@ -2720,7 +2911,7 @@ msgstr "Даруйте, помилка у коді запрошеннÑ." msgid "Registration successful" msgstr "РеєÑÑ‚Ñ€Ð°Ñ†Ñ–Ñ ÑƒÑпішна" -#: actions/register.php:114 actions/register.php:502 lib/action.php:457 +#: actions/register.php:114 actions/register.php:503 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "РеєÑтраціÑ" @@ -2733,19 +2924,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. " @@ -2753,42 +2940,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." @@ -2796,8 +2983,8 @@ msgstr "" " окрім цих приватних даних: пароль, електронна адреÑа, адреÑа IM, телефонний " "номер." -#: actions/register.php:537 -#, fuzzy, php-format +#: actions/register.php:538 +#, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " "want to...\n" @@ -2814,15 +3001,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" @@ -2830,7 +3016,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.)" @@ -2941,13 +3127,13 @@ msgid "Replies feed for %s (Atom)" msgstr "Стрічка відповідей до %s (Atom)" #: actions/replies.php:198 -#, fuzzy, php-format +#, php-format msgid "" "This is the timeline showing replies to %1$s but %2$s hasn't received a " "notice to his attention yet." msgstr "" -"Ð¦Ñ Ñтрічка допиÑів міÑтить відповіді %s, але %s ще нічого не отримав у " -"відповідь." +"Ð¦Ñ Ñтрічка допиÑів міÑтить відповіді Ð´Ð»Ñ %1$s, але %2$s поки що нічого не " +"отримав у відповідь." #: actions/replies.php:203 #, php-format @@ -2959,13 +3145,13 @@ msgstr "" "більшої кількоÑÑ‚Ñ– людей або [приєднавшиÑÑŒ до груп](%%action.groups%%)." #: actions/replies.php:205 -#, fuzzy, php-format +#, php-format msgid "" "You can try to [nudge %1$s](../%2$s) or [post something to his or her " "attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" -"Ви можете [«розштовхати» %s](../%s) або [напиÑати дещо варте його уваги](%%%%" -"action.newnotice%%%%?status_textarea=%s)." +"Ви можете [«розштовхати» %1$s](../%2$s) або [напиÑати дещо варте його уваги](%" +"%%%action.newnotice%%%%?status_textarea=%3$s)." #: actions/repliesrss.php:72 #, php-format @@ -2980,6 +3166,82 @@ msgstr "Ви не можете нікого ізолювати на цьому msgid "User is already sandboxed." msgstr "КориÑтувача ізольовано доки наберетьÑÑ ÑƒÐ¼Ñƒ-розуму." +#: actions/showapplication.php:82 +msgid "You must be logged in to view an application." +msgstr "Ви повинні Ñпочатку увійти, аби переглÑнути додаток." + +#: actions/showapplication.php:158 +msgid "Application profile" +msgstr "Профіль додатку" + +#: actions/showapplication.php:160 lib/applicationeditform.php:182 +msgid "Icon" +msgstr "Іконка" + +#: actions/showapplication.php:170 actions/version.php:195 +#: lib/applicationeditform.php:197 +msgid "Name" +msgstr "Ім’Ñ" + +#: actions/showapplication.php:179 lib/applicationeditform.php:224 +msgid "Organization" +msgstr "ОрганізаціÑ" + +#: actions/showapplication.php:188 actions/version.php:198 +#: lib/applicationeditform.php:211 lib/groupeditform.php:172 +msgid "Description" +msgstr "ОпиÑ" + +#: actions/showapplication.php:193 actions/showgroup.php:429 +#: lib/profileaction.php:174 +msgid "Statistics" +msgstr "СтатиÑтика" + +#: actions/showapplication.php:204 +#, php-format +msgid "created by %1$s - %2$s access by default - %3$d users" +msgstr "Ñтворено %1$s — %2$s доÑтуп за замовч. — %3$d кориÑтувачів" + +#: actions/showapplication.php:214 +msgid "Application actions" +msgstr "МожливоÑÑ‚Ñ– додатку" + +#: actions/showapplication.php:233 +msgid "Reset key & secret" +msgstr "Призначити новий ключ Ñ– таємне Ñлово" + +#: actions/showapplication.php:241 +msgid "Application info" +msgstr "Інфо додатку" + +#: actions/showapplication.php:243 +msgid "Consumer key" +msgstr "Ключ Ñпоживача" + +#: actions/showapplication.php:248 +msgid "Consumer secret" +msgstr "Таємно Ñлово Ñпоживача" + +#: actions/showapplication.php:253 +msgid "Request token URL" +msgstr "URL-адреÑа токена запиту" + +#: actions/showapplication.php:258 +msgid "Access token URL" +msgstr "URL-адреÑа токена дозволу" + +#: actions/showapplication.php:263 +msgid "Authorize URL" +msgstr "Ðвторизувати URL-адреÑу" + +#: actions/showapplication.php:268 +msgid "" +"Note: We support HMAC-SHA1 signatures. We do not support the plaintext " +"signature method." +msgstr "" +"До уваги: Ð’ÑÑ– підпиÑи шифруютьÑÑ Ð·Ð° методом HMAC-SHA1. Ми не підтримуємо " +"ÑˆÐ¸Ñ„Ñ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ñ–Ð´Ð¿Ð¸Ñів відкритим текÑтом." + #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "Ðе можна відновити обрані допиÑи." @@ -3085,7 +3347,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 "(ПуÑто)" @@ -3093,10 +3355,6 @@ msgstr "(ПуÑто)" msgid "All members" msgstr "Ð’ÑÑ– учаÑники" -#: actions/showgroup.php:429 lib/profileaction.php:174 -msgid "Statistics" -msgstr "СтатиÑтика" - #: actions/showgroup.php:432 msgid "Created" msgstr "Створено" @@ -3161,9 +3419,9 @@ msgid " tagged %s" msgstr " позначено з %s" #: actions/showstream.php:122 -#, fuzzy, php-format +#, php-format msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" -msgstr "Стрічка допиÑів Ð´Ð»Ñ %s з теґом %s (RSS 1.0)" +msgstr "Стрічка допиÑів %1$s з теґом %2$s (RSS 1.0)" #: actions/showstream.php:129 #, php-format @@ -3186,9 +3444,9 @@ msgid "FOAF for %s" msgstr "FOAF Ð´Ð»Ñ %s" #: actions/showstream.php:191 -#, fuzzy, php-format +#, php-format msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet." -msgstr "Це Ñтрічка допиÑів %s, але %s ще нічого не напиÑав." +msgstr "Це Ñтрічка допиÑів %1$s, але %2$s ще нічого не напиÑав." #: actions/showstream.php:196 msgid "" @@ -3199,13 +3457,13 @@ msgstr "" "аби розпочати! :)" #: actions/showstream.php:198 -#, fuzzy, php-format +#, php-format msgid "" "You can try to nudge %1$s or [post something to his or her attention](%%%%" "action.newnotice%%%%?status_textarea=%2$s)." msgstr "" -"Ви можете «розштовхати» %s або [щоÑÑŒ йому напиÑати](%%%%action.newnotice%%%%?" -"status_textarea=%s)." +"Ви можете «розштовхати» %1$s або [щоÑÑŒ йому напиÑати](%%%%action.newnotice%%%" +"%?status_textarea=%2$s)." #: actions/showstream.php:234 #, php-format @@ -3254,13 +3512,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." @@ -3445,7 +3703,7 @@ msgid "Save site settings" msgstr "Зберегти Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ñайту" #: actions/smssettings.php:58 -msgid "SMS Settings" +msgid "SMS settings" msgstr "ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð¡ÐœÐ¡" #: actions/smssettings.php:69 @@ -3474,7 +3732,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 @@ -3565,9 +3823,9 @@ msgid "%s subscribers" msgstr "ПідпиÑані до %s" #: actions/subscribers.php:52 -#, fuzzy, php-format +#, php-format msgid "%1$s subscribers, page %2$d" -msgstr "ПідпиÑані до %s, Ñторінка %d" +msgstr "ПідпиÑчики %1$s, Ñторінка %2$d" #: actions/subscribers.php:63 msgid "These are the people who listen to your notices." @@ -3606,9 +3864,9 @@ msgid "%s subscriptions" msgstr "ПідпиÑки %s" #: actions/subscriptions.php:54 -#, fuzzy, php-format +#, php-format msgid "%1$s subscriptions, page %2$d" -msgstr "ПідпиÑки %s, Ñторінка %d" +msgstr "ПідпиÑки %1$s, Ñторінка %2$d" #: actions/subscriptions.php:65 msgid "These are the people whose notices you listen to." @@ -3731,19 +3989,15 @@ 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 -#, fuzzy, php-format +#, php-format msgid "" "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’." -msgstr "Ð›Ñ–Ñ†ÐµÐ½Ð·Ñ–Ñ â€˜%s’ не відповідає ліцензії Ñайту ‘%s’." +msgstr "Ð›Ñ–Ñ†ÐµÐ½Ð·Ñ–Ñ Â«%1$s» не відповідає ліцензії Ñайту «%2$s»." #: actions/useradminpanel.php:58 lib/adminpanelaction.php:321 #: lib/personalgroupnav.php:115 @@ -3901,9 +4155,9 @@ msgstr "" "підпиÑку." #: actions/userauthorization.php:296 -#, fuzzy, php-format +#, php-format msgid "Listener URI ‘%s’ not found here." -msgstr "URI Ñлухача ‘%s’ тут не знайдено" +msgstr "URI Ñлухача «%s» тут не знайдено" #: actions/userauthorization.php:301 #, php-format @@ -3935,10 +4189,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 "Дизайн профілю" @@ -3971,9 +4221,9 @@ msgstr "" "Спробуйте [знайти ÑкіÑÑŒ групи](%%action.groupsearch%%) Ñ– приєднайтеÑÑ Ð´Ð¾ них." #: actions/version.php:73 -#, fuzzy, php-format +#, php-format msgid "StatusNet %s" -msgstr "СтатиÑтика" +msgstr "StatusNet %s" #: actions/version.php:153 #, php-format @@ -3981,15 +4231,16 @@ 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 -#, fuzzy msgid "StatusNet" -msgstr "Ð¡Ñ‚Ð°Ñ‚ÑƒÑ Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð¾." +msgstr "StatusNet" #: actions/version.php:161 msgid "Contributors" -msgstr "" +msgstr "Розробники" #: actions/version.php:168 msgid "" @@ -3998,6 +4249,10 @@ msgid "" "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 "" @@ -4006,6 +4261,10 @@ msgid "" "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 @@ -4013,31 +4272,22 @@ 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 -#, fuzzy -msgid "Name" -msgstr "Ð†Ð¼â€™Ñ ÐºÐ¾Ñ€Ð¸Ñтувача" +msgstr "Додатки" #: actions/version.php:196 lib/action.php:741 -#, fuzzy msgid "Version" -msgstr "СеÑÑ–Ñ—" +msgstr "ВерÑÑ–Ñ" #: actions/version.php:197 -#, fuzzy msgid "Author(s)" -msgstr "Ðвтор" +msgstr "Ðвтор(и)" -#: actions/version.php:198 lib/groupeditform.php:172 -msgid "Description" -msgstr "ОпиÑ" - -#: classes/File.php:137 +#: classes/File.php:144 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " @@ -4046,16 +4296,33 @@ 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/Group_member.php:41 +msgid "Group join failed." +msgstr "Ðе вдалоÑÑ Ð¿Ñ€Ð¸Ñ”Ð´Ð½Ð°Ñ‚Ð¸ÑÑŒ до групи." + +#: classes/Group_member.php:53 +msgid "Not part of group." +msgstr "Ðе Ñ” чаÑтиною групи." + +#: classes/Group_member.php:60 +msgid "Group leave failed." +msgstr "Ðе вдалоÑÑ Ð·Ð°Ð»Ð¸ÑˆÐ¸Ñ‚Ð¸ групу." + +#: classes/Login_token.php:76 +#, 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 "Вам заборонено надÑилати прÑмі повідомленнÑ." @@ -4068,27 +4335,27 @@ msgstr "Ðе можна долучити повідомленнÑ." msgid "Could not update message with new URI." msgstr "Ðе можна оновити Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð· новим URI." -#: classes/Notice.php:172 +#: classes/Notice.php:171 #, php-format msgid "DB error inserting hashtag: %s" msgstr "Помилка бази даних при додаванні теґу: %s" -#: classes/Notice.php:226 +#: classes/Notice.php:225 msgid "Problem saving notice. Too long." msgstr "Проблема при збереженні допиÑу. Ðадто довге." -#: classes/Notice.php:230 +#: classes/Notice.php:229 msgid "Problem saving notice. Unknown user." msgstr "Проблема при збереженні допиÑу. Ðевідомий кориÑтувач." -#: classes/Notice.php:235 +#: classes/Notice.php:234 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Дуже багато допиÑів за короткий термін; ходіть подихайте повітрÑм Ñ– " "повертайтеÑÑŒ за кілька хвилин." -#: classes/Notice.php:241 +#: classes/Notice.php:240 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4096,25 +4363,25 @@ msgstr "" "Дуже багато повідомлень за короткий термін; ходіть подихайте повітрÑм Ñ– " "повертайтеÑÑŒ за кілька хвилин." -#: classes/Notice.php:247 +#: classes/Notice.php:246 msgid "You are banned from posting notices on this site." msgstr "Вам заборонено надÑилати допиÑи до цього Ñайту." -#: classes/Notice.php:309 classes/Notice.php:334 +#: classes/Notice.php:305 classes/Notice.php:330 msgid "Problem saving notice." msgstr "Проблема при збереженні допиÑу." -#: classes/Notice.php:1034 +#: classes/Notice.php:1052 #, php-format msgid "DB error inserting reply: %s" msgstr "Помилка бази даних при додаванні відповіді: %s" -#: classes/Notice.php:1359 +#: classes/Notice.php:1423 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" -#: classes/User.php:368 +#: classes/User.php:382 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Вітаємо на %1$s, @%2$s!" @@ -4155,6 +4422,11 @@ msgstr "Інше" msgid "Other options" msgstr "Інші опції" +#: lib/action.php:144 +#, php-format +msgid "%1$s - %2$s" +msgstr "%1$s — %2$s" + #: lib/action.php:159 msgid "Untitled page" msgstr "Сторінка без заголовку" @@ -4171,10 +4443,6 @@ msgstr "Дім" msgid "Personal profile and friends timeline" msgstr "ПерÑональний профіль Ñ– Ñтрічка друзів" -#: lib/action.php:435 -msgid "Account" -msgstr "Ðкаунт" - #: lib/action.php:435 msgid "Change your email, avatar, password, profile" msgstr "Змінити електронну адреÑу, аватару, пароль, профіль" @@ -4329,18 +4597,13 @@ msgstr "Вперед" msgid "Before" msgstr "Ðазад" -#: lib/action.php:1167 -msgid "There was a problem with your session token." -msgstr "Виникли певні проблеми з токеном поточної ÑеÑÑ–Ñ—." - #: lib/adminpanelaction.php:96 msgid "You cannot make changes to this site." msgstr "Ви не можете щоÑÑŒ змінювати на цьому Ñайті." #: lib/adminpanelaction.php:107 -#, fuzzy msgid "Changes to that panel are not allowed." -msgstr "РеєÑтрацію не дозволено." +msgstr "Ð”Ð»Ñ Ñ†Ñ–Ñ”Ñ— панелі зміни не припуÑтимі." #: lib/adminpanelaction.php:206 msgid "showForm() not implemented." @@ -4366,6 +4629,68 @@ msgstr "ÐšÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ñ Ð´Ð¸Ð·Ð°Ð¹Ð½Ñƒ" msgid "Paths configuration" msgstr "ÐšÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ñ ÑˆÐ»Ñху" +#: lib/applicationeditform.php:186 +msgid "Icon for this application" +msgstr "Іконка Ð´Ð»Ñ Ñ†ÑŒÐ¾Ð³Ð¾ додатку" + +#: lib/applicationeditform.php:206 +#, php-format +msgid "Describe your application in %d characters" +msgstr "Опишіть додаток, вкладаючиÑÑŒ у %d знаків" + +#: lib/applicationeditform.php:209 +msgid "Describe your application" +msgstr "Опишіть Ваш додаток" + +#: lib/applicationeditform.php:218 +msgid "Source URL" +msgstr "URL-адреÑа" + +#: lib/applicationeditform.php:220 +msgid "URL of the homepage of this application" +msgstr "URL-адреÑа веб-Ñторінки цього додатку" + +#: lib/applicationeditform.php:226 +msgid "Organization responsible for this application" +msgstr "ОрганізаціÑ, відповідальна за цей додаток" + +#: lib/applicationeditform.php:232 +msgid "URL for the homepage of the organization" +msgstr "URL-адреÑа веб-Ñторінки організації" + +#: lib/applicationeditform.php:238 +msgid "URL to redirect to after authentication" +msgstr "URL-адреÑа, на Ñку перенаправлÑти піÑÐ»Ñ Ð°Ð²Ñ‚ÐµÐ½Ñ‚Ð¸Ñ„Ñ–ÐºÐ°Ñ†Ñ–Ñ—" + +#: lib/applicationeditform.php:260 +msgid "Browser" +msgstr "Браузер" + +#: lib/applicationeditform.php:276 +msgid "Desktop" +msgstr "ДеÑктоп" + +#: lib/applicationeditform.php:277 +msgid "Type of application, browser or desktop" +msgstr "Тип додатку, браузер або деÑктоп" + +#: lib/applicationeditform.php:299 +msgid "Read-only" +msgstr "Лише читаннÑ" + +#: lib/applicationeditform.php:317 +msgid "Read-write" +msgstr "Читати-пиÑати" + +#: lib/applicationeditform.php:318 +msgid "Default access for this application: read-only, or read-write" +msgstr "" +"Дозвіл за замовчуваннÑм Ð´Ð»Ñ Ñ†ÑŒÐ¾Ð³Ð¾ додатку: лише Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ Ð°Ð±Ð¾ читати-пиÑати" + +#: lib/applicationlist.php:154 +msgid "Revoke" +msgstr "Відкликати" + #: lib/attachmentlist.php:87 msgid "Attachments" msgstr "ВкладеннÑ" @@ -4386,11 +4711,11 @@ msgstr "ДопиÑи, до Ñких прикріплено це вкладенн msgid "Tags for this attachment" msgstr "Теґи Ð´Ð»Ñ Ñ†ÑŒÐ¾Ð³Ð¾ вкладеннÑ" -#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 +#: lib/authenticationplugin.php:214 lib/authenticationplugin.php:219 msgid "Password changing failed" msgstr "Ðе вдалоÑÑ Ð·Ð¼Ñ–Ð½Ð¸Ñ‚Ð¸ пароль" -#: lib/authenticationplugin.php:197 +#: lib/authenticationplugin.php:229 msgid "Password changing is not allowed" msgstr "Змінювати пароль не дозволено" @@ -4411,8 +4736,8 @@ msgid "Sorry, this command is not yet implemented." msgstr "Даруйте, але Ð²Ð¸ÐºÐ¾Ð½Ð°Ð½Ð½Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¸ ще не завершено." #: lib/command.php:88 -#, fuzzy, php-format -msgid "Could not find a user with nickname %s." +#, php-format +msgid "Could not find a user with nickname %s" msgstr "Ðе вдалоÑÑ Ð·Ð½Ð°Ð¹Ñ‚Ð¸ кориÑтувача з іменем %s" #: lib/command.php:92 @@ -4420,8 +4745,8 @@ msgid "It does not make a lot of sense to nudge yourself!" msgstr "Гадаємо, кориÑÑ‚Ñ– від «розштовхуваннÑ» Ñамого Ñебе небагато, чи не так?!" #: lib/command.php:99 -#, fuzzy, php-format -msgid "Nudge sent to %s." +#, php-format +msgid "Nudge sent to %s" msgstr "Спробу «розштовхати» %s зараховано" #: lib/command.php:126 @@ -4435,173 +4760,190 @@ msgstr "" "ПідпиÑчики: %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." +#: lib/command.php:152 lib/command.php:390 lib/command.php:451 +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." +#: lib/command.php:168 lib/command.php:406 lib/command.php:467 +#: lib/command.php:523 +msgid "User has no last notice" msgstr "КориÑтувач не має оÑтаннього допиÑу" #: lib/command.php:190 msgid "Notice marked as fave." msgstr "Ð”Ð¾Ð¿Ð¸Ñ Ð¿Ð¾Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¾ Ñк обраний." -#: lib/command.php:284 -#, fuzzy, php-format -msgid "Could not remove user %1$s to group %2$s." -msgstr "Ðе вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ кориÑтувача %s з групи %s" +#: lib/command.php:217 +msgid "You are already a member of that group" +msgstr "Ви вже Ñ” учаÑником цієї групи." -#: lib/command.php:318 +#: lib/command.php:231 +#, php-format +msgid "Could not join user %s to group %s" +msgstr "Ðе вдалоÑÑŒ долучити кориÑтувача %1$s до групи %2$s." + +#: lib/command.php:236 +#, php-format +msgid "%s joined group %s" +msgstr "%1$s приєднавÑÑ Ð´Ð¾ групи %2$s" + +#: lib/command.php:275 +#, php-format +msgid "Could not remove user %s to group %s" +msgstr "Ðе вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ кориÑтувача %1$s з групи %2$s." + +#: lib/command.php:280 +#, php-format +msgid "%s left group %s" +msgstr "%1$s залишив групу %2$s" + +#: lib/command.php:309 #, php-format msgid "Fullname: %s" msgstr "Повне ім’Ñ: %s" -#: lib/command.php:321 +#: lib/command.php:312 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "ЛокаціÑ: %s" -#: lib/command.php:324 +#: lib/command.php:315 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "Веб-Ñторінка: %s" -#: lib/command.php:327 +#: lib/command.php:318 #, php-format msgid "About: %s" msgstr "Про мене: %s" -#: lib/command.php:358 -#, fuzzy, php-format -msgid "Message too long - maximum is %1$d characters, you sent %2$d." +#: lib/command.php:349 +#, 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:367 +#, php-format +msgid "Direct message to %s sent" +msgstr "ПрÑме Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð´Ð»Ñ %s надіÑлано." -#: lib/command.php:378 +#: lib/command.php:369 msgid "Error sending direct message." msgstr "Помилка при відправці прÑмого повідомленнÑ." -#: lib/command.php:435 -#, fuzzy, php-format -msgid "Notice from %s repeated." +#: lib/command.php:413 +msgid "Cannot repeat your own notice" +msgstr "Ðе можу вторувати Вашому влаÑному допиÑу" + +#: lib/command.php:418 +msgid "Already repeated that notice" +msgstr "Цьому допиÑу вже вторували" + +#: lib/command.php:426 +#, php-format +msgid "Notice from %s repeated" msgstr "ДопиÑу від %s вторували" -#: lib/command.php:437 +#: lib/command.php:428 msgid "Error repeating notice." msgstr "Помилка із вторуваннÑм допиÑу." -#: lib/command.php:491 -#, fuzzy, php-format -msgid "Notice too long - maximum is %1$d characters, you sent %2$d." +#: lib/command.php:482 +#, php-format +msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Ð”Ð¾Ð¿Ð¸Ñ Ð½Ð°Ð´Ñ‚Ð¾ довгий — макÑимум %d знаків, а ви надÑилаєте %d" -#: lib/command.php:500 -#, fuzzy, php-format -msgid "Reply to %s sent." +#: lib/command.php:491 +#, php-format +msgid "Reply to %s sent" msgstr "Відповідь до %s надіÑлано" -#: lib/command.php:502 +#: lib/command.php:493 msgid "Error saving notice." msgstr "Проблема при збереженні допиÑу." -#: lib/command.php:556 -#, fuzzy -msgid "Specify the name of the user to subscribe to." +#: lib/command.php:547 +msgid "Specify the name of the user to subscribe to" msgstr "Зазначте Ñ–Ð¼â€™Ñ ÐºÐ¾Ñ€Ð¸Ñтувача, до Ñкого бажаєте підпиÑатиÑÑŒ" -#: lib/command.php:563 +#: lib/command.php:554 #, php-format msgid "Subscribed to %s" msgstr "ПідпиÑано до %s" -#: lib/command.php:584 -#, fuzzy -msgid "Specify the name of the user to unsubscribe from." +#: lib/command.php:575 +msgid "Specify the name of the user to unsubscribe from" msgstr "Зазначте Ñ–Ð¼â€™Ñ ÐºÐ¾Ñ€Ð¸Ñтувача, від Ñкого бажаєте відпиÑатиÑÑŒ" -#: lib/command.php:591 +#: lib/command.php:582 #, php-format msgid "Unsubscribed from %s" msgstr "ВідпиÑано від %s" -#: lib/command.php:609 lib/command.php:632 +#: lib/command.php:600 lib/command.php:623 msgid "Command not yet implemented." msgstr "Ð’Ð¸ÐºÐ¾Ð½Ð°Ð½Ð½Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¸ ще не завершено." -#: lib/command.php:612 +#: lib/command.php:603 msgid "Notification off." msgstr "Ð¡Ð¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð²Ð¸Ð¼ÐºÐ½ÑƒÑ‚Ð¾." -#: lib/command.php:614 +#: lib/command.php:605 msgid "Can't turn off notification." msgstr "Ðе можна вимкнути ÑповіщеннÑ." -#: lib/command.php:635 +#: lib/command.php:626 msgid "Notification on." msgstr "Ð¡Ð¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ ÑƒÐ²Ñ–Ð¼ÐºÐ½ÑƒÑ‚Ð¾." -#: lib/command.php:637 +#: lib/command.php:628 msgid "Can't turn on notification." msgstr "Ðе можна увімкнути ÑповіщеннÑ." -#: lib/command.php:650 -#, fuzzy -msgid "Login command is disabled." +#: lib/command.php:641 +msgid "Login command is disabled" msgstr "Команду входу відключено" -#: lib/command.php:664 -#, fuzzy, php-format -msgid "Could not create login token for %s." -msgstr "Ðе вдалоÑÑ Ñтворити токен входу Ð´Ð»Ñ %s" - -#: lib/command.php:669 -#, fuzzy, php-format -msgid "This link is useable only once, and is good for only 2 minutes: %s." +#: lib/command.php:652 +#, 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:668 msgid "You are not subscribed to anyone." msgstr "Ви не маєте жодних підпиÑок." -#: lib/command.php:687 +#: lib/command.php:670 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:690 msgid "No one is subscribed to you." msgstr "До Ð’Ð°Ñ Ð½Ñ–Ñ…Ñ‚Ð¾ не підпиÑаний." -#: lib/command.php:709 +#: lib/command.php:692 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:712 msgid "You are not a member of any groups." msgstr "Ви не Ñ” учаÑником жодної групи." -#: lib/command.php:731 +#: lib/command.php:714 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:728 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4677,19 +5019,19 @@ msgstr "" "tracks — наразі не виконуєтьÑÑ\n" "tracking — наразі не виконуєтьÑÑ\n" -#: lib/common.php:199 +#: lib/common.php:131 msgid "No configuration file found. " msgstr "Файлу конфігурації не знайдено. " -#: lib/common.php:200 +#: lib/common.php:132 msgid "I looked for configuration files in the following places: " msgstr "Шукав файли конфігурації в цих міÑцÑÑ…: " -#: lib/common.php:201 +#: lib/common.php:134 msgid "You may wish to run the installer to fix this." msgstr "ЗапуÑÑ‚Ñ–Ñ‚ÑŒ файл інÑталÑції, аби полагодити це." -#: lib/common.php:202 +#: lib/common.php:135 msgid "Go to the installer." msgstr "Іти до файлу інÑталÑції." @@ -4705,6 +5047,14 @@ msgstr "ÐžÐ½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð·Ð° допомогою Ñлужби миттєвих msgid "Updates by SMS" msgstr "ÐžÐ½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ñ‡ÐµÑ€ÐµÐ· СМС" +#: lib/connectsettingsaction.php:120 +msgid "Connections" +msgstr "З’єднаннÑ" + +#: lib/connectsettingsaction.php:121 +msgid "Authorized connected applications" +msgstr "Ðвторизовані під’єднані додатки" + #: lib/dberroraction.php:60 msgid "Database error" msgstr "Помилка бази даних" @@ -4890,11 +5240,16 @@ msgstr "Мб" msgid "kB" msgstr "кб" -#: lib/jabber.php:191 +#: lib/jabber.php:202 #, php-format msgid "[%s]" msgstr "[%s]" +#: lib/jabber.php:385 +#, php-format +msgid "Unknown inbox source %d." +msgstr "Ðевідоме джерело вхідного Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ %d." + #: lib/joinform.php:114 msgid "Join" msgstr "ПриєднатиÑÑŒ" @@ -4974,24 +5329,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 @@ -5207,9 +5548,9 @@ msgstr "" "Вибачте, але не затверджено жодної електронної адреÑи Ð´Ð»Ñ Ð²Ñ…Ñ–Ð´Ð½Ð¾Ñ— пошти." #: lib/mailhandler.php:228 -#, fuzzy, php-format +#, php-format msgid "Unsupported message type: %s" -msgstr "Формат Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð½Ñ Ð½Ðµ підтримуєтьÑÑ." +msgstr "Формат Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð½Ðµ підтримуєтьÑÑ: %s" #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." @@ -5244,16 +5585,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 @@ -5262,8 +5603,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" @@ -5295,18 +5636,20 @@ msgid "Attach a file" msgstr "ВклаÑти файл" #: lib/noticeform.php:212 -#, fuzzy -msgid "Share my location." -msgstr "Показувати міÑцезнаходженнÑ" - -#: lib/noticeform.php:214 -#, fuzzy -msgid "Do not share my location." -msgstr "Показувати міÑцезнаходженнÑ" +msgid "Share my location" +msgstr "Показувати локацію." #: lib/noticeform.php:215 -msgid "Hide this info" +msgid "Do not share my location" +msgstr "Приховувати мою локацію" + +#: lib/noticeform.php:216 +msgid "" +"Sorry, retrieving your geo location is taking longer than expected, please " +"try again later" msgstr "" +"Ðа жаль, Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ— щодо Вашого міÑÑ†ÐµÐ·Ð½Ð°Ñ…Ð¾Ð´Ð¶ÐµÐ½Ð½Ñ Ð·Ð°Ð¹Ð¼Ðµ більше " +"чаÑу, ніж очікувалоÑÑŒ; будь лаÑка, Ñпробуйте пізніше" #: lib/noticelist.php:428 #, php-format @@ -5423,9 +5766,8 @@ msgid "Tags in %s's notices" msgstr "Теґи у допиÑах %s" #: lib/plugin.php:114 -#, fuzzy msgid "Unknown" -msgstr "Ð”Ñ–Ñ Ð½ÐµÐ²Ñ–Ð´Ð¾Ð¼Ð°" +msgstr "Ðевідомо" #: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82 msgid "Subscriptions" @@ -5566,23 +5908,23 @@ msgstr "Вже підпиÑаний!" msgid "User has blocked you." msgstr "КориÑтувач заблокував ВаÑ." -#: lib/subs.php:60 +#: lib/subs.php:63 msgid "Could not subscribe." msgstr "Ðевдала підпиÑка." -#: lib/subs.php:79 +#: lib/subs.php:82 msgid "Could not subscribe other to you." msgstr "Ðе вдалоÑÑ Ð¿Ñ–Ð´Ð¿Ð¸Ñати інших до ВаÑ." -#: lib/subs.php:128 +#: lib/subs.php:137 msgid "Not subscribed!" msgstr "Ðе підпиÑано!" -#: lib/subs.php:133 +#: lib/subs.php:142 msgid "Couldn't delete self-subscription." msgstr "Ðе можу видалити ÑамопідпиÑку." -#: lib/subs.php:146 +#: lib/subs.php:158 msgid "Couldn't delete subscription." msgstr "Ðе вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ підпиÑку." @@ -5596,10 +5938,6 @@ msgstr "Хмарка теґів (позначки Ñамих кориÑтува msgid "People Tagcloud as tagged" msgstr "Хмарка теґів (позначки, Ñкими Ви позначили кориÑтувачів)" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(пуÑто)" - #: lib/tagcloudsection.php:56 msgid "None" msgstr "ПуÑто" @@ -5660,47 +5998,47 @@ msgstr "ПовідомленнÑ" msgid "Moderate" msgstr "Модерувати" -#: lib/util.php:837 +#: lib/util.php:875 msgid "a few seconds ago" msgstr "мить тому" -#: lib/util.php:839 +#: lib/util.php:877 msgid "about a minute ago" msgstr "хвилину тому" -#: lib/util.php:841 +#: lib/util.php:879 #, php-format msgid "about %d minutes ago" msgstr "близько %d хвилин тому" -#: lib/util.php:843 +#: lib/util.php:881 msgid "about an hour ago" msgstr "годину тому" -#: lib/util.php:845 +#: lib/util.php:883 #, php-format msgid "about %d hours ago" msgstr "близько %d годин тому" -#: lib/util.php:847 +#: lib/util.php:885 msgid "about a day ago" msgstr "день тому" -#: lib/util.php:849 +#: lib/util.php:887 #, php-format msgid "about %d days ago" msgstr "близько %d днів тому" -#: lib/util.php:851 +#: lib/util.php:889 msgid "about a month ago" msgstr "міÑÑць тому" -#: lib/util.php:853 +#: lib/util.php:891 #, php-format msgid "about %d months ago" msgstr "близько %d міÑÑців тому" -#: lib/util.php:855 +#: lib/util.php:893 msgid "about a year ago" msgstr "рік тому" @@ -5716,5 +6054,6 @@ msgstr "%s неприпуÑтимий колір! ВикориÑтайте 3 а #: scripts/xmppdaemon.php:301 #, php-format -msgid "Message too long - maximum is %d characters, you sent %d" -msgstr "ÐŸÐ¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð½Ð°Ð´Ñ‚Ð¾ довге — макÑимум %d знаків, а ви надÑилаєте %d" +msgid "Message too long - maximum is %1$d characters, you sent %2$d." +msgstr "" +"ÐŸÐ¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð½Ð°Ð´Ñ‚Ð¾ довге — макÑимум %1$d Ñимволів, а Ви надÑилаєте %2$d." diff --git a/locale/vi/LC_MESSAGES/statusnet.po b/locale/vi/LC_MESSAGES/statusnet.po index f3836297f1..1d889777de 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-10 00:46+0000\n" -"PO-Revision-Date: 2010-01-10 00:49:21+0000\n" +"POT-Creation-Date: 2010-01-15 19:15+0000\n" +"PO-Revision-Date: 2010-01-15 19:18:14+0000\n" "Language-Team: Vietnamese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60878); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r61101); 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" @@ -33,25 +33,30 @@ msgstr "Không có tin nhắn nào." #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 +#: actions/apistatusesupdate.php:149 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 #: 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 #: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 -#: lib/command.php:163 lib/command.php:311 lib/command.php:364 -#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/command.php:163 lib/command.php:302 lib/command.php:355 +#: lib/command.php:401 lib/command.php:462 lib/command.php:518 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/subs.php:34 lib/subs.php:125 msgid "No such user." msgstr "Không có user nào." +#: actions/all.php:84 +#, fuzzy, php-format +msgid "%1$s and friends, page %2$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 +#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -104,7 +109,7 @@ msgstr "" msgid "You and friends" msgstr "%s và bạn bè" -#: actions/allrss.php:119 actions/apitimelinefriends.php:122 +#: actions/allrss.php:119 actions/apitimelinefriends.php:121 #: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" @@ -115,6 +120,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:155 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!" @@ -129,7 +151,7 @@ msgstr "PhÆ°Æ¡ng thức API không tìm thấy!" #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:114 +#: actions/apistatusesupdate.php:119 msgid "This method requires a POST." msgstr "PhÆ°Æ¡ng thức này yêu cầu là POST." @@ -160,8 +182,9 @@ msgstr "Không thể lÆ°u hồ sÆ¡ cá nhân." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257 -#: actions/designadminpanel.php:122 actions/newnotice.php:94 +#: actions/apistatusesupdate.php:132 actions/avatarsettings.php:257 +#: actions/designadminpanel.php:122 actions/editapplication.php:118 +#: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format msgid "" @@ -173,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 #, fuzzy msgid "Unable to save your design settings." msgstr "Không thể lÆ°u thông tin Twitter của bạn!" @@ -216,26 +242,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!" @@ -262,7 +268,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 @@ -271,7 +277,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 @@ -295,8 +301,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." @@ -330,7 +337,8 @@ msgstr "Biệt hiệu này đã dùng rồi. Hãy nhập biệt hiệu khác." msgid "Not a valid nickname." msgstr "Biệt hiệu không hợp lệ." -#: actions/apigroupcreate.php:196 actions/editgroup.php:195 +#: actions/apigroupcreate.php:196 actions/editapplication.php:212 +#: actions/editgroup.php:195 actions/newapplication.php:200 #: actions/newgroup.php:139 actions/profilesettings.php:222 #: actions/register.php:217 msgid "Homepage is not a valid URL." @@ -342,7 +350,8 @@ msgstr "Trang chủ không phải là URL" msgid "Full name is too long (max 255 chars)." msgstr "Tên đầy đủ quá dài (tối Ä‘a là 255 ký tá»±)." -#: actions/apigroupcreate.php:213 +#: actions/apigroupcreate.php:213 actions/editapplication.php:187 +#: actions/newapplication.php:169 #, fuzzy, php-format msgid "Description is too long (max %d chars)." msgstr "Lý lịch quá dài (không quá 140 ký tá»±)" @@ -383,7 +392,7 @@ msgstr "" msgid "Group not found!" msgstr "PhÆ°Æ¡ng thức API không tìm thấy!" -#: actions/apigroupjoin.php:110 lib/command.php:217 +#: 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:" @@ -392,7 +401,7 @@ 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 lib/command.php:234 +#: actions/apigroupjoin.php:138 actions/joingroup.php:124 #, fuzzy, php-format 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." @@ -402,7 +411,7 @@ 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/leavegroup.php:127 +#: actions/apigroupleave.php:124 actions/leavegroup.php:119 #, fuzzy, php-format 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." @@ -422,6 +431,101 @@ msgstr "%s và nhóm" msgid "groups on %s" msgstr "Mã nhóm" +#: actions/apioauthauthorize.php:108 actions/apioauthauthorize.php:114 +msgid "Bad request." +msgstr "" + +#: actions/apioauthauthorize.php:134 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:115 actions/makeadmin.php:66 +#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 +#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:139 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 +#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/subscribe.php:46 actions/tagother.php:166 +#: 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 "Có lá»—i xảy ra khi thao tác. Hãy thá»­ lại lần nữa." + +#: actions/apioauthauthorize.php:146 +#, fuzzy +msgid "Invalid nickname / password!" +msgstr "Tên đăng nhập hoặc mật khẩu không hợp lệ." + +#: actions/apioauthauthorize.php:170 +#, fuzzy +msgid "DB error deleting OAuth app user." +msgstr "Lá»—i xảy ra khi tạo thành viên." + +#: actions/apioauthauthorize.php:196 +#, fuzzy +msgid "DB error inserting OAuth app user." +msgstr "Lá»—i cÆ¡ sở dữ liệu khi chèn trả lá»i: %s" + +#: actions/apioauthauthorize.php:231 +#, php-format +msgid "" +"The request token %s has been authorized. Please exchange it for an access " +"token." +msgstr "" + +#: actions/apioauthauthorize.php:241 +#, php-format +msgid "The request token %s has been denied." +msgstr "" + +#: actions/apioauthauthorize.php:246 actions/avatarsettings.php:281 +#: actions/designadminpanel.php:103 actions/editapplication.php:139 +#: actions/emailsettings.php:256 actions/grouplogo.php:319 +#: actions/imsettings.php:220 actions/newapplication.php:121 +#: actions/oauthconnectionssettings.php:151 actions/recoverpassword.php:44 +#: actions/smssettings.php:248 lib/designsettings.php:304 +msgid "Unexpected form submission." +msgstr "Bất ngá» gá»­i mẫu thông tin. " + +#: actions/apioauthauthorize.php:273 +msgid "An application would like to connect to your account" +msgstr "" + +#: actions/apioauthauthorize.php:290 +msgid "Allow or deny access" +msgstr "" + +#: actions/apioauthauthorize.php:320 lib/action.php:435 +#, fuzzy +msgid "Account" +msgstr "Giá»›i thiệu" + +#: actions/apioauthauthorize.php:323 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/apioauthauthorize.php:326 actions/login.php:233 +#: actions/register.php:429 lib/accountsettingsaction.php:116 +msgid "Password" +msgstr "Mật khẩu" + +#: actions/apioauthauthorize.php:338 +msgid "Deny" +msgstr "" + +#: actions/apioauthauthorize.php:344 +msgid "Allow" +msgstr "" + +#: actions/apioauthauthorize.php:361 +msgid "Allow or deny access to your account information." +msgstr "" + #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." msgstr "PhÆ°Æ¡ng thức này yêu cầu là POST hoặc DELETE" @@ -435,12 +539,12 @@ msgstr "Bạn đã không xóa trạng thái của những ngÆ°á»i khác." msgid "No such notice." msgstr "Không có tin nhắn nào." -#: actions/apistatusesretweet.php:83 lib/command.php:422 +#: actions/apistatusesretweet.php:83 #, fuzzy msgid "Cannot repeat your own notice." msgstr "Bạn không thể đăng ký nếu không đồng ý các Ä‘iá»u khoản." -#: actions/apistatusesretweet.php:91 lib/command.php:427 +#: actions/apistatusesretweet.php:91 #, fuzzy msgid "Already repeated that notice." msgstr "Xóa tin nhắn" @@ -454,17 +558,17 @@ msgstr "Hình đại diện đã được cập nhật." msgid "No status with that ID found." msgstr "Không tìm thấy trạng thái nào tÆ°Æ¡ng ứng vá»›i ID đó." -#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:162 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Quá dài. Tối Ä‘a là 140 ký tá»±." -#: actions/apistatusesupdate.php:198 +#: actions/apistatusesupdate.php:203 msgid "Not found" msgstr "Không tìm thấy" -#: actions/apistatusesupdate.php:221 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:226 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -551,8 +655,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." @@ -577,8 +684,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" @@ -613,29 +720,6 @@ 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/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 -#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 -#: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 -#: actions/subscribe.php:46 actions/tagother.php:166 -#: 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 "Có lá»—i xảy ra khi thao tác. Hãy thá»­ lại lần nữa." - -#: actions/avatarsettings.php:281 actions/designadminpanel.php:103 -#: actions/emailsettings.php:256 actions/grouplogo.php:319 -#: actions/imsettings.php:220 actions/recoverpassword.php:44 -#: actions/smssettings.php:248 lib/designsettings.php:304 -msgid "Unexpected form submission." -msgstr "Bất ngá» gá»­i mẫu thông tin. " - #: actions/avatarsettings.php:328 msgid "Pick a square area of the image to be your avatar" msgstr "" @@ -699,21 +783,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:260 #, 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 @@ -781,7 +860,8 @@ msgid "Couldn't delete email confirmation." msgstr "Không thể xóa email xác nhận." #: actions/confirmaddress.php:144 -msgid "Confirm Address" +#, fuzzy +msgid "Confirm address" msgstr "Xác nhận địa chỉ" #: actions/confirmaddress.php:159 @@ -838,11 +918,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." @@ -990,7 +1065,8 @@ msgstr "" #: actions/pathsadminpanel.php:324 actions/profilesettings.php:174 #: actions/siteadminpanel.php:388 actions/smssettings.php:181 #: actions/subscriptions.php:203 actions/tagother.php:154 -#: actions/useradminpanel.php:313 lib/designsettings.php:256 +#: actions/useradminpanel.php:313 lib/applicationeditform.php:335 +#: lib/applicationeditform.php:336 lib/designsettings.php:256 #: lib/groupeditform.php:202 msgid "Save" msgstr "LÆ°u" @@ -1014,6 +1090,86 @@ msgstr "Tìm kiếm các tin nhắn Æ°a thích của %s" msgid "No such document." msgstr "Không có tài liệu nào." +#: actions/editapplication.php:54 lib/applicationeditform.php:136 +msgid "Edit application" +msgstr "" + +#: actions/editapplication.php:66 +#, fuzzy +msgid "You must be logged in to edit an application." +msgstr "Bạn phải đăng nhập vào má»›i có thể gá»­i thÆ° má»i những " + +#: actions/editapplication.php:77 actions/showapplication.php:94 +#, fuzzy +msgid "You are not the owner of this application." +msgstr "Bạn chÆ°a cập nhật thông tin riêng" + +#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:163 +#: actions/showapplication.php:87 +#, fuzzy +msgid "No such application." +msgstr "Không có tin nhắn nào." + +#: actions/editapplication.php:127 actions/newapplication.php:110 +#: actions/showapplication.php:118 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." + +#: actions/editapplication.php:161 +msgid "Use this form to edit your application." +msgstr "" + +#: actions/editapplication.php:177 actions/newapplication.php:159 +#, fuzzy +msgid "Name is required." +msgstr "Cùng mật khẩu ở trên. Bắt buá»™c." + +#: actions/editapplication.php:180 actions/newapplication.php:162 +#, fuzzy +msgid "Name is too long (max 255 chars)." +msgstr "Tên đầy đủ quá dài (tối Ä‘a là 255 ký tá»±)." + +#: actions/editapplication.php:183 actions/newapplication.php:165 +#, fuzzy +msgid "Description is required." +msgstr "Mô tả" + +#: actions/editapplication.php:191 +msgid "Source URL is too long." +msgstr "" + +#: actions/editapplication.php:197 actions/newapplication.php:182 +#, fuzzy +msgid "Source URL is not valid." +msgstr "Trang chủ không phải là URL" + +#: actions/editapplication.php:200 actions/newapplication.php:185 +msgid "Organization is required." +msgstr "" + +#: actions/editapplication.php:203 actions/newapplication.php:188 +#, fuzzy +msgid "Organization is too long (max 255 chars)." +msgstr "Tên khu vá»±c quá dài (không quá 255 ký tá»±)." + +#: actions/editapplication.php:206 actions/newapplication.php:191 +msgid "Organization homepage is required." +msgstr "" + +#: actions/editapplication.php:215 actions/newapplication.php:203 +msgid "Callback is too long." +msgstr "" + +#: actions/editapplication.php:222 actions/newapplication.php:212 +msgid "Callback URL is not valid." +msgstr "" + +#: actions/editapplication.php:255 +#, fuzzy +msgid "Could not update application." +msgstr "Không thể cập nhật thành viên." + #: actions/editgroup.php:56 #, fuzzy, php-format msgid "Edit %s group" @@ -1027,7 +1183,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 @@ -1055,7 +1211,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 @@ -1087,13 +1244,14 @@ msgstr "" "để nhận tin nhắn và lá»i hÆ°á»›ng dẫn." #: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 +#: actions/smssettings.php:126 lib/applicationeditform.php:333 +#: lib/applicationeditform.php:334 msgid "Cancel" msgstr "Hủy" #: actions/emailsettings.php:121 #, fuzzy -msgid "Email Address" +msgid "Email address" msgstr "Äịa chỉ email" #: actions/emailsettings.php:123 @@ -1172,9 +1330,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 @@ -1369,14 +1527,6 @@ 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:79 #, fuzzy msgid "No such file." @@ -1395,7 +1545,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 đó." @@ -1446,9 +1596,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 @@ -1472,13 +1623,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." @@ -1495,6 +1639,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 "" @@ -1625,7 +1774,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 @@ -1656,7 +1806,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 @@ -1754,7 +1905,7 @@ 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 lib/command.php:315 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 #, fuzzy, php-format msgid "%1$s (%2$s)" msgstr "%s (%s)" @@ -1802,7 +1953,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:234 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236 msgid "Send" msgstr "Gá»­i" @@ -1873,17 +2024,7 @@ 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 -#, fuzzy -msgid "You are already a member of that group" -msgstr "Bạn đã theo những ngÆ°á»i này:" - -#: actions/joingroup.php:128 -#, fuzzy, php-format -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/joingroup.php:135 lib/command.php:239 +#: actions/joingroup.php:131 #, fuzzy, php-format msgid "%1$s joined group %2$s" msgstr "%s và nhóm" @@ -1893,72 +2034,51 @@ msgstr "%s và nhóm" msgid "You must be logged in to leave a group." msgstr "Bạn phải đăng nhập vào má»›i có thể gá»­i thÆ° má»i những " -#: actions/leavegroup.php:90 lib/command.php:268 +#: actions/leavegroup.php:90 lib/command.php:265 #, fuzzy msgid "You are not a member of that group." msgstr "Bạn chÆ°a cập nhật thông tin riêng" -#: actions/leavegroup.php:119 lib/command.php:278 -#, fuzzy -msgid "Could not find membership record." -msgstr "Không thể cập nhật thành viên." - -#: actions/leavegroup.php:134 lib/command.php:289 +#: actions/leavegroup.php:127 #, fuzzy, php-format 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:460 +#: 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 -#: lib/groupeditform.php:152 lib/userprofile.php:131 -msgid "Nickname" -msgstr "Biệt danh" - -#: actions/login.php:253 actions/register.php:428 -#: 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." @@ -1966,7 +2086,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]" @@ -1986,19 +2106,41 @@ 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 %1$s in group %2$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 #, fuzzy, php-format -msgid "Can't make %1$s an admin for group %2$s" +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" msgstr "" +#: actions/newapplication.php:52 +msgid "New application" +msgstr "" + +#: actions/newapplication.php:64 +#, fuzzy +msgid "You must be logged in to register an application." +msgstr "Bạn phải đăng nhập vào má»›i có thể gá»­i thÆ° má»i những " + +#: actions/newapplication.php:143 +msgid "Use this form to register a new application." +msgstr "" + +#: actions/newapplication.php:173 +msgid "Source URL is required." +msgstr "" + +#: actions/newapplication.php:255 actions/newapplication.php:264 +#, fuzzy +msgid "Could not create application." +msgstr "Không thể tạo favorite." + #: actions/newgroup.php:53 #, fuzzy msgid "New group" @@ -2013,13 +2155,13 @@ msgstr "" msgid "New message" msgstr "Tin má»›i nhất" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 #, fuzzy msgid "You can't send a message to this user." msgstr "Bạn đã theo những ngÆ°á»i này:" -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:484 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 +#: lib/command.php:475 msgid "No content!" msgstr "Không có ná»™i dung!" @@ -2027,7 +2169,7 @@ msgstr "Không có ná»™i dung!" msgid "No recipient specified." msgstr "" -#: actions/newmessage.php:164 lib/command.php:370 +#: actions/newmessage.php:164 lib/command.php:361 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -2039,7 +2181,7 @@ msgstr "Tin má»›i nhất" #: 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 @@ -2113,6 +2255,50 @@ msgstr "Tin đã gá»­i" msgid "Nudge sent!" msgstr "Tin đã gá»­i" +#: actions/oauthappssettings.php:59 +#, fuzzy +msgid "You must be logged in to list your applications." +msgstr "Bạn phải đăng nhập vào má»›i có thể gá»­i thÆ° má»i những " + +#: actions/oauthappssettings.php:74 +msgid "OAuth applications" +msgstr "" + +#: actions/oauthappssettings.php:85 +msgid "Applications you have registered" +msgstr "" + +#: actions/oauthappssettings.php:135 +#, php-format +msgid "You have not registered any applications yet." +msgstr "" + +#: actions/oauthconnectionssettings.php:71 +msgid "Connected applications" +msgstr "" + +#: actions/oauthconnectionssettings.php:87 +msgid "You have allowed the following applications to access you account." +msgstr "" + +#: actions/oauthconnectionssettings.php:170 +#, fuzzy +msgid "You are not a user of that application." +msgstr "Bạn chÆ°a cập nhật thông tin riêng" + +#: actions/oauthconnectionssettings.php:180 +msgid "Unable to revoke access for app: " +msgstr "" + +#: actions/oauthconnectionssettings.php:192 +#, php-format +msgid "You have not authorized any applications to use your account." +msgstr "" + +#: actions/oauthconnectionssettings.php:205 +msgid "Developers can edit the registration settings for their applications " +msgstr "" + #: actions/oembed.php:79 actions/shownotice.php:100 msgid "Notice has no profile" msgstr "Tin nhắn không có hồ sÆ¡ cá nhân" @@ -2131,8 +2317,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:1038 +#: lib/api.php:1066 lib/api.php:1176 msgid "Not a supported data format." msgstr "Không há»— trợ định dạng dữ liệu này." @@ -2147,7 +2333,7 @@ msgstr "Tìm kiếm thông báo" #: actions/othersettings.php:60 #, fuzzy -msgid "Other Settings" +msgid "Other settings" msgstr "Thiết lập tài khoản Twitter" #: actions/othersettings.php:71 @@ -2180,6 +2366,30 @@ 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/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 msgid "Outbox for %s" @@ -2218,7 +2428,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" @@ -2394,8 +2604,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" @@ -2458,43 +2669,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 -#: lib/groupeditform.php:161 +#: actions/profilesettings.php:115 actions/register.php:453 +#: lib/applicationeditform.php:230 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\"" @@ -2797,7 +3008,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 "" @@ -2810,7 +3021,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:457 +#: actions/register.php:114 actions/register.php:503 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Äăng ký" @@ -2824,67 +3035,63 @@ 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 +#: actions/register.php:538 #, fuzzy, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -2915,7 +3122,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.)" @@ -3069,6 +3276,84 @@ 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/showapplication.php:82 +#, fuzzy +msgid "You must be logged in to view an application." +msgstr "Bạn phải đăng nhập vào má»›i có thể gá»­i thÆ° má»i những " + +#: actions/showapplication.php:158 +#, fuzzy +msgid "Application profile" +msgstr "Tin nhắn không có hồ sÆ¡ cá nhân" + +#: actions/showapplication.php:160 lib/applicationeditform.php:182 +msgid "Icon" +msgstr "" + +#: actions/showapplication.php:170 actions/version.php:195 +#: lib/applicationeditform.php:197 +#, fuzzy +msgid "Name" +msgstr "Biệt danh" + +#: actions/showapplication.php:179 lib/applicationeditform.php:224 +#, fuzzy +msgid "Organization" +msgstr "ThÆ° má»i đã gá»­i" + +#: actions/showapplication.php:188 actions/version.php:198 +#: lib/applicationeditform.php:211 lib/groupeditform.php:172 +msgid "Description" +msgstr "Mô tả" + +#: actions/showapplication.php:193 actions/showgroup.php:429 +#: lib/profileaction.php:174 +msgid "Statistics" +msgstr "Số liệu thống kê" + +#: actions/showapplication.php:204 +#, php-format +msgid "created by %1$s - %2$s access by default - %3$d users" +msgstr "" + +#: actions/showapplication.php:214 +msgid "Application actions" +msgstr "" + +#: actions/showapplication.php:233 +msgid "Reset key & secret" +msgstr "" + +#: actions/showapplication.php:241 +msgid "Application info" +msgstr "" + +#: actions/showapplication.php:243 +msgid "Consumer key" +msgstr "" + +#: actions/showapplication.php:248 +msgid "Consumer secret" +msgstr "" + +#: actions/showapplication.php:253 +msgid "Request token URL" +msgstr "" + +#: actions/showapplication.php:258 +msgid "Access token URL" +msgstr "" + +#: actions/showapplication.php:263 +msgid "Authorize URL" +msgstr "" + +#: actions/showapplication.php:268 +msgid "" +"Note: We support HMAC-SHA1 signatures. We do not support the plaintext " +"signature method." +msgstr "" + #: 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" @@ -3169,7 +3454,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 "" @@ -3178,10 +3463,6 @@ msgstr "" msgid "All members" msgstr "Thành viên" -#: actions/showgroup.php:429 lib/profileaction.php:174 -msgid "Statistics" -msgstr "Số liệu thống kê" - #: actions/showgroup.php:432 #, fuzzy msgid "Created" @@ -3324,12 +3605,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 @@ -3519,7 +3800,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 @@ -3551,7 +3833,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 @@ -3814,11 +4097,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" @@ -4028,11 +4306,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" @@ -4110,11 +4383,6 @@ msgstr "" 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" @@ -4124,27 +4392,43 @@ msgstr "Cá nhân" msgid "Author(s)" msgstr "" -#: actions/version.php:198 lib/groupeditform.php:172 -msgid "Description" -msgstr "Mô tả" - -#: classes/File.php:137 +#: 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/Group_member.php:41 +#, fuzzy +msgid "Group join failed." +msgstr "Thông tin nhóm" + +#: classes/Group_member.php:53 +#, fuzzy +msgid "Not part of group." +msgstr "Không thể cập nhật thành viên." + +#: classes/Group_member.php:60 +#, fuzzy +msgid "Group leave failed." +msgstr "Thông tin nhóm" + +#: 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." @@ -4160,51 +4444,51 @@ msgstr "Không thể chèn thêm vào đăng nhận." msgid "Could not update message with new URI." msgstr "Không thể cập nhật thông tin user vá»›i địa chỉ email đã được xác nhận." -#: classes/Notice.php:172 +#: classes/Notice.php:171 #, fuzzy, php-format msgid "DB error inserting hashtag: %s" msgstr "Lá»—i cÆ¡ sở dữ liệu khi chèn trả lá»i: %s" -#: classes/Notice.php:226 +#: classes/Notice.php:225 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Có lá»—i xảy ra khi lÆ°u tin nhắn." -#: classes/Notice.php:230 +#: classes/Notice.php:229 #, fuzzy msgid "Problem saving notice. Unknown user." msgstr "Có lá»—i xảy ra khi lÆ°u tin nhắn." -#: classes/Notice.php:235 +#: classes/Notice.php:234 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:241 +#: classes/Notice.php:240 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:247 +#: classes/Notice.php:246 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:309 classes/Notice.php:334 +#: classes/Notice.php:305 classes/Notice.php:330 msgid "Problem saving notice." msgstr "Có lá»—i xảy ra khi lÆ°u tin nhắn." -#: classes/Notice.php:1034 +#: classes/Notice.php:1052 #, php-format msgid "DB error inserting reply: %s" msgstr "Lá»—i cÆ¡ sở dữ liệu khi chèn trả lá»i: %s" -#: classes/Notice.php:1359 +#: classes/Notice.php:1423 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%s (%s)" -#: classes/User.php:368 +#: classes/User.php:382 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "%s chào mừng bạn " @@ -4250,6 +4534,11 @@ msgstr "Sau" msgid "Other options" msgstr "" +#: lib/action.php:144 +#, fuzzy, php-format +msgid "%1$s - %2$s" +msgstr "%s (%s)" + #: lib/action.php:159 msgid "Untitled page" msgstr "" @@ -4266,11 +4555,6 @@ msgstr "Trang chủ" msgid "Personal profile and friends timeline" msgstr "" -#: lib/action.php:435 -#, fuzzy -msgid "Account" -msgstr "Giá»›i thiệu" - #: lib/action.php:435 #, fuzzy msgid "Change your email, avatar, password, profile" @@ -4439,11 +4723,6 @@ msgstr "Sau" msgid "Before" msgstr "TrÆ°á»›c" -#: 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." - #: lib/adminpanelaction.php:96 #, fuzzy msgid "You cannot make changes to this site." @@ -4482,6 +4761,72 @@ msgstr "Xác nhận SMS" msgid "Paths configuration" msgstr "Xác nhận SMS" +#: lib/applicationeditform.php:186 +msgid "Icon for this application" +msgstr "" + +#: lib/applicationeditform.php:206 +#, fuzzy, php-format +msgid "Describe your application in %d characters" +msgstr "Nói vá» những sở thích của nhóm trong vòng 140 ký tá»±" + +#: lib/applicationeditform.php:209 +#, fuzzy +msgid "Describe your application" +msgstr "Nói vá» những sở thích của nhóm trong vòng 140 ký tá»±" + +#: lib/applicationeditform.php:218 +#, fuzzy +msgid "Source URL" +msgstr "Nguồn" + +#: lib/applicationeditform.php:220 +#, fuzzy +msgid "URL of the homepage of this application" +msgstr "URL vá» Trang chính, Blog, hoặc hồ sÆ¡ cá nhân của bạn trên " + +#: lib/applicationeditform.php:226 +msgid "Organization responsible for this application" +msgstr "" + +#: lib/applicationeditform.php:232 +#, fuzzy +msgid "URL for the homepage of the organization" +msgstr "URL vá» Trang chính, Blog, hoặc hồ sÆ¡ cá nhân của bạn trên " + +#: lib/applicationeditform.php:238 +msgid "URL to redirect to after authentication" +msgstr "" + +#: lib/applicationeditform.php:260 +msgid "Browser" +msgstr "" + +#: lib/applicationeditform.php:276 +msgid "Desktop" +msgstr "" + +#: lib/applicationeditform.php:277 +msgid "Type of application, browser or desktop" +msgstr "" + +#: lib/applicationeditform.php:299 +msgid "Read-only" +msgstr "" + +#: lib/applicationeditform.php:317 +msgid "Read-write" +msgstr "" + +#: lib/applicationeditform.php:318 +msgid "Default access for this application: read-only, or read-write" +msgstr "" + +#: lib/applicationlist.php:154 +#, fuzzy +msgid "Revoke" +msgstr "Xóa" + #: lib/attachmentlist.php:87 msgid "Attachments" msgstr "" @@ -4503,12 +4848,12 @@ msgstr "" msgid "Tags for this attachment" msgstr "" -#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 +#: lib/authenticationplugin.php:214 lib/authenticationplugin.php:219 #, fuzzy msgid "Password changing failed" msgstr "Äã lÆ°u mật khẩu." -#: lib/authenticationplugin.php:197 +#: lib/authenticationplugin.php:229 #, fuzzy msgid "Password changing is not allowed" msgstr "Äã lÆ°u mật khẩu." @@ -4533,7 +4878,7 @@ msgstr "" #: lib/command.php:88 #, fuzzy, php-format -msgid "Could not find a user with nickname %s." +msgid "Could not find a user with nickname %s" msgstr "Không thể cập nhật thông tin user vá»›i địa chỉ email đã được xác nhận." #: lib/command.php:92 @@ -4542,7 +4887,7 @@ msgstr "" #: lib/command.php:99 #, fuzzy, php-format -msgid "Nudge sent to %s." +msgid "Nudge sent to %s" msgstr "Tin đã gá»­i" #: lib/command.php:126 @@ -4553,15 +4898,15 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:399 lib/command.php:460 +#: lib/command.php:152 lib/command.php:390 lib/command.php:451 #, fuzzy -msgid "Notice with that id does not exist." +msgid "Notice with that id does not exist" msgstr "Không tìm thấy trạng thái nào tÆ°Æ¡ng ứng vá»›i ID đó." -#: lib/command.php:168 lib/command.php:415 lib/command.php:476 -#: lib/command.php:532 +#: lib/command.php:168 lib/command.php:406 lib/command.php:467 +#: lib/command.php:523 #, fuzzy -msgid "User has no last notice." +msgid "User has no last notice" msgstr "NgÆ°á»i dùng không có thông tin." #: lib/command.php:190 @@ -4569,156 +4914,181 @@ 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:284 +#: 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:231 #, fuzzy, php-format -msgid "Could not remove user %1$s to group %2$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:318 +#: lib/command.php:236 +#, fuzzy, php-format +msgid "%s joined group %s" +msgstr "%s và nhóm" + +#: lib/command.php:275 +#, 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:280 +#, fuzzy, php-format +msgid "%s left group %s" +msgstr "%s và nhóm" + +#: lib/command.php:309 #, fuzzy, php-format msgid "Fullname: %s" msgstr "Tên đầy đủ" -#: lib/command.php:321 +#: lib/command.php:312 lib/mail.php:254 #, fuzzy, php-format msgid "Location: %s" msgstr "Thành phố: %s" -#: lib/command.php:324 +#: lib/command.php:315 lib/mail.php:256 #, fuzzy, php-format msgid "Homepage: %s" msgstr "Trang chủ hoặc Blog: %s" -#: lib/command.php:327 +#: lib/command.php:318 #, fuzzy, php-format msgid "About: %s" msgstr "Giá»›i thiệu" -#: lib/command.php:358 +#: lib/command.php:349 #, php-format -msgid "Message too long - maximum is %1$d characters, you sent %2$d." +msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:376 +#: lib/command.php:367 #, fuzzy, php-format -msgid "Direct message to %s sent." +msgid "Direct message to %s sent" msgstr "Tin nhắn riêng" -#: lib/command.php:378 +#: lib/command.php:369 #, fuzzy msgid "Error sending direct message." msgstr "ThÆ° bạn đã gá»­i" -#: lib/command.php:435 +#: lib/command.php:413 +#, fuzzy +msgid "Cannot repeat your own notice" +msgstr "Bạn không thể đăng ký nếu không đồng ý các Ä‘iá»u khoản." + +#: lib/command.php:418 +#, fuzzy +msgid "Already repeated that notice" +msgstr "Xóa tin nhắn" + +#: lib/command.php:426 #, fuzzy, php-format -msgid "Notice from %s repeated." +msgid "Notice from %s repeated" msgstr "Tin đã gá»­i" -#: lib/command.php:437 +#: lib/command.php:428 #, fuzzy msgid "Error repeating notice." msgstr "Có lá»—i xảy ra khi lÆ°u tin nhắn." -#: lib/command.php:491 +#: lib/command.php:482 #, php-format -msgid "Notice too long - maximum is %1$d characters, you sent %2$d." +msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:500 +#: lib/command.php:491 #, fuzzy, php-format -msgid "Reply to %s sent." +msgid "Reply to %s sent" msgstr "Trả lá»i tin nhắn này" -#: lib/command.php:502 +#: lib/command.php:493 #, fuzzy msgid "Error saving notice." msgstr "Có lá»—i xảy ra khi lÆ°u tin nhắn." -#: lib/command.php:556 -msgid "Specify the name of the user to subscribe to." +#: lib/command.php:547 +msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:563 +#: lib/command.php:554 #, fuzzy, php-format msgid "Subscribed to %s" msgstr "Theo nhóm này" -#: lib/command.php:584 -msgid "Specify the name of the user to unsubscribe from." +#: lib/command.php:575 +msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:591 +#: lib/command.php:582 #, fuzzy, php-format msgid "Unsubscribed from %s" msgstr "Hết theo" -#: lib/command.php:609 lib/command.php:632 +#: lib/command.php:600 lib/command.php:623 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:612 +#: lib/command.php:603 #, fuzzy msgid "Notification off." msgstr "Không có mã số xác nhận." -#: lib/command.php:614 +#: lib/command.php:605 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:635 +#: lib/command.php:626 #, fuzzy msgid "Notification on." msgstr "Không có mã số xác nhận." -#: lib/command.php:637 +#: lib/command.php:628 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:650 -msgid "Login command is disabled." +#: lib/command.php:641 +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:652 #, php-format -msgid "This link is useable only once, and is good for only 2 minutes: %s." +msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:685 +#: lib/command.php:668 #, 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:670 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:690 #, fuzzy msgid "No one is subscribed to you." msgstr "Không thể tạo favorite." -#: lib/command.php:709 +#: lib/command.php:692 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:712 #, 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:714 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:728 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4759,20 +5129,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:199 +#: lib/common.php:131 #, fuzzy msgid "No configuration file found. " msgstr "Không có mã số xác nhận." -#: lib/common.php:200 +#: lib/common.php:132 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:201 +#: lib/common.php:134 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:202 +#: lib/common.php:135 msgid "Go to the installer." msgstr "" @@ -4788,6 +5158,15 @@ msgstr "Thay đổi bởi tin nhắn nhanh (IM)" msgid "Updates by SMS" msgstr "Thay đổi bởi SMS" +#: lib/connectsettingsaction.php:120 +#, fuzzy +msgid "Connections" +msgstr "Kết nối" + +#: lib/connectsettingsaction.php:121 +msgid "Authorized connected applications" +msgstr "" + #: lib/dberroraction.php:60 msgid "Database error" msgstr "" @@ -4989,11 +5368,16 @@ msgstr "" msgid "kB" msgstr "" -#: lib/jabber.php:191 +#: lib/jabber.php:202 #, php-format msgid "[%s]" msgstr "" +#: lib/jabber.php:385 +#, php-format +msgid "Unknown inbox source %d." +msgstr "" + #: lib/joinform.php:114 #, fuzzy msgid "Join" @@ -5076,22 +5460,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 @@ -5314,7 +5686,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 @@ -5322,7 +5694,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 @@ -5332,7 +5705,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 @@ -5369,16 +5742,18 @@ msgstr "" #: lib/noticeform.php:212 #, 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." +msgid "Share my location" msgstr "Không thể lÆ°u hồ sÆ¡ cá nhân." #: lib/noticeform.php:215 -msgid "Hide this info" +#, fuzzy +msgid "Do not share my location" +msgstr "Không thể lÆ°u hồ sÆ¡ cá nhân." + +#: lib/noticeform.php:216 +msgid "" +"Sorry, retrieving your geo location is taking longer than expected, please " +"try again later" msgstr "" #: lib/noticelist.php:428 @@ -5664,27 +6039,27 @@ msgstr "" msgid "User has blocked you." msgstr "NgÆ°á»i dùng không có thông tin." -#: lib/subs.php:60 +#: lib/subs.php:63 #, fuzzy msgid "Could not subscribe." msgstr "ChÆ°a đăng nhận!" -#: lib/subs.php:79 +#: lib/subs.php:82 #, fuzzy msgid "Could not subscribe other to you." msgstr "Không thể tạo favorite." -#: lib/subs.php:128 +#: lib/subs.php:137 #, fuzzy msgid "Not subscribed!" msgstr "ChÆ°a đăng nhận!" -#: lib/subs.php:133 +#: lib/subs.php:142 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "Không thể xóa đăng nhận." -#: lib/subs.php:146 +#: lib/subs.php:158 msgid "Couldn't delete subscription." msgstr "Không thể xóa đăng nhận." @@ -5698,10 +6073,6 @@ msgstr "" msgid "People Tagcloud as tagged" msgstr "" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "" - #: lib/tagcloudsection.php:56 #, fuzzy msgid "None" @@ -5771,47 +6142,47 @@ msgstr "Tin má»›i nhất" msgid "Moderate" msgstr "" -#: lib/util.php:837 +#: lib/util.php:875 msgid "a few seconds ago" msgstr "vài giây trÆ°á»›c" -#: lib/util.php:839 +#: lib/util.php:877 msgid "about a minute ago" msgstr "1 phút trÆ°á»›c" -#: lib/util.php:841 +#: lib/util.php:879 #, php-format msgid "about %d minutes ago" msgstr "%d phút trÆ°á»›c" -#: lib/util.php:843 +#: lib/util.php:881 msgid "about an hour ago" msgstr "1 giá» trÆ°á»›c" -#: lib/util.php:845 +#: lib/util.php:883 #, php-format msgid "about %d hours ago" msgstr "%d giá» trÆ°á»›c" -#: lib/util.php:847 +#: lib/util.php:885 msgid "about a day ago" msgstr "1 ngày trÆ°á»›c" -#: lib/util.php:849 +#: lib/util.php:887 #, php-format msgid "about %d days ago" msgstr "%d ngày trÆ°á»›c" -#: lib/util.php:851 +#: lib/util.php:889 msgid "about a month ago" msgstr "1 tháng trÆ°á»›c" -#: lib/util.php:853 +#: lib/util.php:891 #, php-format msgid "about %d months ago" msgstr "%d tháng trÆ°á»›c" -#: lib/util.php:855 +#: lib/util.php:893 msgid "about a year ago" msgstr "1 năm trÆ°á»›c" @@ -5827,5 +6198,5 @@ msgstr "" #: scripts/xmppdaemon.php:301 #, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po index 4c719648d6..ec2e005d10 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-10 00:46+0000\n" -"PO-Revision-Date: 2010-01-10 00:49:25+0000\n" +"POT-Creation-Date: 2010-01-15 19:15+0000\n" +"PO-Revision-Date: 2010-01-15 19:18:17+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 (r60878); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r61101); 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" @@ -35,25 +35,30 @@ msgstr "没有该页é¢" #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 +#: actions/apistatusesupdate.php:149 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 #: 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 #: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 -#: lib/command.php:163 lib/command.php:311 lib/command.php:364 -#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/command.php:163 lib/command.php:302 lib/command.php:355 +#: lib/command.php:401 lib/command.php:462 lib/command.php:518 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/subs.php:34 lib/subs.php:125 msgid "No such user." msgstr "没有这个用户。" +#: actions/all.php:84 +#, fuzzy, php-format +msgid "%1$s and friends, page %2$d" +msgstr "%s åŠå¥½å‹" + #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 +#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -106,7 +111,7 @@ msgstr "" msgid "You and friends" msgstr "%s åŠå¥½å‹" -#: actions/allrss.php:119 actions/apitimelinefriends.php:122 +#: actions/allrss.php:119 actions/apitimelinefriends.php:121 #: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" @@ -117,6 +122,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:155 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 方法未实现ï¼" @@ -131,7 +153,7 @@ msgstr "API 方法未实现ï¼" #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:114 +#: actions/apistatusesupdate.php:119 msgid "This method requires a POST." msgstr "此方法接å—POST请求。" @@ -162,8 +184,9 @@ msgstr "无法ä¿å­˜ä¸ªäººä¿¡æ¯ã€‚" #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257 -#: actions/designadminpanel.php:122 actions/newnotice.php:94 +#: actions/apistatusesupdate.php:132 actions/avatarsettings.php:257 +#: actions/designadminpanel.php:122 actions/editapplication.php:118 +#: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format msgid "" @@ -175,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 #, fuzzy msgid "Unable to save your design settings." msgstr "无法ä¿å­˜ Twitter 设置ï¼" @@ -218,26 +244,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 +268,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 @@ -271,7 +277,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 @@ -293,8 +299,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." @@ -328,7 +335,8 @@ msgstr "昵称已被使用，æ¢ä¸€ä¸ªå§ã€‚" msgid "Not a valid nickname." msgstr "ä¸æ˜¯æœ‰æ•ˆçš„昵称。" -#: actions/apigroupcreate.php:196 actions/editgroup.php:195 +#: actions/apigroupcreate.php:196 actions/editapplication.php:212 +#: actions/editgroup.php:195 actions/newapplication.php:200 #: actions/newgroup.php:139 actions/profilesettings.php:222 #: actions/register.php:217 msgid "Homepage is not a valid URL." @@ -340,7 +348,8 @@ msgstr "主页的URLä¸æ­£ç¡®ã€‚" msgid "Full name is too long (max 255 chars)." msgstr "å…¨å过长(ä¸èƒ½è¶…过 255 个字符)。" -#: actions/apigroupcreate.php:213 +#: actions/apigroupcreate.php:213 actions/editapplication.php:187 +#: actions/newapplication.php:169 #, fuzzy, php-format msgid "Description is too long (max %d chars)." msgstr "æ述过长(ä¸èƒ½è¶…过140字符)。" @@ -381,7 +390,7 @@ msgstr "" msgid "Group not found!" msgstr "API 方法未实现ï¼" -#: actions/apigroupjoin.php:110 lib/command.php:217 +#: actions/apigroupjoin.php:110 actions/joingroup.php:90 #, fuzzy msgid "You are already a member of that group." msgstr "您已ç»æ˜¯è¯¥ç»„æˆå‘˜" @@ -390,7 +399,7 @@ msgstr "您已ç»æ˜¯è¯¥ç»„æˆå‘˜" msgid "You have been blocked from that group by the admin." msgstr "" -#: actions/apigroupjoin.php:138 lib/command.php:234 +#: actions/apigroupjoin.php:138 actions/joingroup.php:124 #, fuzzy, php-format msgid "Could not join user %1$s to group %2$s." msgstr "无法把 %s 用户添加到 %s 组" @@ -400,7 +409,7 @@ msgstr "无法把 %s 用户添加到 %s 组" msgid "You are not a member of this group." msgstr "您未告知此个人信æ¯" -#: actions/apigroupleave.php:124 actions/leavegroup.php:127 +#: actions/apigroupleave.php:124 actions/leavegroup.php:119 #, fuzzy, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "无法订阅用户：未找到。" @@ -420,6 +429,101 @@ msgstr "%s 群组" msgid "groups on %s" msgstr "组动作" +#: actions/apioauthauthorize.php:108 actions/apioauthauthorize.php:114 +msgid "Bad request." +msgstr "" + +#: actions/apioauthauthorize.php:134 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:115 actions/makeadmin.php:66 +#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 +#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:139 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 +#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/subscribe.php:46 actions/tagother.php:166 +#: 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 "会è¯æ ‡è¯†æœ‰é—®é¢˜ï¼Œè¯·é‡è¯•ã€‚" + +#: actions/apioauthauthorize.php:146 +#, fuzzy +msgid "Invalid nickname / password!" +msgstr "用户å或密ç ä¸æ­£ç¡®ã€‚" + +#: actions/apioauthauthorize.php:170 +#, fuzzy +msgid "DB error deleting OAuth app user." +msgstr "ä¿å­˜ç”¨æˆ·è®¾ç½®æ—¶å‡ºé”™ã€‚" + +#: actions/apioauthauthorize.php:196 +#, fuzzy +msgid "DB error inserting OAuth app user." +msgstr "添加标签时数æ®åº“出错：%s" + +#: actions/apioauthauthorize.php:231 +#, php-format +msgid "" +"The request token %s has been authorized. Please exchange it for an access " +"token." +msgstr "" + +#: actions/apioauthauthorize.php:241 +#, php-format +msgid "The request token %s has been denied." +msgstr "" + +#: actions/apioauthauthorize.php:246 actions/avatarsettings.php:281 +#: actions/designadminpanel.php:103 actions/editapplication.php:139 +#: actions/emailsettings.php:256 actions/grouplogo.php:319 +#: actions/imsettings.php:220 actions/newapplication.php:121 +#: actions/oauthconnectionssettings.php:151 actions/recoverpassword.php:44 +#: actions/smssettings.php:248 lib/designsettings.php:304 +msgid "Unexpected form submission." +msgstr "未预料的表å•æ交。" + +#: actions/apioauthauthorize.php:273 +msgid "An application would like to connect to your account" +msgstr "" + +#: actions/apioauthauthorize.php:290 +msgid "Allow or deny access" +msgstr "" + +#: actions/apioauthauthorize.php:320 lib/action.php:435 +msgid "Account" +msgstr "å¸å·" + +#: actions/apioauthauthorize.php:323 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/apioauthauthorize.php:326 actions/login.php:233 +#: actions/register.php:429 lib/accountsettingsaction.php:116 +msgid "Password" +msgstr "密ç " + +#: actions/apioauthauthorize.php:338 +msgid "Deny" +msgstr "" + +#: actions/apioauthauthorize.php:344 +#, fuzzy +msgid "Allow" +msgstr "全部" + +#: actions/apioauthauthorize.php:361 +msgid "Allow or deny access to your account information." +msgstr "" + #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." msgstr "此方法接å—POST或DELETE请求。" @@ -433,12 +537,12 @@ msgstr "您ä¸èƒ½åˆ é™¤å…¶ä»–用户的状æ€ã€‚" msgid "No such notice." msgstr "没有这份通告。" -#: actions/apistatusesretweet.php:83 lib/command.php:422 +#: actions/apistatusesretweet.php:83 #, fuzzy msgid "Cannot repeat your own notice." msgstr "无法开å¯é€šå‘Šã€‚" -#: actions/apistatusesretweet.php:91 lib/command.php:427 +#: actions/apistatusesretweet.php:91 #, fuzzy msgid "Already repeated that notice." msgstr "删除通告" @@ -452,17 +556,17 @@ msgstr "头åƒå·²æ›´æ–°ã€‚" msgid "No status with that ID found." msgstr "没有找到此IDçš„ä¿¡æ¯ã€‚" -#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:162 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "超出长度é™åˆ¶ã€‚ä¸èƒ½è¶…过 140 个字符。" -#: actions/apistatusesupdate.php:198 +#: actions/apistatusesupdate.php:203 msgid "Not found" msgstr "未找到" -#: actions/apistatusesupdate.php:221 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:226 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -549,8 +653,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 "没有昵称。" @@ -573,8 +680,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 "找ä¸åˆ°åŒ¹é…的用户。" @@ -607,29 +714,6 @@ 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/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 -#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 -#: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 -#: actions/subscribe.php:46 actions/tagother.php:166 -#: 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 "会è¯æ ‡è¯†æœ‰é—®é¢˜ï¼Œè¯·é‡è¯•ã€‚" - -#: actions/avatarsettings.php:281 actions/designadminpanel.php:103 -#: actions/emailsettings.php:256 actions/grouplogo.php:319 -#: actions/imsettings.php:220 actions/recoverpassword.php:44 -#: actions/smssettings.php:248 lib/designsettings.php:304 -msgid "Unexpected form submission." -msgstr "未预料的表å•æ交。" - #: actions/avatarsettings.php:328 msgid "Pick a square area of the image to be your avatar" msgstr "请选择一å—方形区域作为你的头åƒ" @@ -693,20 +777,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:260 +msgid "No such group." +msgstr "没有这个组。" #: actions/blockedfromgroup.php:90 #, fuzzy, php-format @@ -777,7 +856,8 @@ msgid "Couldn't delete email confirmation." msgstr "无法删除电å­é‚®ä»¶ç¡®è®¤ã€‚" #: actions/confirmaddress.php:144 -msgid "Confirm Address" +#, fuzzy +msgid "Confirm address" msgstr "确认地å€" #: actions/confirmaddress.php:159 @@ -834,11 +914,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." @@ -982,7 +1057,8 @@ msgstr "" #: actions/pathsadminpanel.php:324 actions/profilesettings.php:174 #: actions/siteadminpanel.php:388 actions/smssettings.php:181 #: actions/subscriptions.php:203 actions/tagother.php:154 -#: actions/useradminpanel.php:313 lib/designsettings.php:256 +#: actions/useradminpanel.php:313 lib/applicationeditform.php:335 +#: lib/applicationeditform.php:336 lib/designsettings.php:256 #: lib/groupeditform.php:202 msgid "Save" msgstr "ä¿å­˜" @@ -1003,6 +1079,87 @@ msgstr "加入收è—" msgid "No such document." msgstr "没有这份文档。" +#: actions/editapplication.php:54 lib/applicationeditform.php:136 +msgid "Edit application" +msgstr "" + +#: actions/editapplication.php:66 +#, fuzzy +msgid "You must be logged in to edit an application." +msgstr "您必须登录æ‰èƒ½åˆ›å»ºå°ç»„。" + +#: actions/editapplication.php:77 actions/showapplication.php:94 +#, fuzzy +msgid "You are not the owner of this application." +msgstr "您未告知此个人信æ¯" + +#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:163 +#: actions/showapplication.php:87 +#, fuzzy +msgid "No such application." +msgstr "没有这份通告。" + +#: actions/editapplication.php:127 actions/newapplication.php:110 +#: actions/showapplication.php:118 lib/action.php:1167 +#, fuzzy +msgid "There was a problem with your session token." +msgstr "会è¯æ ‡è¯†æœ‰é—®é¢˜ï¼Œè¯·é‡è¯•ã€‚" + +#: actions/editapplication.php:161 +#, fuzzy +msgid "Use this form to edit your application." +msgstr "使用这个表å•æ¥ç¼–辑组" + +#: actions/editapplication.php:177 actions/newapplication.php:159 +#, fuzzy +msgid "Name is required." +msgstr "相åŒçš„密ç ã€‚此项必填。" + +#: actions/editapplication.php:180 actions/newapplication.php:162 +#, fuzzy +msgid "Name is too long (max 255 chars)." +msgstr "å…¨å过长(ä¸èƒ½è¶…过 255 个字符)。" + +#: actions/editapplication.php:183 actions/newapplication.php:165 +#, fuzzy +msgid "Description is required." +msgstr "æè¿°" + +#: actions/editapplication.php:191 +msgid "Source URL is too long." +msgstr "" + +#: actions/editapplication.php:197 actions/newapplication.php:182 +#, fuzzy +msgid "Source URL is not valid." +msgstr "主页的URLä¸æ­£ç¡®ã€‚" + +#: actions/editapplication.php:200 actions/newapplication.php:185 +msgid "Organization is required." +msgstr "" + +#: actions/editapplication.php:203 actions/newapplication.php:188 +#, fuzzy +msgid "Organization is too long (max 255 chars)." +msgstr "ä½ç½®è¿‡é•¿(ä¸èƒ½è¶…过255个字符)。" + +#: actions/editapplication.php:206 actions/newapplication.php:191 +msgid "Organization homepage is required." +msgstr "" + +#: actions/editapplication.php:215 actions/newapplication.php:203 +msgid "Callback is too long." +msgstr "" + +#: actions/editapplication.php:222 actions/newapplication.php:212 +msgid "Callback URL is not valid." +msgstr "" + +#: actions/editapplication.php:255 +#, fuzzy +msgid "Could not update application." +msgstr "无法更新组" + #: actions/editgroup.php:56 #, php-format msgid "Edit %s group" @@ -1014,7 +1171,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 @@ -1040,7 +1198,8 @@ msgid "Options saved." msgstr "选项已ä¿å­˜ã€‚" #: actions/emailsettings.php:60 -msgid "Email Settings" +#, fuzzy +msgid "Email settings" msgstr "电å­é‚®ä»¶è®¾ç½®" #: actions/emailsettings.php:71 @@ -1072,12 +1231,14 @@ msgstr "" "指示。" #: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 +#: actions/smssettings.php:126 lib/applicationeditform.php:333 +#: lib/applicationeditform.php:334 msgid "Cancel" msgstr "å–消" #: actions/emailsettings.php:121 -msgid "Email Address" +#, fuzzy +msgid "Email address" msgstr "电å­é‚®ä»¶åœ°å€" #: actions/emailsettings.php:123 @@ -1152,9 +1313,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." @@ -1341,13 +1503,6 @@ 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:79 #, fuzzy msgid "No such file." @@ -1367,7 +1522,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çš„ä¿¡æ¯ã€‚" @@ -1419,8 +1574,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 @@ -1445,13 +1601,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." @@ -1467,6 +1616,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." @@ -1595,7 +1749,8 @@ msgid "Error removing the block." msgstr "ä¿å­˜ç”¨æˆ·æ—¶å‡ºé”™ã€‚" #: actions/imsettings.php:59 -msgid "IM Settings" +#, fuzzy +msgid "IM settings" msgstr "IM 设置" #: actions/imsettings.php:70 @@ -1626,7 +1781,8 @@ msgstr "" "（你是å¦å·²ç»æ·»åŠ  %s为你的好å‹ï¼Ÿï¼‰" #: actions/imsettings.php:124 -msgid "IM Address" +#, fuzzy +msgid "IM address" msgstr "IM å¸å·" #: actions/imsettings.php:126 @@ -1720,7 +1876,7 @@ msgstr "邀请新用户" msgid "You are already subscribed to these users:" msgstr "您已订阅这些用户：" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:315 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -1761,7 +1917,7 @@ msgstr "个人消æ¯" msgid "Optionally add a personal message to the invitation." msgstr "在邀请中加几å¥è¯(å¯é€‰)。" -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236 msgid "Send" msgstr "å‘é€" @@ -1826,16 +1982,7 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "您必须登录æ‰èƒ½åŠ å…¥ç»„。" -#: actions/joingroup.php:90 -msgid "You are already a member of that group" -msgstr "您已ç»æ˜¯è¯¥ç»„æˆå‘˜" - -#: actions/joingroup.php:128 -#, fuzzy, php-format -msgid "Could not join user %1$s to group %2$s" -msgstr "无法把 %s 用户添加到 %s 组" - -#: actions/joingroup.php:135 lib/command.php:239 +#: actions/joingroup.php:131 #, fuzzy, php-format msgid "%1$s joined group %2$s" msgstr "%s 加入 %s 组" @@ -1845,78 +1992,57 @@ msgstr "%s 加入 %s 组" msgid "You must be logged in to leave a group." msgstr "您必须登录æ‰èƒ½é‚€è¯·å…¶ä»–人使用 %s" -#: actions/leavegroup.php:90 lib/command.php:268 +#: actions/leavegroup.php:90 lib/command.php:265 #, fuzzy msgid "You are not a member of that group." msgstr "您未告知此个人信æ¯" -#: actions/leavegroup.php:119 lib/command.php:278 -#, fuzzy -msgid "Could not find membership record." -msgstr "无法更新用户记录。" - -#: actions/leavegroup.php:134 lib/command.php:289 +#: actions/leavegroup.php:127 #, 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:460 +#: 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 -#: lib/groupeditform.php:152 lib/userprofile.php:131 -msgid "Nickname" -msgstr "昵称" - -#: actions/login.php:253 actions/register.php:428 -#: 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]" @@ -1935,19 +2061,42 @@ 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 %1$s in group %2$s" -msgstr "" +#, fuzzy, php-format +msgid "Can't get membership record for %1$s in group %2$s." +msgstr "无法订阅用户：未找到。" #: actions/makeadmin.php:145 #, fuzzy, php-format -msgid "Can't make %1$s an admin for group %2$s" +msgid "Can't make %1$s an admin for group %2$s." msgstr "åªæœ‰adminæ‰èƒ½ç¼–辑这个组" #: actions/microsummary.php:69 msgid "No current status" msgstr "没有当å‰çŠ¶æ€" +#: actions/newapplication.php:52 +msgid "New application" +msgstr "" + +#: actions/newapplication.php:64 +#, fuzzy +msgid "You must be logged in to register an application." +msgstr "您必须登录æ‰èƒ½åˆ›å»ºå°ç»„。" + +#: actions/newapplication.php:143 +#, fuzzy +msgid "Use this form to register a new application." +msgstr "使用此表格创建组。" + +#: actions/newapplication.php:173 +msgid "Source URL is required." +msgstr "" + +#: actions/newapplication.php:255 actions/newapplication.php:264 +#, fuzzy +msgid "Could not create application." +msgstr "无法创建收è—。" + #: actions/newgroup.php:53 msgid "New group" msgstr "新组" @@ -1960,12 +2109,12 @@ msgstr "使用此表格创建组。" msgid "New message" msgstr "新消æ¯" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 msgid "You can't send a message to this user." msgstr "无法å‘此用户å‘é€æ¶ˆæ¯ã€‚" -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:484 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 +#: lib/command.php:475 msgid "No content!" msgstr "没有内容ï¼" @@ -1973,7 +2122,7 @@ msgstr "没有内容ï¼" msgid "No recipient specified." msgstr "没有收件人。" -#: actions/newmessage.php:164 lib/command.php:370 +#: actions/newmessage.php:164 lib/command.php:361 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "ä¸è¦å‘自己å‘é€æ¶ˆæ¯ï¼›è·Ÿè‡ªå·±æ‚„悄说就得了。" @@ -1984,8 +2133,8 @@ msgid "Message sent" msgstr "新消æ¯" #: actions/newmessage.php:185 -#, php-format -msgid "Direct message to %s sent" +#, fuzzy, php-format +msgid "Direct message to %s sent." msgstr "å·²å‘ %s å‘é€æ¶ˆæ¯" #: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 @@ -2055,6 +2204,51 @@ msgstr "振铃呼å«å‘出。" msgid "Nudge sent!" msgstr "振铃呼å«å·²ç»å‘出ï¼" +#: actions/oauthappssettings.php:59 +#, fuzzy +msgid "You must be logged in to list your applications." +msgstr "您必须登录æ‰èƒ½åˆ›å»ºå°ç»„。" + +#: actions/oauthappssettings.php:74 +#, fuzzy +msgid "OAuth applications" +msgstr "其他选项" + +#: actions/oauthappssettings.php:85 +msgid "Applications you have registered" +msgstr "" + +#: actions/oauthappssettings.php:135 +#, php-format +msgid "You have not registered any applications yet." +msgstr "" + +#: actions/oauthconnectionssettings.php:71 +msgid "Connected applications" +msgstr "" + +#: actions/oauthconnectionssettings.php:87 +msgid "You have allowed the following applications to access you account." +msgstr "" + +#: actions/oauthconnectionssettings.php:170 +#, fuzzy +msgid "You are not a user of that application." +msgstr "您未告知此个人信æ¯" + +#: actions/oauthconnectionssettings.php:180 +msgid "Unable to revoke access for app: " +msgstr "" + +#: actions/oauthconnectionssettings.php:192 +#, php-format +msgid "You have not authorized any applications to use your account." +msgstr "" + +#: actions/oauthconnectionssettings.php:205 +msgid "Developers can edit the registration settings for their applications " +msgstr "" + #: actions/oembed.php:79 actions/shownotice.php:100 msgid "Notice has no profile" msgstr "通告没有关è”个人信æ¯" @@ -2073,8 +2267,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:1038 +#: lib/api.php:1066 lib/api.php:1176 msgid "Not a supported data format." msgstr "ä¸æ”¯æŒçš„æ•°æ®æ ¼å¼ã€‚" @@ -2088,7 +2282,7 @@ msgstr "æœç´¢é€šå‘Š" #: actions/othersettings.php:60 #, fuzzy -msgid "Other Settings" +msgid "Other settings" msgstr "Twitter 设置" #: actions/othersettings.php:71 @@ -2121,6 +2315,31 @@ msgstr "" msgid "URL shortening service is too long (max 50 chars)." msgstr "URL缩短æœåŠ¡è¶…é•¿(最多50个字符)。" +#: 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 msgid "Outbox for %s" @@ -2157,7 +2376,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 "确认" @@ -2328,8 +2547,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" @@ -2390,43 +2610,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 -#: lib/groupeditform.php:161 +#: actions/profilesettings.php:115 actions/register.php:453 +#: lib/applicationeditform.php:230 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 "ä½ çš„ä½ç½®ï¼Œæ ¼å¼ç±»ä¼¼\"城市，çœä»½ï¼Œå›½å®¶\"" @@ -2726,7 +2946,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 +2959,7 @@ msgstr "验è¯ç å‡ºé”™ã€‚" msgid "Registration successful" msgstr "注册æˆåŠŸã€‚" -#: actions/register.php:114 actions/register.php:502 lib/action.php:457 +#: actions/register.php:114 actions/register.php:503 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "注册" @@ -2752,65 +2972,61 @@ 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 +#: actions/register.php:538 #, fuzzy, php-format msgid "" "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -2841,7 +3057,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.)" @@ -2994,6 +3210,85 @@ msgstr "无法å‘此用户å‘é€æ¶ˆæ¯ã€‚" msgid "User is already sandboxed." msgstr "用户没有个人信æ¯ã€‚" +#: actions/showapplication.php:82 +#, fuzzy +msgid "You must be logged in to view an application." +msgstr "您必须登录æ‰èƒ½é‚€è¯·å…¶ä»–人使用 %s" + +#: actions/showapplication.php:158 +#, fuzzy +msgid "Application profile" +msgstr "通告没有关è”个人信æ¯" + +#: actions/showapplication.php:160 lib/applicationeditform.php:182 +msgid "Icon" +msgstr "" + +#: actions/showapplication.php:170 actions/version.php:195 +#: lib/applicationeditform.php:197 +#, fuzzy +msgid "Name" +msgstr "昵称" + +#: actions/showapplication.php:179 lib/applicationeditform.php:224 +#, fuzzy +msgid "Organization" +msgstr "分页" + +#: actions/showapplication.php:188 actions/version.php:198 +#: lib/applicationeditform.php:211 lib/groupeditform.php:172 +#, fuzzy +msgid "Description" +msgstr "æè¿°" + +#: actions/showapplication.php:193 actions/showgroup.php:429 +#: lib/profileaction.php:174 +msgid "Statistics" +msgstr "统计" + +#: actions/showapplication.php:204 +#, php-format +msgid "created by %1$s - %2$s access by default - %3$d users" +msgstr "" + +#: actions/showapplication.php:214 +msgid "Application actions" +msgstr "" + +#: actions/showapplication.php:233 +msgid "Reset key & secret" +msgstr "" + +#: actions/showapplication.php:241 +msgid "Application info" +msgstr "" + +#: actions/showapplication.php:243 +msgid "Consumer key" +msgstr "" + +#: actions/showapplication.php:248 +msgid "Consumer secret" +msgstr "" + +#: actions/showapplication.php:253 +msgid "Request token URL" +msgstr "" + +#: actions/showapplication.php:258 +msgid "Access token URL" +msgstr "" + +#: actions/showapplication.php:263 +msgid "Authorize URL" +msgstr "" + +#: actions/showapplication.php:268 +msgid "" +"Note: We support HMAC-SHA1 signatures. We do not support the plaintext " +"signature method." +msgstr "" + #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "无法获å–收è—的通告。" @@ -3094,7 +3389,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 "（没有）" @@ -3102,10 +3397,6 @@ msgstr "（没有）" msgid "All members" msgstr "所有æˆå‘˜" -#: actions/showgroup.php:429 lib/profileaction.php:174 -msgid "Statistics" -msgstr "统计" - #: actions/showgroup.php:432 #, fuzzy msgid "Created" @@ -3252,12 +3543,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 @@ -3448,7 +3739,8 @@ msgid "Save site settings" msgstr "头åƒè®¾ç½®" #: actions/smssettings.php:58 -msgid "SMS Settings" +#, fuzzy +msgid "SMS settings" msgstr "SMS短信设置" #: actions/smssettings.php:69 @@ -3478,7 +3770,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 @@ -3735,11 +4028,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" @@ -3945,11 +4233,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" @@ -4028,11 +4311,6 @@ msgstr "" msgid "Plugins" msgstr "" -#: actions/version.php:195 -#, fuzzy -msgid "Name" -msgstr "昵称" - #: actions/version.php:196 lib/action.php:741 #, fuzzy msgid "Version" @@ -4042,28 +4320,43 @@ msgstr "个人" msgid "Author(s)" msgstr "" -#: actions/version.php:198 lib/groupeditform.php:172 -#, fuzzy -msgid "Description" -msgstr "æè¿°" - -#: classes/File.php:137 +#: 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/Group_member.php:41 +#, fuzzy +msgid "Group join failed." +msgstr "组资料" + +#: classes/Group_member.php:53 +#, fuzzy +msgid "Not part of group." +msgstr "无法更新组" + +#: classes/Group_member.php:60 +#, fuzzy +msgid "Group leave failed." +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." @@ -4077,52 +4370,52 @@ msgstr "无法添加信æ¯ã€‚" msgid "Could not update message with new URI." msgstr "无法添加新URIçš„ä¿¡æ¯ã€‚" -#: classes/Notice.php:172 +#: classes/Notice.php:171 #, php-format msgid "DB error inserting hashtag: %s" msgstr "添加标签时数æ®åº“出错：%s" -#: classes/Notice.php:226 +#: classes/Notice.php:225 #, fuzzy msgid "Problem saving notice. Too long." msgstr "ä¿å­˜é€šå‘Šæ—¶å‡ºé”™ã€‚" -#: classes/Notice.php:230 +#: classes/Notice.php:229 #, fuzzy msgid "Problem saving notice. Unknown user." msgstr "ä¿å­˜é€šå‘Šæ—¶å‡ºé”™ã€‚" -#: classes/Notice.php:235 +#: classes/Notice.php:234 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "你在短时间里å‘布了过多的消æ¯ï¼Œè¯·æ·±å‘¼å¸ï¼Œè¿‡å‡ åˆ†é’Ÿå†å‘消æ¯ã€‚" -#: classes/Notice.php:241 +#: classes/Notice.php:240 #, fuzzy msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "你在短时间里å‘布了过多的消æ¯ï¼Œè¯·æ·±å‘¼å¸ï¼Œè¿‡å‡ åˆ†é’Ÿå†å‘消æ¯ã€‚" -#: classes/Notice.php:247 +#: classes/Notice.php:246 msgid "You are banned from posting notices on this site." msgstr "在这个网站你被ç¦æ­¢å‘布消æ¯ã€‚" -#: classes/Notice.php:309 classes/Notice.php:334 +#: classes/Notice.php:305 classes/Notice.php:330 msgid "Problem saving notice." msgstr "ä¿å­˜é€šå‘Šæ—¶å‡ºé”™ã€‚" -#: classes/Notice.php:1034 +#: classes/Notice.php:1052 #, php-format msgid "DB error inserting reply: %s" msgstr "添加回å¤æ—¶æ•°æ®åº“出错：%s" -#: classes/Notice.php:1359 +#: classes/Notice.php:1423 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" -#: classes/User.php:368 +#: classes/User.php:382 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "å‘é€ç»™ %1$s çš„ %2$s 消æ¯" @@ -4165,6 +4458,11 @@ msgstr "其他" msgid "Other options" msgstr "其他选项" +#: lib/action.php:144 +#, fuzzy, php-format +msgid "%1$s - %2$s" +msgstr "%1$s (%2$s)" + #: lib/action.php:159 msgid "Untitled page" msgstr "无标题页" @@ -4181,10 +4479,6 @@ msgstr "主页" msgid "Personal profile and friends timeline" msgstr "个人资料åŠæœ‹å‹å¹´è¡¨" -#: lib/action.php:435 -msgid "Account" -msgstr "å¸å·" - #: lib/action.php:435 #, fuzzy msgid "Change your email, avatar, password, profile" @@ -4351,11 +4645,6 @@ msgstr "« 之åŽ" msgid "Before" msgstr "ä¹‹å‰ Â»" -#: lib/action.php:1167 -#, fuzzy -msgid "There was a problem with your session token." -msgstr "会è¯æ ‡è¯†æœ‰é—®é¢˜ï¼Œè¯·é‡è¯•ã€‚" - #: lib/adminpanelaction.php:96 #, fuzzy msgid "You cannot make changes to this site." @@ -4396,6 +4685,72 @@ msgstr "SMS短信确认" msgid "Paths configuration" msgstr "SMS短信确认" +#: lib/applicationeditform.php:186 +msgid "Icon for this application" +msgstr "" + +#: lib/applicationeditform.php:206 +#, fuzzy, php-format +msgid "Describe your application in %d characters" +msgstr "用ä¸è¶…过140个字符æ述您自己和您的爱好" + +#: lib/applicationeditform.php:209 +#, fuzzy +msgid "Describe your application" +msgstr "用ä¸è¶…过140个字符æ述您自己和您的爱好" + +#: lib/applicationeditform.php:218 +#, fuzzy +msgid "Source URL" +msgstr "æ¥æº" + +#: lib/applicationeditform.php:220 +#, fuzzy +msgid "URL of the homepage of this application" +msgstr "您的主页ã€åšå®¢æˆ–在其他站点的URL" + +#: lib/applicationeditform.php:226 +msgid "Organization responsible for this application" +msgstr "" + +#: lib/applicationeditform.php:232 +#, fuzzy +msgid "URL for the homepage of the organization" +msgstr "您的主页ã€åšå®¢æˆ–在其他站点的URL" + +#: lib/applicationeditform.php:238 +msgid "URL to redirect to after authentication" +msgstr "" + +#: lib/applicationeditform.php:260 +msgid "Browser" +msgstr "" + +#: lib/applicationeditform.php:276 +msgid "Desktop" +msgstr "" + +#: lib/applicationeditform.php:277 +msgid "Type of application, browser or desktop" +msgstr "" + +#: lib/applicationeditform.php:299 +msgid "Read-only" +msgstr "" + +#: lib/applicationeditform.php:317 +msgid "Read-write" +msgstr "" + +#: lib/applicationeditform.php:318 +msgid "Default access for this application: read-only, or read-write" +msgstr "" + +#: lib/applicationlist.php:154 +#, fuzzy +msgid "Revoke" +msgstr "移除" + #: lib/attachmentlist.php:87 msgid "Attachments" msgstr "" @@ -4417,12 +4772,12 @@ msgstr "" msgid "Tags for this attachment" msgstr "" -#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 +#: lib/authenticationplugin.php:214 lib/authenticationplugin.php:219 #, fuzzy msgid "Password changing failed" msgstr "密ç å·²ä¿å­˜ã€‚" -#: lib/authenticationplugin.php:197 +#: lib/authenticationplugin.php:229 #, fuzzy msgid "Password changing is not allowed" msgstr "密ç å·²ä¿å­˜ã€‚" @@ -4445,7 +4800,7 @@ msgstr "对ä¸èµ·ï¼Œè¿™ä¸ªå‘½ä»¤è¿˜æ²¡æœ‰å®žçŽ°ã€‚" #: lib/command.php:88 #, fuzzy, php-format -msgid "Could not find a user with nickname %s." +msgid "Could not find a user with nickname %s" msgstr "无法更新已确认的电å­é‚®ä»¶ã€‚" #: lib/command.php:92 @@ -4454,7 +4809,7 @@ msgstr "" #: lib/command.php:99 #, fuzzy, php-format -msgid "Nudge sent to %s." +msgid "Nudge sent to %s" msgstr "振铃呼å«å‘出。" #: lib/command.php:126 @@ -4465,170 +4820,191 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:399 lib/command.php:460 +#: lib/command.php:152 lib/command.php:390 lib/command.php:451 #, fuzzy -msgid "Notice with that id does not exist." +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." +#: lib/command.php:168 lib/command.php:406 lib/command.php:467 +#: lib/command.php:523 +msgid "User has no last notice" msgstr "用户没有通告。" #: lib/command.php:190 msgid "Notice marked as fave." msgstr "通告被标记为收è—。" -#: lib/command.php:284 +#: lib/command.php:217 +msgid "You are already a member of that group" +msgstr "您已ç»æ˜¯è¯¥ç»„æˆå‘˜" + +#: lib/command.php:231 #, fuzzy, php-format -msgid "Could not remove user %1$s to group %2$s." +msgid "Could not join user %s to group %s" +msgstr "无法把 %s 用户添加到 %s 组" + +#: lib/command.php:236 +#, fuzzy, php-format +msgid "%s joined group %s" +msgstr "%s 加入 %s 组" + +#: lib/command.php:275 +#, fuzzy, php-format +msgid "Could not remove user %s to group %s" msgstr "无法订阅用户：未找到。" -#: lib/command.php:318 +#: lib/command.php:280 +#, php-format +msgid "%s left group %s" +msgstr "%s 离开群 %s" + +#: lib/command.php:309 #, php-format msgid "Fullname: %s" msgstr "å…¨å：%s" -#: lib/command.php:321 +#: lib/command.php:312 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "ä½ç½®ï¼š%s" -#: lib/command.php:324 +#: lib/command.php:315 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "主页：%s" -#: lib/command.php:327 +#: lib/command.php:318 #, php-format msgid "About: %s" msgstr "关于：%s" -#: lib/command.php:358 +#: lib/command.php:349 #, fuzzy, php-format -msgid "Message too long - maximum is %1$d characters, you sent %2$d." +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." +#: lib/command.php:367 +#, php-format +msgid "Direct message to %s sent" msgstr "å·²å‘ %s å‘é€æ¶ˆæ¯" -#: lib/command.php:378 +#: lib/command.php:369 msgid "Error sending direct message." msgstr "å‘é€æ¶ˆæ¯å‡ºé”™ã€‚" -#: lib/command.php:435 +#: lib/command.php:413 +#, fuzzy +msgid "Cannot repeat your own notice" +msgstr "无法开å¯é€šå‘Šã€‚" + +#: lib/command.php:418 +#, fuzzy +msgid "Already repeated that notice" +msgstr "删除通告" + +#: lib/command.php:426 #, fuzzy, php-format -msgid "Notice from %s repeated." +msgid "Notice from %s repeated" msgstr "消æ¯å·²å‘布。" -#: lib/command.php:437 +#: lib/command.php:428 #, fuzzy msgid "Error repeating notice." msgstr "ä¿å­˜é€šå‘Šæ—¶å‡ºé”™ã€‚" -#: lib/command.php:491 +#: lib/command.php:482 #, fuzzy, php-format -msgid "Notice too long - maximum is %1$d characters, you sent %2$d." +msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "您的消æ¯åŒ…å« %d 个字符，超出长度é™åˆ¶ - ä¸èƒ½è¶…过 140 个字符。" -#: lib/command.php:500 +#: lib/command.php:491 #, fuzzy, php-format -msgid "Reply to %s sent." +msgid "Reply to %s sent" msgstr "无法删除通告。" -#: lib/command.php:502 +#: lib/command.php:493 #, fuzzy msgid "Error saving notice." msgstr "ä¿å­˜é€šå‘Šæ—¶å‡ºé”™ã€‚" -#: lib/command.php:556 -#, fuzzy -msgid "Specify the name of the user to subscribe to." +#: lib/command.php:547 +msgid "Specify the name of the user to subscribe to" msgstr "指定è¦è®¢é˜…的用户å" -#: lib/command.php:563 +#: lib/command.php:554 #, php-format msgid "Subscribed to %s" msgstr "订阅 %s" -#: lib/command.php:584 -#, fuzzy -msgid "Specify the name of the user to unsubscribe from." +#: lib/command.php:575 +msgid "Specify the name of the user to unsubscribe from" msgstr "指定è¦å–消订阅的用户å" -#: lib/command.php:591 +#: lib/command.php:582 #, php-format msgid "Unsubscribed from %s" msgstr "å–消订阅 %s" -#: lib/command.php:609 lib/command.php:632 +#: lib/command.php:600 lib/command.php:623 msgid "Command not yet implemented." msgstr "命令尚未实现。" -#: lib/command.php:612 +#: lib/command.php:603 msgid "Notification off." msgstr "通告关闭。" -#: lib/command.php:614 +#: lib/command.php:605 msgid "Can't turn off notification." msgstr "无法关闭通告。" -#: lib/command.php:635 +#: lib/command.php:626 msgid "Notification on." msgstr "通告开å¯ã€‚" -#: lib/command.php:637 +#: lib/command.php:628 msgid "Can't turn on notification." msgstr "无法开å¯é€šå‘Šã€‚" -#: lib/command.php:650 -msgid "Login command is disabled." +#: lib/command.php:641 +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:652 #, php-format -msgid "This link is useable only once, and is good for only 2 minutes: %s." +msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:685 +#: lib/command.php:668 #, fuzzy msgid "You are not subscribed to anyone." msgstr "您未告知此个人信æ¯" -#: lib/command.php:687 +#: lib/command.php:670 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "您已订阅这些用户：" -#: lib/command.php:707 +#: lib/command.php:690 #, fuzzy msgid "No one is subscribed to you." msgstr "无法订阅他人更新。" -#: lib/command.php:709 +#: lib/command.php:692 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "无法订阅他人更新。" -#: lib/command.php:729 +#: lib/command.php:712 #, fuzzy msgid "You are not a member of any groups." msgstr "您未告知此个人信æ¯" -#: lib/command.php:731 +#: lib/command.php:714 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:728 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4669,20 +5045,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:199 +#: lib/common.php:131 #, fuzzy msgid "No configuration file found. " msgstr "没有验è¯ç " -#: lib/common.php:200 +#: lib/common.php:132 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:201 +#: lib/common.php:134 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:202 +#: lib/common.php:135 #, fuzzy msgid "Go to the installer." msgstr "登入本站" @@ -4699,6 +5075,15 @@ msgstr "使用å³æ—¶é€šè®¯å·¥å…·(IM)æ›´æ–°" msgid "Updates by SMS" msgstr "使用SMS短信更新" +#: lib/connectsettingsaction.php:120 +#, fuzzy +msgid "Connections" +msgstr "连接" + +#: lib/connectsettingsaction.php:121 +msgid "Authorized connected applications" +msgstr "" + #: lib/dberroraction.php:60 msgid "Database error" msgstr "" @@ -4894,11 +5279,16 @@ msgstr "" msgid "kB" msgstr "" -#: lib/jabber.php:191 +#: lib/jabber.php:202 #, php-format msgid "[%s]" msgstr "" +#: lib/jabber.php:385 +#, php-format +msgid "Unknown inbox source %d." +msgstr "" + #: lib/joinform.php:114 #, fuzzy msgid "Join" @@ -4965,21 +5355,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" @@ -5176,7 +5554,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 @@ -5184,7 +5562,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 @@ -5194,7 +5573,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 @@ -5231,16 +5610,18 @@ msgstr "" #: lib/noticeform.php:212 #, fuzzy -msgid "Share my location." -msgstr "无法ä¿å­˜ä¸ªäººä¿¡æ¯ã€‚" - -#: lib/noticeform.php:214 -#, fuzzy -msgid "Do not share my location." +msgid "Share my location" msgstr "无法ä¿å­˜ä¸ªäººä¿¡æ¯ã€‚" #: lib/noticeform.php:215 -msgid "Hide this info" +#, fuzzy +msgid "Do not share my location" +msgstr "无法ä¿å­˜ä¸ªäººä¿¡æ¯ã€‚" + +#: lib/noticeform.php:216 +msgid "" +"Sorry, retrieving your geo location is taking longer than expected, please " +"try again later" msgstr "" #: lib/noticelist.php:428 @@ -5525,25 +5906,25 @@ msgstr "" msgid "User has blocked you." msgstr "用户没有个人信æ¯ã€‚" -#: lib/subs.php:60 +#: lib/subs.php:63 msgid "Could not subscribe." msgstr "无法订阅。" -#: lib/subs.php:79 +#: lib/subs.php:82 msgid "Could not subscribe other to you." msgstr "无法订阅他人更新。" -#: lib/subs.php:128 +#: lib/subs.php:137 #, fuzzy msgid "Not subscribed!" msgstr "未订阅ï¼" -#: lib/subs.php:133 +#: lib/subs.php:142 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "无法删除订阅。" -#: lib/subs.php:146 +#: lib/subs.php:158 msgid "Couldn't delete subscription." msgstr "无法删除订阅。" @@ -5557,10 +5938,6 @@ msgstr "" msgid "People Tagcloud as tagged" msgstr "" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(none 没有)" - #: lib/tagcloudsection.php:56 #, fuzzy msgid "None" @@ -5631,47 +6008,47 @@ msgstr "新消æ¯" msgid "Moderate" msgstr "" -#: lib/util.php:837 +#: lib/util.php:875 msgid "a few seconds ago" msgstr "几秒å‰" -#: lib/util.php:839 +#: lib/util.php:877 msgid "about a minute ago" msgstr "一分钟å‰" -#: lib/util.php:841 +#: lib/util.php:879 #, php-format msgid "about %d minutes ago" msgstr "%d 分钟å‰" -#: lib/util.php:843 +#: lib/util.php:881 msgid "about an hour ago" msgstr "一å°æ—¶å‰" -#: lib/util.php:845 +#: lib/util.php:883 #, php-format msgid "about %d hours ago" msgstr "%d å°æ—¶å‰" -#: lib/util.php:847 +#: lib/util.php:885 msgid "about a day ago" msgstr "一天å‰" -#: lib/util.php:849 +#: lib/util.php:887 #, php-format msgid "about %d days ago" msgstr "%d 天å‰" -#: lib/util.php:851 +#: lib/util.php:889 msgid "about a month ago" msgstr "一个月å‰" -#: lib/util.php:853 +#: lib/util.php:891 #, php-format msgid "about %d months ago" msgstr "%d 个月å‰" -#: lib/util.php:855 +#: lib/util.php:893 msgid "about a year ago" msgstr "一年å‰" @@ -5687,5 +6064,5 @@ msgstr "" #: scripts/xmppdaemon.php:301 #, fuzzy, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "您的消æ¯åŒ…å« %d 个字符，超出长度é™åˆ¶ - ä¸èƒ½è¶…过 140 个字符。" diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.po b/locale/zh_TW/LC_MESSAGES/statusnet.po index 34364f15bd..2fdb74d716 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-10 00:46+0000\n" -"PO-Revision-Date: 2010-01-10 00:49:30+0000\n" +"POT-Creation-Date: 2010-01-15 19:15+0000\n" +"PO-Revision-Date: 2010-01-15 19:18:21+0000\n" "Language-Team: Traditional Chinese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60878); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r61101); 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" @@ -33,25 +33,30 @@ msgstr "無此通知" #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 +#: actions/apistatusesupdate.php:149 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 #: 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 #: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 -#: lib/command.php:163 lib/command.php:311 lib/command.php:364 -#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/command.php:163 lib/command.php:302 lib/command.php:355 +#: lib/command.php:401 lib/command.php:462 lib/command.php:518 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/subs.php:34 lib/subs.php:125 msgid "No such user." msgstr "無此使用者" +#: actions/all.php:84 +#, fuzzy, php-format +msgid "%1$s and friends, page %2$d" +msgstr "%s與好å‹" + #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 -#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 +#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -104,7 +109,7 @@ msgstr "" msgid "You and friends" msgstr "%s與好å‹" -#: actions/allrss.php:119 actions/apitimelinefriends.php:122 +#: actions/allrss.php:119 actions/apitimelinefriends.php:121 #: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" @@ -115,6 +120,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:155 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 "確èªç¢¼éºå¤±" @@ -129,7 +151,7 @@ msgstr "確èªç¢¼éºå¤±" #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:114 +#: actions/apistatusesupdate.php:119 msgid "This method requires a POST." msgstr "" @@ -160,8 +182,9 @@ msgstr "無法儲存個人資料" #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257 -#: actions/designadminpanel.php:122 actions/newnotice.php:94 +#: actions/apistatusesupdate.php:132 actions/avatarsettings.php:257 +#: actions/designadminpanel.php:122 actions/editapplication.php:118 +#: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format msgid "" @@ -173,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 "" @@ -215,26 +241,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 "" @@ -258,7 +264,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 @@ -266,7 +272,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 @@ -288,8 +294,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." @@ -323,7 +330,8 @@ msgstr "此暱稱已有人使用。å†è©¦è©¦çœ‹åˆ¥çš„å§ã€‚" msgid "Not a valid nickname." msgstr "" -#: actions/apigroupcreate.php:196 actions/editgroup.php:195 +#: actions/apigroupcreate.php:196 actions/editapplication.php:212 +#: actions/editgroup.php:195 actions/newapplication.php:200 #: actions/newgroup.php:139 actions/profilesettings.php:222 #: actions/register.php:217 msgid "Homepage is not a valid URL." @@ -335,7 +343,8 @@ msgstr "個人首é ä½å€éŒ¯èª¤" msgid "Full name is too long (max 255 chars)." msgstr "å…¨åéŽé•·ï¼ˆæœ€å¤š255字元）" -#: actions/apigroupcreate.php:213 +#: actions/apigroupcreate.php:213 actions/editapplication.php:187 +#: actions/newapplication.php:169 #, fuzzy, php-format msgid "Description is too long (max %d chars)." msgstr "自我介紹éŽé•·(å…±140個字元)" @@ -376,7 +385,7 @@ msgstr "" msgid "Group not found!" msgstr "ç›®å‰ç„¡è«‹æ±‚" -#: actions/apigroupjoin.php:110 lib/command.php:217 +#: actions/apigroupjoin.php:110 actions/joingroup.php:90 msgid "You are already a member of that group." msgstr "" @@ -384,7 +393,7 @@ msgstr "" msgid "You have been blocked from that group by the admin." msgstr "" -#: actions/apigroupjoin.php:138 lib/command.php:234 +#: actions/apigroupjoin.php:138 actions/joingroup.php:124 #, fuzzy, php-format msgid "Could not join user %1$s to group %2$s." msgstr "無法連çµåˆ°ä¼ºæœå™¨:%s" @@ -394,7 +403,7 @@ msgstr "無法連çµåˆ°ä¼ºæœå™¨:%s" msgid "You are not a member of this group." msgstr "無法連çµåˆ°ä¼ºæœå™¨:%s" -#: actions/apigroupleave.php:124 actions/leavegroup.php:127 +#: actions/apigroupleave.php:124 actions/leavegroup.php:119 #, fuzzy, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "無法從 %s 建立OpenID" @@ -414,6 +423,101 @@ msgstr "" msgid "groups on %s" msgstr "" +#: actions/apioauthauthorize.php:108 actions/apioauthauthorize.php:114 +msgid "Bad request." +msgstr "" + +#: actions/apioauthauthorize.php:134 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:115 actions/makeadmin.php:66 +#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 +#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:139 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 +#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/register.php:165 actions/remotesubscribe.php:77 +#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 +#: actions/subscribe.php:46 actions/tagother.php:166 +#: 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 "" + +#: actions/apioauthauthorize.php:146 +#, fuzzy +msgid "Invalid nickname / password!" +msgstr "使用者å稱或密碼無效" + +#: actions/apioauthauthorize.php:170 +#, fuzzy +msgid "DB error deleting OAuth app user." +msgstr "使用者設定發生錯誤" + +#: actions/apioauthauthorize.php:196 +#, fuzzy +msgid "DB error inserting OAuth app user." +msgstr "增加回覆時,資料庫發生錯誤: %s" + +#: actions/apioauthauthorize.php:231 +#, php-format +msgid "" +"The request token %s has been authorized. Please exchange it for an access " +"token." +msgstr "" + +#: actions/apioauthauthorize.php:241 +#, php-format +msgid "The request token %s has been denied." +msgstr "" + +#: actions/apioauthauthorize.php:246 actions/avatarsettings.php:281 +#: actions/designadminpanel.php:103 actions/editapplication.php:139 +#: actions/emailsettings.php:256 actions/grouplogo.php:319 +#: actions/imsettings.php:220 actions/newapplication.php:121 +#: actions/oauthconnectionssettings.php:151 actions/recoverpassword.php:44 +#: actions/smssettings.php:248 lib/designsettings.php:304 +msgid "Unexpected form submission." +msgstr "" + +#: actions/apioauthauthorize.php:273 +msgid "An application would like to connect to your account" +msgstr "" + +#: actions/apioauthauthorize.php:290 +msgid "Allow or deny access" +msgstr "" + +#: actions/apioauthauthorize.php:320 lib/action.php:435 +#, fuzzy +msgid "Account" +msgstr "關於" + +#: actions/apioauthauthorize.php:323 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/apioauthauthorize.php:326 actions/login.php:233 +#: actions/register.php:429 lib/accountsettingsaction.php:116 +msgid "Password" +msgstr "" + +#: actions/apioauthauthorize.php:338 +msgid "Deny" +msgstr "" + +#: actions/apioauthauthorize.php:344 +msgid "Allow" +msgstr "" + +#: actions/apioauthauthorize.php:361 +msgid "Allow or deny access to your account information." +msgstr "" + #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." msgstr "" @@ -427,12 +531,12 @@ msgstr "" msgid "No such notice." msgstr "無此通知" -#: actions/apistatusesretweet.php:83 lib/command.php:422 +#: actions/apistatusesretweet.php:83 #, fuzzy msgid "Cannot repeat your own notice." msgstr "儲存使用者發生錯誤" -#: actions/apistatusesretweet.php:91 lib/command.php:427 +#: actions/apistatusesretweet.php:91 #, fuzzy msgid "Already repeated that notice." msgstr "無此使用者" @@ -446,17 +550,17 @@ msgstr "更新個人圖åƒ" msgid "No status with that ID found." msgstr "" -#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:162 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" -#: actions/apistatusesupdate.php:198 +#: actions/apistatusesupdate.php:203 msgid "Not found" msgstr "" -#: actions/apistatusesupdate.php:221 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:226 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -542,8 +646,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 "無暱稱" @@ -566,8 +673,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 "" @@ -600,29 +707,6 @@ 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/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 -#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 -#: actions/register.php:165 actions/remotesubscribe.php:77 -#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 -#: actions/subscribe.php:46 actions/tagother.php:166 -#: 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 "" - -#: actions/avatarsettings.php:281 actions/designadminpanel.php:103 -#: actions/emailsettings.php:256 actions/grouplogo.php:319 -#: actions/imsettings.php:220 actions/recoverpassword.php:44 -#: actions/smssettings.php:248 lib/designsettings.php:304 -msgid "Unexpected form submission." -msgstr "" - #: actions/avatarsettings.php:328 msgid "Pick a square area of the image to be your avatar" msgstr "" @@ -686,20 +770,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:260 #, fuzzy -msgid "No such group" +msgid "No such group." msgstr "無此通知" #: actions/blockedfromgroup.php:90 @@ -769,7 +848,8 @@ msgid "Couldn't delete email confirmation." msgstr "無法å–消信箱確èª" #: actions/confirmaddress.php:144 -msgid "Confirm Address" +#, fuzzy +msgid "Confirm address" msgstr "確èªä¿¡ç®±" #: actions/confirmaddress.php:159 @@ -824,10 +904,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." @@ -968,7 +1044,8 @@ msgstr "" #: actions/pathsadminpanel.php:324 actions/profilesettings.php:174 #: actions/siteadminpanel.php:388 actions/smssettings.php:181 #: actions/subscriptions.php:203 actions/tagother.php:154 -#: actions/useradminpanel.php:313 lib/designsettings.php:256 +#: actions/useradminpanel.php:313 lib/applicationeditform.php:335 +#: lib/applicationeditform.php:336 lib/designsettings.php:256 #: lib/groupeditform.php:202 msgid "Save" msgstr "" @@ -989,6 +1066,83 @@ msgstr "" msgid "No such document." msgstr "無此文件" +#: actions/editapplication.php:54 lib/applicationeditform.php:136 +msgid "Edit application" +msgstr "" + +#: actions/editapplication.php:66 +msgid "You must be logged in to edit an application." +msgstr "" + +#: actions/editapplication.php:77 actions/showapplication.php:94 +#, fuzzy +msgid "You are not the owner of this application." +msgstr "無法連çµåˆ°ä¼ºæœå™¨:%s" + +#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:163 +#: actions/showapplication.php:87 +#, fuzzy +msgid "No such application." +msgstr "無此通知" + +#: actions/editapplication.php:127 actions/newapplication.php:110 +#: actions/showapplication.php:118 lib/action.php:1167 +msgid "There was a problem with your session token." +msgstr "" + +#: actions/editapplication.php:161 +msgid "Use this form to edit your application." +msgstr "" + +#: actions/editapplication.php:177 actions/newapplication.php:159 +msgid "Name is required." +msgstr "" + +#: actions/editapplication.php:180 actions/newapplication.php:162 +#, fuzzy +msgid "Name is too long (max 255 chars)." +msgstr "å…¨åéŽé•·ï¼ˆæœ€å¤š255字元）" + +#: actions/editapplication.php:183 actions/newapplication.php:165 +#, fuzzy +msgid "Description is required." +msgstr "所有訂閱" + +#: actions/editapplication.php:191 +msgid "Source URL is too long." +msgstr "" + +#: actions/editapplication.php:197 actions/newapplication.php:182 +#, fuzzy +msgid "Source URL is not valid." +msgstr "個人首é ä½å€éŒ¯èª¤" + +#: actions/editapplication.php:200 actions/newapplication.php:185 +msgid "Organization is required." +msgstr "" + +#: actions/editapplication.php:203 actions/newapplication.php:188 +#, fuzzy +msgid "Organization is too long (max 255 chars)." +msgstr "地點éŽé•·ï¼ˆå…±255個字）" + +#: actions/editapplication.php:206 actions/newapplication.php:191 +msgid "Organization homepage is required." +msgstr "" + +#: actions/editapplication.php:215 actions/newapplication.php:203 +msgid "Callback is too long." +msgstr "" + +#: actions/editapplication.php:222 actions/newapplication.php:212 +msgid "Callback URL is not valid." +msgstr "" + +#: actions/editapplication.php:255 +#, fuzzy +msgid "Could not update application." +msgstr "無法更新使用者" + #: actions/editgroup.php:56 #, php-format msgid "Edit %s group" @@ -1000,7 +1154,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 @@ -1027,8 +1181,9 @@ msgid "Options saved." msgstr "" #: actions/emailsettings.php:60 -msgid "Email Settings" -msgstr "" +#, fuzzy +msgid "Email settings" +msgstr "線上å³æ™‚通設定" #: actions/emailsettings.php:71 #, php-format @@ -1057,13 +1212,15 @@ msgid "" msgstr "" #: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 +#: actions/smssettings.php:126 lib/applicationeditform.php:333 +#: lib/applicationeditform.php:334 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\"" @@ -1136,9 +1293,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." @@ -1318,14 +1476,6 @@ 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:79 #, fuzzy msgid "No such file." @@ -1344,7 +1494,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 "" @@ -1392,9 +1542,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." @@ -1416,12 +1567,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 "" @@ -1436,6 +1581,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 "" @@ -1559,7 +1708,8 @@ msgid "Error removing the block." msgstr "儲存使用者發生錯誤" #: actions/imsettings.php:59 -msgid "IM Settings" +#, fuzzy +msgid "IM settings" msgstr "線上å³æ™‚通設定" #: actions/imsettings.php:70 @@ -1588,7 +1738,8 @@ msgstr "" "好å‹æ¸…單了嗎？)" #: actions/imsettings.php:124 -msgid "IM Address" +#, fuzzy +msgid "IM address" msgstr "線上å³æ™‚通信箱" #: actions/imsettings.php:126 @@ -1680,7 +1831,7 @@ msgstr "" msgid "You are already subscribed to these users:" msgstr "" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:315 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 #, php-format msgid "%1$s (%2$s)" msgstr "" @@ -1721,7 +1872,7 @@ msgstr "" msgid "Optionally add a personal message to the invitation." msgstr "" -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236 msgid "Send" msgstr "" @@ -1765,16 +1916,7 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "" -#: actions/joingroup.php:90 -msgid "You are already a member of that group" -msgstr "" - -#: actions/joingroup.php:128 -#, fuzzy, php-format -msgid "Could not join user %1$s to group %2$s" -msgstr "無法連çµåˆ°ä¼ºæœå™¨:%s" - -#: actions/joingroup.php:135 lib/command.php:239 +#: actions/joingroup.php:131 #, php-format msgid "%1$s joined group %2$s" msgstr "" @@ -1783,74 +1925,55 @@ msgstr "" msgid "You must be logged in to leave a group." msgstr "" -#: actions/leavegroup.php:90 lib/command.php:268 +#: actions/leavegroup.php:90 lib/command.php:265 msgid "You are not a member of that group." msgstr "" -#: actions/leavegroup.php:119 lib/command.php:278 -msgid "Could not find membership record." -msgstr "" - -#: actions/leavegroup.php:134 lib/command.php:289 +#: actions/leavegroup.php:127 #, fuzzy, php-format 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:460 +#: 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 -#: lib/groupeditform.php:152 lib/userprofile.php:131 -msgid "Nickname" -msgstr "暱稱" - -#: actions/login.php:253 actions/register.php:428 -#: 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]" @@ -1867,19 +1990,40 @@ 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 %1$s in group %2$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 %1$s an admin for group %2$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" msgstr "" +#: actions/newapplication.php:52 +msgid "New application" +msgstr "" + +#: actions/newapplication.php:64 +msgid "You must be logged in to register an application." +msgstr "" + +#: actions/newapplication.php:143 +msgid "Use this form to register a new application." +msgstr "" + +#: actions/newapplication.php:173 +msgid "Source URL is required." +msgstr "" + +#: actions/newapplication.php:255 actions/newapplication.php:264 +#, fuzzy +msgid "Could not create application." +msgstr "無法存å–個人圖åƒè³‡æ–™" + #: actions/newgroup.php:53 msgid "New group" msgstr "" @@ -1892,12 +2036,12 @@ msgstr "" msgid "New message" msgstr "" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 msgid "You can't send a message to this user." msgstr "" -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:484 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 +#: lib/command.php:475 msgid "No content!" msgstr "無內容" @@ -1905,7 +2049,7 @@ msgstr "無內容" msgid "No recipient specified." msgstr "" -#: actions/newmessage.php:164 lib/command.php:370 +#: actions/newmessage.php:164 lib/command.php:361 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -1916,7 +2060,7 @@ msgstr "" #: 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 @@ -1984,6 +2128,49 @@ msgstr "" msgid "Nudge sent!" msgstr "" +#: actions/oauthappssettings.php:59 +msgid "You must be logged in to list your applications." +msgstr "" + +#: actions/oauthappssettings.php:74 +msgid "OAuth applications" +msgstr "" + +#: actions/oauthappssettings.php:85 +msgid "Applications you have registered" +msgstr "" + +#: actions/oauthappssettings.php:135 +#, php-format +msgid "You have not registered any applications yet." +msgstr "" + +#: actions/oauthconnectionssettings.php:71 +msgid "Connected applications" +msgstr "" + +#: actions/oauthconnectionssettings.php:87 +msgid "You have allowed the following applications to access you account." +msgstr "" + +#: actions/oauthconnectionssettings.php:170 +#, fuzzy +msgid "You are not a user of that application." +msgstr "無法連çµåˆ°ä¼ºæœå™¨:%s" + +#: actions/oauthconnectionssettings.php:180 +msgid "Unable to revoke access for app: " +msgstr "" + +#: actions/oauthconnectionssettings.php:192 +#, php-format +msgid "You have not authorized any applications to use your account." +msgstr "" + +#: actions/oauthconnectionssettings.php:205 +msgid "Developers can edit the registration settings for their applications " +msgstr "" + #: actions/oembed.php:79 actions/shownotice.php:100 msgid "Notice has no profile" msgstr "" @@ -2002,8 +2189,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:1038 +#: lib/api.php:1066 lib/api.php:1176 msgid "Not a supported data format." msgstr "" @@ -2017,7 +2204,7 @@ msgstr "" #: actions/othersettings.php:60 #, fuzzy -msgid "Other Settings" +msgid "Other settings" msgstr "線上å³æ™‚通設定" #: actions/othersettings.php:71 @@ -2049,6 +2236,30 @@ msgstr "" msgid "URL shortening service is too long (max 50 chars)." msgstr "地點éŽé•·ï¼ˆå…±255個字）" +#: 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 #, php-format msgid "Outbox for %s" @@ -2084,7 +2295,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 "確èª" @@ -2251,8 +2462,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" @@ -2310,43 +2522,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 -#: lib/groupeditform.php:161 +#: actions/profilesettings.php:115 actions/register.php:453 +#: lib/applicationeditform.php:230 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 "" @@ -2640,7 +2852,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 "" @@ -2653,7 +2865,7 @@ msgstr "確èªç¢¼ç™¼ç”ŸéŒ¯èª¤" msgid "Registration successful" msgstr "" -#: actions/register.php:114 actions/register.php:502 lib/action.php:457 +#: actions/register.php:114 actions/register.php:503 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "" @@ -2666,65 +2878,61 @@ 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, %1$s! And welcome to %%%%site.name%%%%. From here, you may " @@ -2743,7 +2951,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.)" @@ -2887,6 +3095,83 @@ msgstr "無法連çµåˆ°ä¼ºæœå™¨:%s" msgid "User is already sandboxed." msgstr "" +#: actions/showapplication.php:82 +msgid "You must be logged in to view an application." +msgstr "" + +#: actions/showapplication.php:158 +msgid "Application profile" +msgstr "" + +#: actions/showapplication.php:160 lib/applicationeditform.php:182 +msgid "Icon" +msgstr "" + +#: actions/showapplication.php:170 actions/version.php:195 +#: lib/applicationeditform.php:197 +#, fuzzy +msgid "Name" +msgstr "暱稱" + +#: actions/showapplication.php:179 lib/applicationeditform.php:224 +#, fuzzy +msgid "Organization" +msgstr "地點" + +#: actions/showapplication.php:188 actions/version.php:198 +#: lib/applicationeditform.php:211 lib/groupeditform.php:172 +#, fuzzy +msgid "Description" +msgstr "所有訂閱" + +#: actions/showapplication.php:193 actions/showgroup.php:429 +#: lib/profileaction.php:174 +msgid "Statistics" +msgstr "" + +#: actions/showapplication.php:204 +#, php-format +msgid "created by %1$s - %2$s access by default - %3$d users" +msgstr "" + +#: actions/showapplication.php:214 +msgid "Application actions" +msgstr "" + +#: actions/showapplication.php:233 +msgid "Reset key & secret" +msgstr "" + +#: actions/showapplication.php:241 +msgid "Application info" +msgstr "" + +#: actions/showapplication.php:243 +msgid "Consumer key" +msgstr "" + +#: actions/showapplication.php:248 +msgid "Consumer secret" +msgstr "" + +#: actions/showapplication.php:253 +msgid "Request token URL" +msgstr "" + +#: actions/showapplication.php:258 +msgid "Access token URL" +msgstr "" + +#: actions/showapplication.php:263 +msgid "Authorize URL" +msgstr "" + +#: actions/showapplication.php:268 +msgid "" +"Note: We support HMAC-SHA1 signatures. We do not support the plaintext " +"signature method." +msgstr "" + #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "" @@ -2986,7 +3271,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 "" @@ -2994,10 +3279,6 @@ msgstr "" msgid "All members" msgstr "" -#: actions/showgroup.php:429 lib/profileaction.php:174 -msgid "Statistics" -msgstr "" - #: actions/showgroup.php:432 #, fuzzy msgid "Created" @@ -3137,12 +3418,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 @@ -3328,8 +3609,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 @@ -3358,7 +3640,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 @@ -3605,10 +3887,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" @@ -3803,11 +4081,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 "" @@ -3884,11 +4157,6 @@ msgstr "" msgid "Plugins" msgstr "" -#: actions/version.php:195 -#, fuzzy -msgid "Name" -msgstr "暱稱" - #: actions/version.php:196 lib/action.php:741 #, fuzzy msgid "Version" @@ -3898,28 +4166,43 @@ msgstr "地點" msgid "Author(s)" msgstr "" -#: actions/version.php:198 lib/groupeditform.php:172 -#, fuzzy -msgid "Description" -msgstr "所有訂閱" - -#: classes/File.php:137 +#: 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/Group_member.php:41 +#, fuzzy +msgid "Group join failed." +msgstr "無此通知" + +#: classes/Group_member.php:53 +#, fuzzy +msgid "Not part of group." +msgstr "無法更新使用者" + +#: classes/Group_member.php:60 +#, fuzzy +msgid "Group leave failed." +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 "" @@ -3932,51 +4215,51 @@ msgstr "" msgid "Could not update message with new URI." msgstr "" -#: classes/Notice.php:172 +#: classes/Notice.php:171 #, php-format msgid "DB error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:226 +#: classes/Notice.php:225 #, fuzzy msgid "Problem saving notice. Too long." msgstr "儲存使用者發生錯誤" -#: classes/Notice.php:230 +#: classes/Notice.php:229 #, fuzzy msgid "Problem saving notice. Unknown user." msgstr "儲存使用者發生錯誤" -#: classes/Notice.php:235 +#: classes/Notice.php:234 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:241 +#: classes/Notice.php:240 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:247 +#: classes/Notice.php:246 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:309 classes/Notice.php:334 +#: classes/Notice.php:305 classes/Notice.php:330 msgid "Problem saving notice." msgstr "" -#: classes/Notice.php:1034 +#: classes/Notice.php:1052 #, php-format msgid "DB error inserting reply: %s" msgstr "增加回覆時,資料庫發生錯誤: %s" -#: classes/Notice.php:1359 +#: classes/Notice.php:1423 #, php-format msgid "RT @%1$s %2$s" msgstr "" -#: classes/User.php:368 +#: classes/User.php:382 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" @@ -4021,6 +4304,11 @@ msgstr "" msgid "Other options" msgstr "" +#: lib/action.php:144 +#, fuzzy, php-format +msgid "%1$s - %2$s" +msgstr "%1$s的狀態是%2$s" + #: lib/action.php:159 msgid "Untitled page" msgstr "" @@ -4037,11 +4325,6 @@ msgstr "主é " msgid "Personal profile and friends timeline" msgstr "" -#: lib/action.php:435 -#, fuzzy -msgid "Account" -msgstr "關於" - #: lib/action.php:435 msgid "Change your email, avatar, password, profile" msgstr "" @@ -4200,10 +4483,6 @@ msgstr "" msgid "Before" msgstr "之å‰çš„內容»" -#: lib/action.php:1167 -msgid "There was a problem with your session token." -msgstr "" - #: lib/adminpanelaction.php:96 msgid "You cannot make changes to this site." msgstr "" @@ -4239,6 +4518,68 @@ msgstr "確èªä¿¡ç®±" msgid "Paths configuration" msgstr "確èªä¿¡ç®±" +#: lib/applicationeditform.php:186 +msgid "Icon for this application" +msgstr "" + +#: lib/applicationeditform.php:206 +#, fuzzy, php-format +msgid "Describe your application in %d characters" +msgstr "請在140個字以內æ述你自己與你的興趣" + +#: lib/applicationeditform.php:209 +#, fuzzy +msgid "Describe your application" +msgstr "請在140個字以內æ述你自己與你的興趣" + +#: lib/applicationeditform.php:218 +msgid "Source URL" +msgstr "" + +#: lib/applicationeditform.php:220 +msgid "URL of the homepage of this application" +msgstr "" + +#: lib/applicationeditform.php:226 +msgid "Organization responsible for this application" +msgstr "" + +#: lib/applicationeditform.php:232 +msgid "URL for the homepage of the organization" +msgstr "" + +#: lib/applicationeditform.php:238 +msgid "URL to redirect to after authentication" +msgstr "" + +#: lib/applicationeditform.php:260 +msgid "Browser" +msgstr "" + +#: lib/applicationeditform.php:276 +msgid "Desktop" +msgstr "" + +#: lib/applicationeditform.php:277 +msgid "Type of application, browser or desktop" +msgstr "" + +#: lib/applicationeditform.php:299 +msgid "Read-only" +msgstr "" + +#: lib/applicationeditform.php:317 +msgid "Read-write" +msgstr "" + +#: lib/applicationeditform.php:318 +msgid "Default access for this application: read-only, or read-write" +msgstr "" + +#: lib/applicationlist.php:154 +msgid "Revoke" +msgstr "" + #: lib/attachmentlist.php:87 msgid "Attachments" msgstr "" @@ -4259,11 +4600,11 @@ msgstr "" msgid "Tags for this attachment" msgstr "" -#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 +#: lib/authenticationplugin.php:214 lib/authenticationplugin.php:219 msgid "Password changing failed" msgstr "" -#: lib/authenticationplugin.php:197 +#: lib/authenticationplugin.php:229 msgid "Password changing is not allowed" msgstr "" @@ -4284,8 +4625,8 @@ msgid "Sorry, this command is not yet implemented." msgstr "" #: lib/command.php:88 -#, fuzzy, php-format -msgid "Could not find a user with nickname %s." +#, php-format +msgid "Could not find a user with nickname %s" msgstr "無法更新使用者" #: lib/command.php:92 @@ -4294,7 +4635,7 @@ msgstr "" #: lib/command.php:99 #, php-format -msgid "Nudge sent to %s." +msgid "Nudge sent to %s" msgstr "" #: lib/command.php:126 @@ -4305,165 +4646,191 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:399 lib/command.php:460 -msgid "Notice with that id does not exist." +#: lib/command.php:152 lib/command.php:390 lib/command.php:451 +msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:168 lib/command.php:415 lib/command.php:476 -#: lib/command.php:532 -msgid "User has no last notice." -msgstr "" +#: lib/command.php:168 lib/command.php:406 lib/command.php:467 +#: lib/command.php:523 +#, fuzzy +msgid "User has no last notice" +msgstr "新訊æ¯" #: lib/command.php:190 msgid "Notice marked as fave." msgstr "" -#: lib/command.php:284 +#: lib/command.php:217 +#, fuzzy +msgid "You are already a member of that group" +msgstr "無法連çµåˆ°ä¼ºæœå™¨:%s" + +#: lib/command.php:231 #, fuzzy, php-format -msgid "Could not remove user %1$s to group %2$s." +msgid "Could not join user %s to group %s" +msgstr "無法連çµåˆ°ä¼ºæœå™¨:%s" + +#: lib/command.php:236 +#, fuzzy, php-format +msgid "%s joined group %s" +msgstr "%1$s的狀態是%2$s" + +#: lib/command.php:275 +#, fuzzy, php-format +msgid "Could not remove user %s to group %s" msgstr "無法從 %s 建立OpenID" -#: lib/command.php:318 -#, php-format -msgid "Fullname: %s" -msgstr "" +#: lib/command.php:280 +#, fuzzy, php-format +msgid "%s left group %s" +msgstr "%1$s的狀態是%2$s" -#: lib/command.php:321 +#: lib/command.php:309 +#, fuzzy, php-format +msgid "Fullname: %s" +msgstr "å…¨å" + +#: lib/command.php:312 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "" -#: lib/command.php:324 +#: lib/command.php:315 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "" -#: lib/command.php:327 +#: lib/command.php:318 #, php-format msgid "About: %s" msgstr "" -#: lib/command.php:358 +#: lib/command.php:349 #, php-format -msgid "Message too long - maximum is %1$d characters, you sent %2$d." +msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:376 +#: lib/command.php:367 #, php-format -msgid "Direct message to %s sent." +msgid "Direct message to %s sent" msgstr "" -#: lib/command.php:378 +#: lib/command.php:369 msgid "Error sending direct message." msgstr "" -#: lib/command.php:435 +#: lib/command.php:413 +#, fuzzy +msgid "Cannot repeat your own notice" +msgstr "儲存使用者發生錯誤" + +#: lib/command.php:418 +#, fuzzy +msgid "Already repeated that notice" +msgstr "無此使用者" + +#: lib/command.php:426 #, fuzzy, php-format -msgid "Notice from %s repeated." +msgid "Notice from %s repeated" msgstr "更新個人圖åƒ" -#: lib/command.php:437 +#: lib/command.php:428 #, fuzzy msgid "Error repeating notice." msgstr "儲存使用者發生錯誤" +#: lib/command.php:482 +#, php-format +msgid "Notice too long - maximum is %d characters, you sent %d" +msgstr "" + #: lib/command.php:491 -#, php-format -msgid "Notice too long - maximum is %1$d characters, you sent %2$d." -msgstr "" +#, fuzzy, php-format +msgid "Reply to %s sent" +msgstr "&s的微型部è½æ ¼" -#: lib/command.php:500 -#, php-format -msgid "Reply to %s sent." -msgstr "" - -#: lib/command.php:502 +#: lib/command.php:493 msgid "Error saving notice." msgstr "儲存使用者發生錯誤" -#: lib/command.php:556 -msgid "Specify the name of the user to subscribe to." +#: lib/command.php:547 +msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:563 +#: lib/command.php:554 #, php-format msgid "Subscribed to %s" msgstr "" -#: lib/command.php:584 -msgid "Specify the name of the user to unsubscribe from." +#: lib/command.php:575 +msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:591 +#: lib/command.php:582 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:609 lib/command.php:632 +#: lib/command.php:600 lib/command.php:623 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:612 +#: lib/command.php:603 msgid "Notification off." msgstr "" -#: lib/command.php:614 +#: lib/command.php:605 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:635 +#: lib/command.php:626 msgid "Notification on." msgstr "" -#: lib/command.php:637 +#: lib/command.php:628 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:650 -msgid "Login command is disabled." +#: lib/command.php:641 +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:652 #, php-format -msgid "This link is useable only once, and is good for only 2 minutes: %s." +msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:685 +#: lib/command.php:668 #, fuzzy msgid "You are not subscribed to anyone." msgstr "此帳號已註冊" -#: lib/command.php:687 +#: lib/command.php:670 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "此帳號已註冊" -#: lib/command.php:707 +#: lib/command.php:690 #, fuzzy msgid "No one is subscribed to you." msgstr "無此訂閱" -#: lib/command.php:709 +#: lib/command.php:692 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "無此訂閱" -#: lib/command.php:729 +#: lib/command.php:712 #, fuzzy msgid "You are not a member of any groups." msgstr "無法連çµåˆ°ä¼ºæœå™¨:%s" -#: lib/command.php:731 +#: lib/command.php:714 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:728 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4504,20 +4871,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:199 +#: lib/common.php:131 #, fuzzy msgid "No configuration file found. " msgstr "無確èªç¢¼" -#: lib/common.php:200 +#: lib/common.php:132 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:201 +#: lib/common.php:134 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:202 +#: lib/common.php:135 msgid "Go to the installer." msgstr "" @@ -4533,6 +4900,15 @@ msgstr "" msgid "Updates by SMS" msgstr "" +#: lib/connectsettingsaction.php:120 +#, fuzzy +msgid "Connections" +msgstr "連çµ" + +#: lib/connectsettingsaction.php:121 +msgid "Authorized connected applications" +msgstr "" + #: lib/dberroraction.php:60 msgid "Database error" msgstr "" @@ -4721,11 +5097,16 @@ msgstr "" msgid "kB" msgstr "" -#: lib/jabber.php:191 +#: lib/jabber.php:202 #, php-format msgid "[%s]" msgstr "" +#: lib/jabber.php:385 +#, php-format +msgid "Unknown inbox source %d." +msgstr "" + #: lib/joinform.php:114 #, fuzzy msgid "Join" @@ -4793,22 +5174,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 @@ -4994,7 +5363,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 @@ -5003,7 +5372,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 @@ -5013,7 +5382,7 @@ msgstr "" #: lib/mediafile.php:275 #, php-format -msgid "%s is not a supported filetype on this server." +msgid "%s is not a supported file type on this server." msgstr "" #: lib/messageform.php:120 @@ -5049,16 +5418,18 @@ msgstr "" #: lib/noticeform.php:212 #, fuzzy -msgid "Share my location." -msgstr "無法儲存個人資料" - -#: lib/noticeform.php:214 -#, fuzzy -msgid "Do not share my location." +msgid "Share my location" msgstr "無法儲存個人資料" #: lib/noticeform.php:215 -msgid "Hide this info" +#, fuzzy +msgid "Do not share my location" +msgstr "無法儲存個人資料" + +#: lib/noticeform.php:216 +msgid "" +"Sorry, retrieving your geo location is taking longer than expected, please " +"try again later" msgstr "" #: lib/noticelist.php:428 @@ -5329,25 +5700,25 @@ msgstr "" msgid "User has blocked you." msgstr "" -#: lib/subs.php:60 +#: lib/subs.php:63 msgid "Could not subscribe." msgstr "" -#: lib/subs.php:79 +#: lib/subs.php:82 msgid "Could not subscribe other to you." msgstr "" -#: lib/subs.php:128 +#: lib/subs.php:137 #, fuzzy msgid "Not subscribed!" msgstr "此帳號已註冊" -#: lib/subs.php:133 +#: lib/subs.php:142 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "無法刪除帳號" -#: lib/subs.php:146 +#: lib/subs.php:158 msgid "Couldn't delete subscription." msgstr "無法刪除帳號" @@ -5361,10 +5732,6 @@ msgstr "" msgid "People Tagcloud as tagged" msgstr "" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "" - #: lib/tagcloudsection.php:56 msgid "None" msgstr "" @@ -5429,47 +5796,47 @@ msgstr "" msgid "Moderate" msgstr "" -#: lib/util.php:837 +#: lib/util.php:875 msgid "a few seconds ago" msgstr "" -#: lib/util.php:839 +#: lib/util.php:877 msgid "about a minute ago" msgstr "" -#: lib/util.php:841 +#: lib/util.php:879 #, php-format msgid "about %d minutes ago" msgstr "" -#: lib/util.php:843 +#: lib/util.php:881 msgid "about an hour ago" msgstr "" -#: lib/util.php:845 +#: lib/util.php:883 #, php-format msgid "about %d hours ago" msgstr "" -#: lib/util.php:847 +#: lib/util.php:885 msgid "about a day ago" msgstr "" -#: lib/util.php:849 +#: lib/util.php:887 #, php-format msgid "about %d days ago" msgstr "" -#: lib/util.php:851 +#: lib/util.php:889 msgid "about a month ago" msgstr "" -#: lib/util.php:853 +#: lib/util.php:891 #, php-format msgid "about %d months ago" msgstr "" -#: lib/util.php:855 +#: lib/util.php:893 msgid "about a year ago" msgstr "" @@ -5485,5 +5852,5 @@ msgstr "" #: scripts/xmppdaemon.php:301 #, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" diff --git a/plugins/CasAuthentication/extlib/CAS.php b/plugins/CasAuthentication/extlib/CAS.php index 59238eb813..f5ea0b12a7 100644 --- a/plugins/CasAuthentication/extlib/CAS.php +++ b/plugins/CasAuthentication/extlib/CAS.php @@ -1,1471 +1,1471 @@ -=')) { - 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 - * - * \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\nphpCAS error: ".__CLASS__."::".$function.'(): '.htmlentities($msg)." in ".$file." on line ".$line."
\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 - */ - - - -?> +=')) { + 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 + * + * \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\nphpCAS error: ".__CLASS__."::".$function.'(): '.htmlentities($msg)." in ".$file." on line ".$line."
\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 5a589e4b28..00797b9c56 100644 --- a/plugins/CasAuthentication/extlib/CAS/PGTStorage/pgt-db.php +++ b/plugins/CasAuthentication/extlib/CAS/PGTStorage/pgt-db.php @@ -1,190 +1,190 @@ - - * - * @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(); - } - - /** @} */ -} - + + * + * @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 bc07485b8f..d48a60d670 100644 --- a/plugins/CasAuthentication/extlib/CAS/PGTStorage/pgt-file.php +++ b/plugins/CasAuthentication/extlib/CAS/PGTStorage/pgt-file.php @@ -1,249 +1,249 @@ - - * - * @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; - } - - /** @} */ - -} - - + + * + * @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 cd9b499671..8fd3c9e12b 100644 --- a/plugins/CasAuthentication/extlib/CAS/PGTStorage/pgt-main.php +++ b/plugins/CasAuthentication/extlib/CAS/PGTStorage/pgt-main.php @@ -1,188 +1,188 @@ - - * - * @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'); - + + * + * @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 bfea59052d..bbde55a284 100644 --- a/plugins/CasAuthentication/extlib/CAS/client.php +++ b/plugins/CasAuthentication/extlib/CAS/client.php @@ -1,2297 +1,2297 @@ - - */ - -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) - ? '__TITLE__

__TITLE__

' - : $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) - ?('
phpCAS __PHPCAS_VERSION__ '.$this->getString(CAS_STR_USING_SERVER).' __SERVER_BASE_URL__ (CAS __CAS_VERSION__)
') - :$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 + + */ + +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) + ? '__TITLE__

__TITLE__

' + : $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) + ?('
phpCAS __PHPCAS_VERSION__ '.$this->getString(CAS_STR_USING_SERVER).' __SERVER_BASE_URL__ (CAS __CAS_VERSION__)
') + :$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('

'.$this->getString(CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED).'

',$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('

'.$this->getString(CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED).'

',$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('

'.$this->getString(CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED).'

',$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("|(.*)|", $_POST['logoutRequest'], $tick, PREG_OFFSET_CAPTURE, 3); - $wrappedSamlSessionIndex = preg_replace('||','',$tick[0][0]); - $ticket2logout = preg_replace('||','',$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(' found, but no '); - $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(' 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 nor 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 '

Storing PGT `'.$pgt.'\' (id=`'.$pgt_iou.'\').

'; - $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(' 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(' was found, but not '); - } - } - // 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 nor 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('

'.$this->getString(CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED).'

',$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('

'.$this->getString(CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED).'

',$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('

'.$this->getString(CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED).'

',$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("|(.*)|", $_POST['logoutRequest'], $tick, PREG_OFFSET_CAPTURE, 3); + $wrappedSamlSessionIndex = preg_replace('||','',$tick[0][0]); + $ticket2logout = preg_replace('||','',$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(' found, but no '); + $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(' 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 nor 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 '

Storing PGT `'.$pgt.'\' (id=`'.$pgt_iou.'\').

'; + $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(' 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(' was found, but not '); + } + } + // 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 nor 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 d64747514c..a0dfb99c7a 100644 --- a/plugins/CasAuthentication/extlib/CAS/domxml-php4-php5.php +++ b/plugins/CasAuthentication/extlib/CAS/domxml-php4-php5.php @@ -1,277 +1,277 @@ - - * { - * if (version_compare(PHP_VERSION,'5','>=')) - * require_once('domxml-php4-to-php5.php'); - * } - * - * - * Version 1.5.5, 2005-01-18, http://alexandre.alapetite.net/doc-alex/domxml-php4-php5/ - * - * ------------------------------------------------------------------
- * 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();} - } -} + + * { + * if (version_compare(PHP_VERSION,'5','>=')) + * require_once('domxml-php4-to-php5.php'); + * } + * + * + * Version 1.5.5, 2005-01-18, http://alexandre.alapetite.net/doc-alex/domxml-php4-php5/ + * + * ------------------------------------------------------------------
+ * 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 3d67473d98..0b139c7cad 100644 --- a/plugins/CasAuthentication/extlib/CAS/languages/catalan.php +++ b/plugins/CasAuthentication/extlib/CAS/languages/catalan.php @@ -1,27 +1,27 @@ - - * @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 aquí per a continuar.', - CAS_STR_AUTHENTICATION_FAILED - => 'Autentificació CAS fallida!', - CAS_STR_YOU_WERE_NOT_AUTHENTICATED - => '

No estàs autentificat.

Pots tornar a intentar-ho fent click aquí.

Si el problema persisteix hauría de contactar amb l\'administrador d\'aquest llocc.

', - CAS_STR_SERVICE_UNAVAILABLE - => 'El servei `%s\' no està disponible (%s).' -); - -?> + + * @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 aquí per a continuar.', + CAS_STR_AUTHENTICATION_FAILED + => 'Autentificació CAS fallida!', + CAS_STR_YOU_WERE_NOT_AUTHENTICATED + => '

No estàs autentificat.

Pots tornar a intentar-ho fent click aquí.

Si el problema persisteix hauría de contactar amb l\'administrador d\'aquest llocc.

', + CAS_STR_SERVICE_UNAVAILABLE + => 'El servei `%s\' no està disponible (%s).' +); + +?> diff --git a/plugins/CasAuthentication/extlib/CAS/languages/english.php b/plugins/CasAuthentication/extlib/CAS/languages/english.php index c143450314..d38d42c1f7 100644 --- a/plugins/CasAuthentication/extlib/CAS/languages/english.php +++ b/plugins/CasAuthentication/extlib/CAS/languages/english.php @@ -1,27 +1,27 @@ - - * @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 here to continue.', - CAS_STR_AUTHENTICATION_FAILED - => 'CAS Authentication failed!', - CAS_STR_YOU_WERE_NOT_AUTHENTICATED - => '

You were not authenticated.

You may submit your request again by clicking here.

If the problem persists, you may contact the administrator of this site.

', - CAS_STR_SERVICE_UNAVAILABLE - => 'The service `%s\' is not available (%s).' -); - + + * @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 here to continue.', + CAS_STR_AUTHENTICATION_FAILED + => 'CAS Authentication failed!', + CAS_STR_YOU_WERE_NOT_AUTHENTICATED + => '

You were not authenticated.

You may submit your request again by clicking here.

If the problem persists, you may contact the administrator of this site.

', + CAS_STR_SERVICE_UNAVAILABLE + => 'The service `%s\' is not available (%s).' +); + ?> \ 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 675a7fc04e..32d1416850 100644 --- a/plugins/CasAuthentication/extlib/CAS/languages/french.php +++ b/plugins/CasAuthentication/extlib/CAS/languages/french.php @@ -1,28 +1,28 @@ - - * @sa @link internalLang Internationalization @endlink - * @ingroup internalLang - */ - -$this->_strings = array( - CAS_STR_USING_SERVER - => 'utilisant le serveur', - CAS_STR_AUTHENTICATION_WANTED - => 'Authentication CAS nécessaire !', - CAS_STR_LOGOUT - => 'Déconnexion demandée !', - CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED - => 'Vous auriez du etre redirigé(e) vers le serveur CAS. Cliquez ici pour continuer.', - CAS_STR_AUTHENTICATION_FAILED - => 'Authentification CAS infructueuse !', - CAS_STR_YOU_WERE_NOT_AUTHENTICATED - => '

Vous n\'avez pas été authentifié(e).

Vous pouvez soumettre votre requete à nouveau en cliquant ici.

Si le problème persiste, vous pouvez contacter l\'administrateur de ce site.

', - CAS_STR_SERVICE_UNAVAILABLE - => 'Le service `%s\' est indisponible (%s)' - -); - + + * @sa @link internalLang Internationalization @endlink + * @ingroup internalLang + */ + +$this->_strings = array( + CAS_STR_USING_SERVER + => 'utilisant le serveur', + CAS_STR_AUTHENTICATION_WANTED + => 'Authentication CAS nécessaire !', + CAS_STR_LOGOUT + => 'Déconnexion demandée !', + CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED + => 'Vous auriez du etre redirigé(e) vers le serveur CAS. Cliquez ici pour continuer.', + CAS_STR_AUTHENTICATION_FAILED + => 'Authentification CAS infructueuse !', + CAS_STR_YOU_WERE_NOT_AUTHENTICATED + => '

Vous n\'avez pas été authentifié(e).

Vous pouvez soumettre votre requete à nouveau en cliquant ici.

Si le problème persiste, vous pouvez contacter l\'administrateur de ce site.

', + CAS_STR_SERVICE_UNAVAILABLE + => 'Le service `%s\' est indisponible (%s)' + +); + ?> \ 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 29daeb35dd..55c3238fde 100644 --- a/plugins/CasAuthentication/extlib/CAS/languages/german.php +++ b/plugins/CasAuthentication/extlib/CAS/languages/german.php @@ -1,27 +1,27 @@ - - * @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 hier um fortzufahren.', - CAS_STR_AUTHENTICATION_FAILED - => 'CAS Anmeldung fehlgeschlagen!', - CAS_STR_YOU_WERE_NOT_AUTHENTICATED - => '

Sie wurden nicht angemeldet.

Um es erneut zu versuchen klicken Sie hier.

Wenn das Problem bestehen bleibt, kontkatieren Sie den Administrator dieser Seite.

', - CAS_STR_SERVICE_UNAVAILABLE - => 'Der Dienst `%s\' ist nicht verfügbar (%s).' -); - + + * @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 hier um fortzufahren.', + CAS_STR_AUTHENTICATION_FAILED + => 'CAS Anmeldung fehlgeschlagen!', + CAS_STR_YOU_WERE_NOT_AUTHENTICATED + => '

Sie wurden nicht angemeldet.

Um es erneut zu versuchen klicken Sie hier.

Wenn das Problem bestehen bleibt, kontkatieren Sie den Administrator dieser Seite.

', + CAS_STR_SERVICE_UNAVAILABLE + => 'Der Dienst `%s\' ist nicht verfügbar (%s).' +); + ?> \ 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 c17b1d6637..d41bf783b4 100644 --- a/plugins/CasAuthentication/extlib/CAS/languages/greek.php +++ b/plugins/CasAuthentication/extlib/CAS/languages/greek.php @@ -1,27 +1,27 @@ - - * @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. ÊÜíôå êëßê åäþ ãéá íá óõíå÷ßóåôå.', - CAS_STR_AUTHENTICATION_FAILED - => 'Ç ôáõôïðïßçóç CAS áðÝôõ÷å!', - CAS_STR_YOU_WERE_NOT_AUTHENTICATED - => '

Äåí ôáõôïðïéçèÞêáôå.

Ìðïñåßôå íá îáíáðñïóðáèÞóåôå, êÜíïíôáò êëßê åäþ.

Åáí ôï ðñüâëçìá åðéìåßíåé, åëÜôå óå åðáöÞ ìå ôïí äéá÷åéñéóôÞ.

', - CAS_STR_SERVICE_UNAVAILABLE - => 'Ç õðçñåóßá `%s\' äåí åßíáé äéáèÝóéìç (%s).' -); - + + * @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. ÊÜíôå êëßê åäþ ãéá íá óõíå÷ßóåôå.', + CAS_STR_AUTHENTICATION_FAILED + => 'Ç ôáõôïðïßçóç CAS áðÝôõ÷å!', + CAS_STR_YOU_WERE_NOT_AUTHENTICATED + => '

Äåí ôáõôïðïéçèÞêáôå.

Ìðïñåßôå íá îáíáðñïóðáèÞóåôå, êÜíïíôáò êëßê åäþ.

Åáí ôï ðñüâëçìá åðéìåßíåé, åëÜôå óå åðáöÞ ìå ôïí äéá÷åéñéóôÞ.

', + CAS_STR_SERVICE_UNAVAILABLE + => 'Ç õðçñåóßá `%s\' äåí åßíáé äéáèÝóéìç (%s).' +); + ?> \ 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 2c6f8bb3b3..001cfe445c 100644 --- a/plugins/CasAuthentication/extlib/CAS/languages/languages.php +++ b/plugins/CasAuthentication/extlib/CAS/languages/languages.php @@ -1,24 +1,24 @@ - - * @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); -//@} - + + * @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 3a8ffc2535..04067ca03b 100644 --- a/plugins/CasAuthentication/extlib/CAS/languages/spanish.php +++ b/plugins/CasAuthentication/extlib/CAS/languages/spanish.php @@ -1,27 +1,27 @@ - - * @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 aquí para continuar.', - CAS_STR_AUTHENTICATION_FAILED - => '¡Autentificación CAS fallida!', - CAS_STR_YOU_WERE_NOT_AUTHENTICATED - => '

No estás autentificado.

Puedes volver a intentarlo haciendo click aquí.

Si el problema persiste debería contactar con el administrador de este sitio.

', - CAS_STR_SERVICE_UNAVAILABLE - => 'El servicio `%s\' no está disponible (%s).' -); - -?> + + * @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 aquí para continuar.', + CAS_STR_AUTHENTICATION_FAILED + => '¡Autentificación CAS fallida!', + CAS_STR_YOU_WERE_NOT_AUTHENTICATED + => '

No estás autentificado.

Puedes volver a intentarlo haciendo click aquí.

Si el problema persiste debería contactar con el administrador de este sitio.

', + CAS_STR_SERVICE_UNAVAILABLE + => 'El servicio `%s\' no está disponible (%s).' +); + +?> diff --git a/plugins/DiskCachePlugin.php b/plugins/DiskCachePlugin.php new file mode 100644 index 0000000000..b709ea3b31 --- /dev/null +++ b/plugins/DiskCachePlugin.php @@ -0,0 +1,168 @@ +. + * + * @category Cache + * @package StatusNet + * @author Evan Prodromou + * @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 + * @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/Enjit/README b/plugins/Enjit/README new file mode 100644 index 0000000000..03f989490b --- /dev/null +++ b/plugins/Enjit/README @@ -0,0 +1,5 @@ +This doesn't seem to have been functional for a while; can't find other references +to the enjit configuration or transport enqueuing. Keeping it in case someone +wants to bring it up to date. + +-- brion vibber 2009-12-03 diff --git a/scripts/enjitqueuehandler.php b/plugins/Enjit/enjitqueuehandler.php old mode 100755 new mode 100644 similarity index 79% rename from scripts/enjitqueuehandler.php rename to plugins/Enjit/enjitqueuehandler.php index afcac539a6..f0e706b929 --- a/scripts/enjitqueuehandler.php +++ b/plugins/Enjit/enjitqueuehandler.php @@ -1,4 +1,3 @@ -#!/usr/bin/env php . */ -define('INSTALLDIR', realpath(dirname(__FILE__) . '/..')); - -$shortoptions = 'i::'; -$longoptions = array('id::'); - -$helptext = << 0) { - $id = $args[0]; -} else { - $id = null; -} - -$handler = new EnjitQueueHandler($id); - -if ($handler->start()) { - $handler->handle_queue(); -} - -$handler->finish(); diff --git a/plugins/Facebook/FacebookPlugin.php b/plugins/Facebook/FacebookPlugin.php index de91bf24a1..4266b886d9 100644 --- a/plugins/Facebook/FacebookPlugin.php +++ b/plugins/Facebook/FacebookPlugin.php @@ -114,6 +114,9 @@ class FacebookPlugin extends Plugin case 'FBCSettingsNav': include_once INSTALLDIR . '/plugins/Facebook/FBCSettingsNav.php'; return false; + case 'FacebookQueueHandler': + include_once INSTALLDIR . '/plugins/Facebook/facebookqueuehandler.php'; + return false; default: return true; } @@ -508,50 +511,15 @@ class FacebookPlugin extends Plugin } /** - * broadcast the message when not using queuehandler + * Register Facebook notice queue handler * - * @param Notice &$notice the notice - * @param array $queue destination queue + * @param QueueManager $manager * * @return boolean hook return */ - - function onUnqueueHandleNotice(&$notice, $queue) + function onEndInitializeQueueManager($manager) { - if (($queue == 'facebook') && ($this->_isLocal($notice))) { - facebookBroadcastNotice($notice); - return false; - } - return true; - } - - /** - * Determine whether the notice was locally created - * - * @param Notice $notice the notice - * - * @return boolean locality - */ - - function _isLocal($notice) - { - return ($notice->is_local == Notice::LOCAL_PUBLIC || - $notice->is_local == Notice::LOCAL_NONPUBLIC); - } - - /** - * Add Facebook queuehandler to the list of daemons to start - * - * @param array $daemons the list fo daemons to run - * - * @return boolean hook return - * - */ - - function onGetValidDaemons($daemons) - { - array_push($daemons, INSTALLDIR . - '/plugins/Facebook/facebookqueuehandler.php'); + $manager->connect('facebook', 'FacebookQueueHandler'); return true; } diff --git a/plugins/Facebook/facebookqueuehandler.php b/plugins/Facebook/facebookqueuehandler.php old mode 100755 new mode 100644 index e4ae7d4ee7..1778690e5b --- a/plugins/Facebook/facebookqueuehandler.php +++ b/plugins/Facebook/facebookqueuehandler.php @@ -1,4 +1,3 @@ -#!/usr/bin/env php . */ -define('INSTALLDIR', realpath(dirname(__FILE__) . '/../..')); +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } -$shortoptions = 'i::'; -$longoptions = array('id::'); - -$helptext = <<log(LOG_INFO, "INITIALIZE"); + if ($this->_isLocal($notice)) { + return facebookBroadcastNotice($notice); + } return true; } - function handle_notice($notice) + /** + * Determine whether the notice was locally created + * + * @param Notice $notice the notice + * + * @return boolean locality + */ + function _isLocal($notice) { - return facebookBroadcastNotice($notice); + return ($notice->is_local == Notice::LOCAL_PUBLIC || + $notice->is_local == Notice::LOCAL_NONPUBLIC); } - - function finish() - { - } - } - -if (have_option('i')) { - $id = get_option_value('i'); -} else if (have_option('--id')) { - $id = get_option_value('--id'); -} else if (count($args) > 0) { - $id = $args[0]; -} else { - $id = null; -} - -$handler = new FacebookQueueHandler($id); - -$handler->runOnce(); diff --git a/plugins/Imap/ImapPlugin.php b/plugins/Imap/ImapPlugin.php index d9768b6802..89a775a16a 100644 --- a/plugins/Imap/ImapPlugin.php +++ b/plugins/Imap/ImapPlugin.php @@ -46,8 +46,6 @@ class ImapPlugin extends Plugin public $user; public $password; public $poll_frequency = 60; - public static $instances = array(); - public static $daemon_added = array(); function initialize(){ if(!isset($this->mailbox)){ @@ -63,24 +61,34 @@ class ImapPlugin extends Plugin throw new Exception("must specify a poll_frequency"); } - self::$instances[] = $this; return true; } - function cleanup(){ - $index = array_search($this, self::$instances); - unset(self::$instances[$index]); - return true; - } - - function onGetValidDaemons($daemons) + /** + * Load related modules when needed + * + * @param string $cls Name of the class to be loaded + * + * @return boolean hook value; true means continue processing, false means stop. + */ + function onAutoload($cls) { - if(! self::$daemon_added){ - array_push($daemons, INSTALLDIR . - '/plugins/Imap/imapdaemon.php'); - self::$daemon_added = true; + $dir = dirname(__FILE__); + + switch ($cls) + { + case 'ImapManager': + case 'IMAPMailHandler': + include_once $dir . '/'.strtolower($cls).'.php'; + return false; + default: + return true; } - return true; + } + + function onStartIoManagerClasses(&$classes) + { + $classes[] = new ImapManager($this); } function onPluginVersion(&$versions) diff --git a/plugins/Imap/imapdaemon.php b/plugins/Imap/imapdaemon.php deleted file mode 100755 index 7e60e13763..0000000000 --- a/plugins/Imap/imapdaemon.php +++ /dev/null @@ -1,147 +0,0 @@ -#!/usr/bin/env php -. - */ - -define('INSTALLDIR', realpath(dirname(__FILE__) . '/../..')); - -$shortoptions = 'fi::'; -$longoptions = array('id::', 'foreground'); - -$helptext = <<$value) - { - $this->$attr = $value; - } - - $this->log(LOG_INFO, "INITIALIZE IMAPDaemon {" . $this->name() . "}"); - } - - function name() - { - return strtolower('imapdaemon.'.$this->user.'.'.crc32($this->mailbox)); - } - - function run() - { - $this->connect(); - while(true) - { - if(imap_ping($this->conn) || $this->connect()) - { - $this->check_mailbox(); - } - sleep($this->poll_frequency); - } - } - - function check_mailbox() - { - $count = imap_num_msg($this->conn); - $this->log(LOG_INFO, "Found $count messages"); - if($count > 0){ - $handler = new IMAPMailHandler(); - for($i=1; $i <= $count; $i++) - { - $rawmessage = imap_fetchheader($this->conn, $count, FT_PREFETCHTEXT) . imap_body($this->conn, $i); - $handler->handle_message($rawmessage); - imap_delete($this->conn, $i); - } - imap_expunge($this->conn); - $this->log(LOG_INFO, "Finished processing messages"); - } - } - - function log($level, $msg) - { - $text = $this->name() . ': '.$msg; - common_log($level, $text); - if (!$this->daemonize) - { - $line = common_log_line($level, $text); - echo $line; - echo "\n"; - } - } - - function connect() - { - $this->conn = imap_open($this->mailbox, $this->user, $this->password); - if($this->conn){ - $this->log(LOG_INFO, "Connected"); - return true; - }else{ - $this->log(LOG_INFO, "Failed to connect: " . imap_last_error()); - return false; - } - } -} - -class IMAPMailHandler extends MailHandler -{ - function error($from, $msg) - { - $this->log(LOG_INFO, "Error: $from $msg"); - $headers['To'] = $from; - $headers['Subject'] = _m('Error'); - - return mail_send(array($from), $headers, $msg); - } -} - -if (have_option('i', 'id')) { - $id = get_option_value('i', 'id'); -} else if (count($args) > 0) { - $id = $args[0]; -} else { - $id = null; -} - -$foreground = have_option('f', 'foreground'); - -foreach(ImapPlugin::$instances as $pluginInstance){ - - $daemon = new IMAPDaemon($id, !$foreground, array( - 'mailbox' => $pluginInstance->mailbox, - 'user' => $pluginInstance->user, - 'password' => $pluginInstance->password, - 'poll_frequency' => $pluginInstance->poll_frequency - )); - - $daemon->runOnce(); - -} diff --git a/plugins/Imap/imapmailhandler.php b/plugins/Imap/imapmailhandler.php new file mode 100644 index 0000000000..3d4b6113a9 --- /dev/null +++ b/plugins/Imap/imapmailhandler.php @@ -0,0 +1,32 @@ +. + */ + +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } + +class IMAPMailHandler extends MailHandler +{ + function error($from, $msg) + { + $this->log(LOG_INFO, "Error: $from $msg"); + $headers['To'] = $from; + $headers['Subject'] = _m('Error'); + + return mail_send(array($from), $headers, $msg); + } +} diff --git a/plugins/Imap/imapmanager.php b/plugins/Imap/imapmanager.php new file mode 100644 index 0000000000..e4fda58099 --- /dev/null +++ b/plugins/Imap/imapmanager.php @@ -0,0 +1,129 @@ +. + * + * @category Plugin + * @package StatusNet + * @author Craig Andrews + * @copyright 2009-2010 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +class ImapManager extends IoManager +{ + protected $conn = null; + + function __construct($plugin) + { + $this->plugin = $plugin; + } + + /** + * Fetch the singleton manager for the current site. + * @return mixed ImapManager, or false if unneeded + */ + public static function get() + { + throw new Exception('ImapManager should be created using it\'s constructor, not the static get method'); + } + + /** + * Lists the IM connection socket to allow i/o master to wake + * when input comes in here as well as from the queue source. + * + * @return array of resources + */ + public function getSockets() + { + return array(); + } + + /** + * Tell the i/o master we need one instance for each supporting site + * being handled in this process. + */ + public static function multiSite() + { + return IoManager::INSTANCE_PER_SITE; + } + + /** + * Initialize connection to server. + * @return boolean true on success + */ + public function start($master) + { + if(parent::start($master)) + { + $this->conn = $this->connect(); + return true; + }else{ + return false; + } + } + + public function handleInput($socket) + { + $this->check_mailbox(); + return true; + } + + public function poll() + { + return $this->check_mailbox() > 0; + } + + function pollInterval() + { + return $this->plugin->poll_frequency; + } + + protected function connect() + { + $this->conn = imap_open($this->plugin->mailbox, $this->plugin->user, $this->plugin->password); + if($this->conn){ + common_log(LOG_INFO, "Connected"); + return $this->conn; + }else{ + common_log(LOG_INFO, "Failed to connect: " . imap_last_error()); + return $this->conn; + } + } + + protected function check_mailbox() + { + imap_ping($this->conn); + $count = imap_num_msg($this->conn); + common_log(LOG_INFO, "Found $count messages"); + if($count > 0){ + $handler = new IMAPMailHandler(); + for($i=1; $i <= $count; $i++) + { + $rawmessage = imap_fetchheader($this->conn, $count, FT_PREFETCHTEXT) . imap_body($this->conn, $i); + $handler->handle_message($rawmessage); + imap_delete($this->conn, $i); + } + imap_expunge($this->conn); + common_log(LOG_INFO, "Finished processing messages"); + } + return $count; + } +} diff --git a/plugins/LdapAuthentication/LdapAuthenticationPlugin.php b/plugins/LdapAuthentication/LdapAuthenticationPlugin.php index eb3a05117a..1755033f17 100644 --- a/plugins/LdapAuthentication/LdapAuthenticationPlugin.php +++ b/plugins/LdapAuthentication/LdapAuthenticationPlugin.php @@ -153,6 +153,22 @@ class LdapAuthenticationPlugin extends AuthenticationPlugin return false; } + + function suggestNicknameForUsername($username) + { + $entry = $this->ldap_get_user($username, $this->attributes); + if(!$entry){ + //this really shouldn't happen + return $username; + }else{ + $nickname = $entry->getValue($this->attributes['nickname'],'single'); + if($nickname){ + return $nickname; + }else{ + return $username; + } + } + } //---utility functions---// function ldap_get_config(){ diff --git a/plugins/LinkbackPlugin.php b/plugins/LinkbackPlugin.php index 15e57ab0e8..8e44beae18 100644 --- a/plugins/LinkbackPlugin.php +++ b/plugins/LinkbackPlugin.php @@ -126,6 +126,7 @@ class LinkbackPlugin extends Plugin if (!extension_loaded('xmlrpc')) { if (!dl('xmlrpc.so')) { common_log(LOG_ERR, "Can't pingback; xmlrpc extension not available."); + return; } } diff --git a/plugins/MemcachePlugin.php b/plugins/MemcachePlugin.php index 5f93e9a836..8c8b8da6dc 100644 --- a/plugins/MemcachePlugin.php +++ b/plugins/MemcachePlugin.php @@ -133,6 +133,23 @@ class MemcachePlugin extends Plugin return false; } + function onStartCacheReconnect(&$success) + { + if (empty($this->_conn)) { + // nothing to do + return true; + } + if ($this->persistent) { + common_log(LOG_ERR, "Cannot close persistent memcached connection"); + $success = false; + } else { + common_log(LOG_INFO, "Closing memcached connection"); + $success = $this->_conn->close(); + $this->_conn = null; + } + return false; + } + /** * Ensure that a connection exists * @@ -148,20 +165,18 @@ class MemcachePlugin extends Plugin $this->_conn = new Memcache(); if (is_array($this->servers)) { - foreach ($this->servers as $server) { - list($host, $port) = explode(';', $server); - if (empty($port)) { - $port = 11211; - } - - $this->_conn->addServer($host, $port, $this->persistent); - } + $servers = $this->servers; } else { - $this->_conn->addServer($this->servers, $this->persistent); - list($host, $port) = explode(';', $this->servers); - if (empty($port)) { + $servers = array($this->servers); + } + foreach ($servers as $server) { + if (strpos($server, ';') !== false) { + list($host, $port) = explode(';', $server); + } else { + $host = $server; $port = 11211; } + $this->_conn->addServer($host, $port, $this->persistent); } diff --git a/plugins/MobileProfile/MobileProfilePlugin.php b/plugins/MobileProfile/MobileProfilePlugin.php index 14d2500e8f..d426fc282b 100644 --- a/plugins/MobileProfile/MobileProfilePlugin.php +++ b/plugins/MobileProfile/MobileProfilePlugin.php @@ -356,8 +356,6 @@ class MobileProfilePlugin extends WAP20Plugin $contentLimit = Notice::maxContent(); - $form->out->inlineScript('maxLength = ' . $contentLimit . ';'); - if ($contentLimit > 0) { $form->out->element('div', array('id' => 'notice_text-count'), $contentLimit); diff --git a/plugins/MobileProfile/mp-screen.css b/plugins/MobileProfile/mp-screen.css index 3eefc0c8e0..472fbb0013 100644 --- a/plugins/MobileProfile/mp-screen.css +++ b/plugins/MobileProfile/mp-screen.css @@ -179,10 +179,12 @@ padding-bottom:4px; } .notice div.entry-content { margin-left:0; -width:62.5%; +width:75%; +max-width:100%; +min-width:0; } .notice-options { -width:34%; +width:50px; margin-right:1%; } @@ -190,12 +192,29 @@ margin-right:1%; width:16px; height:16px; } -.notice-options a, -.notice-options input { +.notice .notice-options a, +.notice .notice-options input { box-shadow:none; -moz-box-shadow:none; -webkit-box-shadow:none; } +.notice .notice-options a, +.notice .notice-options form { +margin:-4px 0 0 0; +} +.notice .notice-options .notice_repeat, +.notice .notice-options .notice_delete { +margin-top:18px; +} +.notice .notice-options .notice_reply, +.notice .notice-options .notice_repeat { +margin-left:18px; +} + + +.notice .notice-options .notice_delete { +float:left; +} .entity_profile { width:auto; diff --git a/plugins/OpenID/finishopenidlogin.php b/plugins/OpenID/finishopenidlogin.php index 987fa92138..d25ce696cf 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 bae6c529d3..c59fcca890 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 StatusNet after site name.')); diff --git a/plugins/PubSubHubBub/PubSubHubBubPlugin.php b/plugins/PubSubHubBub/PubSubHubBubPlugin.php index c40d906a53..367b354034 100644 --- a/plugins/PubSubHubBub/PubSubHubBubPlugin.php +++ b/plugins/PubSubHubBub/PubSubHubBubPlugin.php @@ -95,14 +95,16 @@ class PubSubHubBubPlugin extends Plugin } //feed of each user that subscribes to the notice's author - $notice_inbox = new Notice_inbox(); - $notice_inbox->notice_id = $notice->id; - if ($notice_inbox->find()) { - while ($notice_inbox->fetch()) { - $user = User::staticGet('id',$notice_inbox->user_id); - $feeds[]=common_local_url('ApiTimelineUser',array('id' => $user->nickname, 'format'=>'rss')); - $feeds[]=common_local_url('ApiTimelineUser',array('id' => $user->nickname, 'format'=>'atom')); + + $ni = $notice->whoGets(); + + foreach (array_keys($ni) as $user_id) { + $user = User::staticGet('id', $user_id); + if (empty($user)) { + continue; } + $feeds[]=common_local_url('ApiTimelineUser',array('id' => $user->nickname, 'format'=>'rss')); + $feeds[]=common_local_url('ApiTimelineUser',array('id' => $user->nickname, 'format'=>'atom')); } //feed of user replied to diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php index 21e465b53d..89640f5beb 100644 --- a/plugins/Realtime/RealtimePlugin.php +++ b/plugins/Realtime/RealtimePlugin.php @@ -154,14 +154,11 @@ class RealtimePlugin extends Plugin // Add to inbox timelines // XXX: do a join - $inbox = new Notice_inbox(); - $inbox->notice_id = $notice->id; + $ni = $notice->whoGets(); - if ($inbox->find()) { - while ($inbox->fetch()) { - $user = User::staticGet('id', $inbox->user_id); - $paths[] = array('all', $user->nickname); - } + foreach (array_keys($ni) as $user_id) { + $user = User::staticGet('id', $user_id); + $paths[] = array('all', $user->nickname); } // Add to the replies timeline diff --git a/plugins/SubscriptionThrottlePlugin.php b/plugins/SubscriptionThrottlePlugin.php new file mode 100644 index 0000000000..114113360e --- /dev/null +++ b/plugins/SubscriptionThrottlePlugin.php @@ -0,0 +1,175 @@ +. + * + * @category Throttle + * @package StatusNet + * @author Evan Prodromou + * @copyright 2010 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 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); +} + +/** + * Subscription throttle + * + * @category Throttle + * @package StatusNet + * @author Evan Prodromou + * @copyright 2010 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 + * @link http://status.net/ + */ + +class SubscriptionThrottlePlugin extends Plugin +{ + public $subLimits = array(86400 => 100, + 3600 => 50); + + public $groupLimits = array(86400 => 50, + 3600 => 25); + + /** + * Filter subscriptions to see if they're coming too fast. + * + * @param User $user The user subscribing + * @param User $other The user being subscribed to + * + * @return boolean hook value + */ + + function onStartSubscribe($user, $other) + { + foreach ($this->subLimits as $seconds => $limit) { + $sub = $this->_getNthSub($user, $limit); + + if (!empty($sub)) { + $subtime = strtotime($sub->created); + $now = time(); + if ($now - $subtime < $seconds) { + throw new Exception(_("Too many subscriptions. Take a break and try again later.")); + } + } + } + + return true; + } + + /** + * Filter group joins to see if they're coming too fast. + * + * @param Group $group The group being joined + * @param User $user The user joining + * + * @return boolean hook value + */ + + function onStartJoinGroup($group, $user) + { + foreach ($this->groupLimits as $seconds => $limit) { + $mem = $this->_getNthMem($user, $limit); + if (!empty($mem)) { + + $jointime = strtotime($mem->created); + $now = time(); + if ($now - $jointime < $seconds) { + throw new Exception(_("Too many memberships. Take a break and try again later.")); + } + } + } + + return true; + } + + /** + * Get the Nth most recent subscription for this user + * + * @param User $user The user to get subscriptions for + * @param integer $n How far to count back + * + * @return Subscription a subscription or null + */ + + private function _getNthSub($user, $n) + { + $sub = new Subscription(); + + $sub->subscriber = $user->id; + $sub->orderBy('created DESC'); + $sub->limit($n - 1, 1); + + if ($sub->find(true)) { + return $sub; + } else { + return null; + } + } + + /** + * Get the Nth most recent group membership for this user + * + * @param User $user The user to get memberships for + * @param integer $n How far to count back + * + * @return Group_member a membership or null + */ + + private function _getNthMem($user, $n) + { + $mem = new Group_member(); + + $mem->profile_id = $user->id; + $mem->orderBy('created DESC'); + $mem->limit($n - 1, 1); + + if ($mem->find(true)) { + return $mem; + } else { + return null; + } + } + + /** + * Return plugin version data for display + * + * @param array &$versions Array of version arrays + * + * @return boolean hook value + */ + + function onPluginVersion(&$versions) + { + $versions[] = array('name' => 'SubscriptionThrottle', + 'version' => STATUSNET_VERSION, + 'author' => 'Evan Prodromou', + 'homepage' => 'http://status.net/wiki/Plugin:SubscriptionThrottle', + 'rawdescription' => + _m('Configurable limits for subscriptions and group memberships.')); + return true; + } +} + diff --git a/plugins/TwitterBridge/TwitterBridgePlugin.php b/plugins/TwitterBridge/TwitterBridgePlugin.php index a87ee2894a..57b3c1c995 100644 --- a/plugins/TwitterBridge/TwitterBridgePlugin.php +++ b/plugins/TwitterBridge/TwitterBridgePlugin.php @@ -112,7 +112,9 @@ class TwitterBridgePlugin extends Plugin strtolower(mb_substr($cls, 0, -6)) . '.php'; return false; case 'TwitterOAuthClient': - include_once INSTALLDIR . '/plugins/TwitterBridge/twitteroauthclient.php'; + case 'TwitterQueueHandler': + include_once INSTALLDIR . '/plugins/TwitterBridge/' . + strtolower($cls) . '.php'; return false; default: return true; @@ -138,48 +140,15 @@ class TwitterBridgePlugin extends Plugin return true; } - /** - * broadcast the message when not using queuehandler - * - * @param Notice &$notice the notice - * @param array $queue destination queue - * - * @return boolean hook return - */ - function onUnqueueHandleNotice(&$notice, $queue) - { - if (($queue == 'twitter') && ($this->_isLocal($notice))) { - broadcast_twitter($notice); - return false; - } - return true; - } - - /** - * Determine whether the notice was locally created - * - * @param Notice $notice - * - * @return boolean locality - */ - function _isLocal($notice) - { - return ($notice->is_local == Notice::LOCAL_PUBLIC || - $notice->is_local == Notice::LOCAL_NONPUBLIC); - } - /** * Add Twitter bridge daemons to the list of daemons to start * * @param array $daemons the list fo daemons to run * * @return boolean hook return - * */ function onGetValidDaemons($daemons) { - array_push($daemons, INSTALLDIR . - '/plugins/TwitterBridge/daemons/twitterqueuehandler.php'); array_push($daemons, INSTALLDIR . '/plugins/TwitterBridge/daemons/synctwitterfriends.php'); @@ -191,6 +160,19 @@ class TwitterBridgePlugin extends Plugin return true; } + /** + * Register Twitter notice queue handler + * + * @param QueueManager $manager + * + * @return boolean hook return + */ + function onEndInitializeQueueManager($manager) + { + $manager->connect('twitter', 'TwitterQueueHandler'); + return true; + } + function onPluginVersion(&$versions) { $versions[] = array('name' => 'TwitterBridge', diff --git a/plugins/TwitterBridge/daemons/twitterstatusfetcher.php b/plugins/TwitterBridge/daemons/twitterstatusfetcher.php index b4ca12be23..36732ce46a 100755 --- a/plugins/TwitterBridge/daemons/twitterstatusfetcher.php +++ b/plugins/TwitterBridge/daemons/twitterstatusfetcher.php @@ -268,19 +268,7 @@ class TwitterStatusFetcher extends ParallelizingDaemon } - if (!Notice_inbox::pkeyGet(array('notice_id' => $notice->id, - 'user_id' => $flink->user_id))) { - // Add to inbox - $inbox = new Notice_inbox(); - - $inbox->user_id = $flink->user_id; - $inbox->notice_id = $notice->id; - $inbox->created = $notice->created; - $inbox->source = NOTICE_INBOX_SOURCE_GATEWAY; // From a private source - - $inbox->insert(); - - } + Inbox::insertNotice($flink->user_id, $notice->id); $notice->blowCaches(); diff --git a/plugins/TwitterBridge/twitter.php b/plugins/TwitterBridge/twitter.php index e133ce6f74..33dfb788bf 100644 --- a/plugins/TwitterBridge/twitter.php +++ b/plugins/TwitterBridge/twitter.php @@ -269,19 +269,23 @@ function process_error($e, $flink, $notice) common_log(LOG_WARNING, $logmsg); - if ($code == 401) { - + switch($code) { + case 401: // Probably a revoked or otherwise bad access token - nuke! - remove_twitter_link($flink); return true; - - } else { + break; + case 403: + // User has exceeder her rate limit -- toss the notice + return true; + break; + default: // For every other case, it's probably some flakiness so try // sending the notice again later (requeue). return false; + break; } } diff --git a/plugins/TwitterBridge/daemons/twitterqueuehandler.php b/plugins/TwitterBridge/twitterqueuehandler.php old mode 100755 new mode 100644 similarity index 57% rename from plugins/TwitterBridge/daemons/twitterqueuehandler.php rename to plugins/TwitterBridge/twitterqueuehandler.php index f0e76bb745..5089ca7b74 --- a/plugins/TwitterBridge/daemons/twitterqueuehandler.php +++ b/plugins/TwitterBridge/twitterqueuehandler.php @@ -1,4 +1,3 @@ -#!/usr/bin/env php . */ -define('INSTALLDIR', realpath(dirname(__FILE__) . '/../../..')); +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } -$shortoptions = 'i::'; -$longoptions = array('id::'); - -$helptext = <<log(LOG_INFO, "INITIALIZE"); - return true; - } - function handle_notice($notice) { return broadcast_twitter($notice); } - - function finish() - { - } - } - -if (have_option('i')) { - $id = get_option_value('i'); -} else if (have_option('--id')) { - $id = get_option_value('--id'); -} else if (count($args) > 0) { - $id = $args[0]; -} else { - $id = null; -} - -$handler = new TwitterQueueHandler($id); - -$handler->runOnce(); diff --git a/scripts/deleteuser.php b/scripts/deleteuser.php index 52389123c5..5373c73cea 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 = << +Run a single queued notice through background processing +as if it were being run through the queue. -$helptext = <<log(LOG_INFO, "INITIALIZE"); - return true; - } - - function handle_notice($notice) { - return ping_broadcast_notice($notice); - } - - function finish() { - } +if (count($args) != 2) { + show_help(); } -if (have_option('i')) { - $id = get_option_value('i'); -} else if (have_option('--id')) { - $id = get_option_value('--id'); -} else if (count($args) > 0) { - $id = $args[0]; -} else { - $id = null; +$queue = trim($args[0]); +$noticeId = intval($args[1]); + +$qm = QueueManager::get(); +$handler = $qm->getHandler($queue); +if (!$handler) { + print "No handler for queue '$queue'.\n"; + exit(1); } -$handler = new PingQueueHandler($id); +$notice = Notice::staticGet('id', $noticeId); +if (empty($notice)) { + print "Invalid notice id $noticeId\n"; + exit(1); +} -$handler->runOnce(); +if (!$handler->handle_notice($notice)) { + print "Failed to handle notice id $noticeId on queue '$queue'.\n"; + exit(1); +} diff --git a/scripts/inbox_users.php b/scripts/inbox_users.php deleted file mode 100755 index 32adcea213..0000000000 --- a/scripts/inbox_users.php +++ /dev/null @@ -1,107 +0,0 @@ -#!/usr/bin/env php -. - */ - -# Abort if called from a web server - -define('INSTALLDIR', realpath(dirname(__FILE__) . '/..')); - -$helptext = << - -Update users to use inbox table. Listed in an ID file, default 'ids.txt'. - -ENDOFHELP; - -require_once INSTALLDIR.'/scripts/commandline.inc'; - -$id_file = (count($args) > 1) ? $args[0] : 'ids.txt'; - -common_log(LOG_INFO, 'Updating user inboxes.'); - -$ids = file($id_file); - -foreach ($ids as $id) { - - $user = User::staticGet('id', $id); - - if (!$user) { - common_log(LOG_WARNING, 'No such user: ' . $id); - continue; - } - - if ($user->inboxed) { - common_log(LOG_WARNING, 'Already inboxed: ' . $id); - continue; - } - - common_log(LOG_INFO, 'Updating inbox for user ' . $user->id); - - $user->query('BEGIN'); - - $old_inbox = new Notice_inbox(); - $old_inbox->user_id = $user->id; - - $result = $old_inbox->delete(); - - if (is_null($result) || $result === false) { - common_log_db_error($old_inbox, 'DELETE', __FILE__); - continue; - } - - $old_inbox->free(); - - $inbox = new Notice_inbox(); - - $result = $inbox->query('INSERT INTO notice_inbox (user_id, notice_id, created) ' . - 'SELECT ' . $user->id . ', notice.id, notice.created ' . - 'FROM subscription JOIN notice ON subscription.subscribed = notice.profile_id ' . - 'WHERE subscription.subscriber = ' . $user->id . ' ' . - 'AND notice.created >= subscription.created ' . - 'AND NOT EXISTS (SELECT user_id, notice_id ' . - 'FROM notice_inbox ' . - 'WHERE user_id = ' . $user->id . ' ' . - 'AND notice_id = notice.id) ' . - 'ORDER BY notice.created DESC ' . - 'LIMIT 0, 1000'); - - if (is_null($result) || $result === false) { - common_log_db_error($inbox, 'INSERT', __FILE__); - continue; - } - - $orig = clone($user); - $user->inboxed = 1; - $result = $user->update($orig); - - if (!$result) { - common_log_db_error($user, 'UPDATE', __FILE__); - continue; - } - - $user->query('COMMIT'); - - $inbox->free(); - unset($inbox); - - if ($cache) { - $cache->delete(common_cache_key('user:notices_with_friends:' . $user->id)); - $cache->delete(common_cache_key('user:notices_with_friends:' . $user->id . ';last')); - } -} diff --git a/scripts/initializeinbox.php b/scripts/initializeinbox.php new file mode 100644 index 0000000000..44508fe22a --- /dev/null +++ b/scripts/initializeinbox.php @@ -0,0 +1,116 @@ +#!/usr/bin/env php +. + */ + +define('INSTALLDIR', realpath(dirname(__FILE__) . '/..')); + +$shortoptions = 'i:n:af:'; +$longoptions = array('id=', 'nickname=', 'all', 'file='); + +$helptext = <<find()) { + while ($user->fetch()) { + initializeInbox($user); + } + } + } else if (have_option('f', 'file')) { + $filename = get_option_value('f', 'file'); + if (!file_exists($filename)) { + throw new Exception("No such file '$filename'."); + } else if (!is_readable($filename)) { + throw new Exception("Can't read '$filename'."); + } + $ids = file($filename); + foreach ($ids as $id) { + $user = User::staticGet('id', $id); + if (empty($user)) { + print "Can't find user with id '$id'.\n"; + } + initializeInbox($user); + } + } else { + show_help(); + exit(1); + } +} catch (Exception $e) { + print $e->getMessage()."\n"; + exit(1); +} + +function initializeInbox($user) +{ + if (!have_option('q', 'quiet')) { + print "Initializing inbox for $user->nickname..."; + } + + $inbox = Inbox::staticGet('user_id', $user->id); + + if ($inbox && !empty($inbox->fake)) { + if (!have_option('q', 'quiet')) { + echo "(replacing faux cached inbox)"; + } + $inbox = false; + } + if (!empty($inbox)) { + if (!have_option('q', 'quiet')) { + print "SKIP\n"; + } + } else { + $inbox = Inbox::initialize($user->id); + if (!have_option('q', 'quiet')) { + if (empty($inbox)) { + print "ERR\n"; + } else { + print "DONE\n"; + } + } + } +} diff --git a/scripts/queuedaemon.php b/scripts/queuedaemon.php new file mode 100755 index 0000000000..162f617e0d --- /dev/null +++ b/scripts/queuedaemon.php @@ -0,0 +1,272 @@ +#!/usr/bin/env php +. + */ + +define('INSTALLDIR', realpath(dirname(__FILE__) . '/..')); + +$shortoptions = 'fi:at:'; +$longoptions = array('id=', 'foreground', 'all', 'threads=', 'skip-xmpp', 'xmpp-only'); + +/** + * Attempts to get a count of the processors available on the current system + * to fan out multiple threads. + * + * Recognizes Linux and Mac OS X; others will return default of 1. + * + * @return intval + */ +function getProcessorCount() +{ + $cpus = 0; + switch (PHP_OS) { + case 'Linux': + $cpuinfo = file('/proc/cpuinfo'); + foreach (file('/proc/cpuinfo') as $line) { + if (preg_match('/^processor\s+:\s+(\d+)\s?$/', $line)) { + $cpus++; + } + } + break; + case 'Darwin': + $cpus = intval(shell_exec("/usr/sbin/sysctl -n hw.ncpu 2>/dev/null")); + break; + } + if ($cpus) { + return $cpus; + } + return 1; +} + +$threads = getProcessorCount(); +$helptext = << Spawn processing threads (default $threads) + + +END_OF_QUEUE_HELP; + +require_once INSTALLDIR.'/scripts/commandline.inc'; + +require_once(INSTALLDIR.'/lib/daemon.php'); +require_once(INSTALLDIR.'/classes/Queue_item.php'); +require_once(INSTALLDIR.'/classes/Notice.php'); + +define('CLAIM_TIMEOUT', 1200); + +/** + * Queue handling daemon... + * + * The queue daemon by default launches in the background, at which point + * it'll pass control to the configured QueueManager class to poll for updates. + * + * We can then pass individual items through the QueueHandler subclasses + * they belong to. + */ +class QueueDaemon extends Daemon +{ + protected $allsites; + protected $threads=1; + + function __construct($id=null, $daemonize=true, $threads=1, $allsites=false) + { + parent::__construct($daemonize); + + if ($id) { + $this->set_id($id); + } + $this->all = $allsites; + $this->threads = $threads; + } + + /** + * How many seconds a polling-based queue manager should wait between + * checks for new items to handle. + * + * Defaults to 60 seconds; override to speed up or slow down. + * + * @return int timeout in seconds + */ + function timeout() + { + return 60; + } + + function name() + { + return strtolower(get_class($this).'.'.$this->get_id()); + } + + function run() + { + if ($this->threads > 1) { + return $this->runThreads(); + } else { + return $this->runLoop(); + } + } + + function runThreads() + { + $children = array(); + for ($i = 1; $i <= $this->threads; $i++) { + $pid = pcntl_fork(); + if ($pid < 0) { + print "Couldn't fork for thread $i; aborting\n"; + exit(1); + } else if ($pid == 0) { + $this->runChild($i); + exit(0); + } else { + $this->log(LOG_INFO, "Spawned thread $i as pid $pid"); + $children[$i] = $pid; + } + } + + $this->log(LOG_INFO, "Waiting for children to complete."); + while (count($children) > 0) { + $status = null; + $pid = pcntl_wait($status); + if ($pid > 0) { + $i = array_search($pid, $children); + if ($i === false) { + $this->log(LOG_ERR, "Unrecognized child pid $pid exited!"); + continue; + } + unset($children[$i]); + $this->log(LOG_INFO, "Thread $i pid $pid exited."); + + $pid = pcntl_fork(); + if ($pid < 0) { + print "Couldn't fork to respawn thread $i; aborting thread.\n"; + } else if ($pid == 0) { + $this->runChild($i); + exit(0); + } else { + $this->log(LOG_INFO, "Respawned thread $i as pid $pid"); + $children[$i] = $pid; + } + } + } + $this->log(LOG_INFO, "All child processes complete."); + return true; + } + + function runChild($thread) + { + $this->set_id($this->get_id() . "." . $thread); + $this->resetDb(); + $this->runLoop(); + } + + /** + * Reconnect to the database for each child process, + * or they'll get very confused trying to use the + * same socket. + */ + function resetDb() + { + // @fixme do we need to explicitly open the db too + // or is this implied? + global $_DB_DATAOBJECT; + unset($_DB_DATAOBJECT['CONNECTIONS']); + + // Reconnect main memcached, or threads will stomp on + // each other and corrupt their requests. + $cache = common_memcache(); + if ($cache) { + $cache->reconnect(); + } + + // Also reconnect memcached for status_network table. + if (!empty(Status_network::$cache)) { + Status_network::$cache->close(); + Status_network::$cache = null; + } + } + + /** + * Setup and start of run loop for this queue handler as a daemon. + * Most of the heavy lifting is passed on to the QueueManager's service() + * method, which passes control on to the QueueHandler's handle_notice() + * method for each notice that comes in on the queue. + * + * Most of the time this won't need to be overridden in a subclass. + * + * @return boolean true on success, false on failure + */ + function runLoop() + { + $this->log(LOG_INFO, 'checking for queued notices'); + + $master = new IoMaster($this->get_id()); + $master->init($this->all); + $master->service(); + + $this->log(LOG_INFO, 'finished servicing the queue'); + + $this->log(LOG_INFO, 'terminating normally'); + + return true; + } + + function log($level, $msg) + { + common_log($level, get_class($this) . ' ('. $this->get_id() .'): '.$msg); + } +} + +if (have_option('i')) { + $id = get_option_value('i'); +} else if (have_option('--id')) { + $id = get_option_value('--id'); +} else if (count($args) > 0) { + $id = $args[0]; +} else { + $id = null; +} + +if (have_option('t')) { + $threads = intval(get_option_value('t')); +} else if (have_option('--threads')) { + $threads = intval(get_option_value('--threads')); +} else { + $threads = 0; +} +if (!$threads) { + $threads = getProcessorCount(); +} + +$daemonize = !(have_option('f') || have_option('--foreground')); +$all = have_option('a') || have_option('--all'); + +if (have_option('--skip-xmpp')) { + define('XMPP_EMERGENCY_FLAG', true); +} +if (have_option('--xmpp-only')) { + define('XMPP_ONLY_FLAG', true); +} + +$daemon = new QueueDaemon($id, $daemonize, $threads, $all); +$daemon->runOnce(); + diff --git a/scripts/triminboxes.php b/scripts/triminboxes.php deleted file mode 100644 index ea47513051..0000000000 --- a/scripts/triminboxes.php +++ /dev/null @@ -1,76 +0,0 @@ -#!/usr/bin/env php -. - */ - -define('INSTALLDIR', realpath(dirname(__FILE__) . '/..')); - -$shortoptions = 'u::'; -$longoptions = array('start-user-id=', 'sleep-time='); - -$helptext = << - --start-user-id= User ID to start after. Default is all. - --sleep-time= Amount of time to wait (in seconds) between trims. Default is zero. - -END_OF_TRIM_HELP; - -require_once INSTALLDIR.'/scripts/commandline.inc'; - -$id = null; -$sleep_time = 0; - -if (have_option('u')) { - $id = get_option_value('u'); -} else if (have_option('--start-user-id')) { - $id = get_option_value('--start-user-id'); -} else { - $id = null; -} - -if (have_option('--sleep-time')) { - $sleep_time = intval(get_option_value('--sleep-time')); -} - -$quiet = have_option('q') || have_option('--quiet'); - -$user = new User(); - -if (!empty($id)) { - $user->whereAdd('id > ' . $id); -} - -$cnt = $user->find(); - -while ($user->fetch()) { - if (!$quiet) { - print "Trimming inbox for user $user->id"; - } - $count = Notice_inbox::gc($user->id); - if ($count) { - if (!$quiet) { - print ": $count trimmed..."; - } - sleep($sleep_time); - } - if (!$quiet) { - print "\n"; - } -} diff --git a/scripts/update_po_templates.php b/scripts/update_po_templates.php index 83bff6d806..f882f673a4 100755 --- a/scripts/update_po_templates.php +++ b/scripts/update_po_templates.php @@ -80,20 +80,21 @@ function do_translatewiki_plugin($basedir, $plugin) mkdir($yamldir); } $outfile = "$yamldir/StatusNet-{$plugin}.yml"; + $pluginlc = strtolower( $plugin ); $data = <<email)) { - print "No email registered for user '$user->nickname'\n"; + # Check for unconfirmed emails + $unconfirmed_email = new Confirm_address(); + $unconfirmed_email->user_id = $user->id; + $unconfirmed_email->address_type = 'email'; + $unconfirmed_email->find(true); + + if (empty($unconfirmed_email->address)) { + print "No email registered for user '$user->nickname'\n"; + } else { + print "Unconfirmed Adress: $unconfirmed_email->address\n"; + } } else { print "$user->email\n"; } @@ -65,7 +75,18 @@ if (have_option('e', 'email')) { $user->email = get_option_value('e', 'email'); $user->find(false); if (!$user->fetch()) { - print "No users with email $user->email\n"; + # Check unconfirmed emails + $unconfirmed_email = new Confirm_address(); + $unconfirmed_email->address = $user->email; + $unconfirmed_email->address_type = 'email'; + $unconfirmed_email->find(true); + + if (empty($unconfirmed_email->user_id)) { + print "No users with email $user->email\n"; + } else { + $user=User::staticGet('id', $unconfirmed_email->user_id); + print "Unconfirmed Address: $user->id $user->nickname\n"; + } exit(0); } do { diff --git a/scripts/xmppconfirmhandler.php b/scripts/xmppconfirmhandler.php deleted file mode 100755 index 2e39741369..0000000000 --- a/scripts/xmppconfirmhandler.php +++ /dev/null @@ -1,161 +0,0 @@ -#!/usr/bin/env php -. - */ - -define('INSTALLDIR', realpath(dirname(__FILE__) . '/..')); - -$shortoptions = 'i::'; -$longoptions = array('id::'); - -$helptext = <<start()) { - return false; - } - $this->log(LOG_INFO, 'checking for queued confirmations'); - do { - $confirm = $this->next_confirm(); - if ($confirm) { - $this->log(LOG_INFO, 'Sending confirmation for ' . $confirm->address); - $user = User::staticGet($confirm->user_id); - if (!$user) { - $this->log(LOG_WARNING, 'Confirmation for unknown user ' . $confirm->user_id); - continue; - } - $success = jabber_confirm_address($confirm->code, - $user->nickname, - $confirm->address); - if (!$success) { - $this->log(LOG_ERR, 'Confirmation failed for ' . $confirm->address); - # Just let the claim age out; hopefully things work then - continue; - } else { - $this->log(LOG_INFO, 'Confirmation sent for ' . $confirm->address); - # Mark confirmation sent; need a dupe so we don't have the WHERE clause - $dupe = Confirm_address::staticGet('code', $confirm->code); - if (!$dupe) { - common_log(LOG_WARNING, 'Could not refetch confirm', __FILE__); - continue; - } - $orig = clone($dupe); - $dupe->sent = $dupe->claimed; - $result = $dupe->update($orig); - if (!$result) { - common_log_db_error($dupe, 'UPDATE', __FILE__); - # Just let the claim age out; hopefully things work then - continue; - } - $dupe->free(); - unset($dupe); - } - $user->free(); - unset($user); - $confirm->free(); - unset($confirm); - $this->idle(0); - } else { -# $this->clear_old_confirm_claims(); - $this->idle(10); - } - } while (true); - if (!$this->finish()) { - return false; - } - return true; - } - - function next_confirm() - { - $confirm = new Confirm_address(); - $confirm->whereAdd('claimed IS null'); - $confirm->whereAdd('sent IS null'); - # XXX: eventually we could do other confirmations in the queue, too - $confirm->address_type = 'jabber'; - $confirm->orderBy('modified DESC'); - $confirm->limit(1); - if ($confirm->find(true)) { - $this->log(LOG_INFO, 'Claiming confirmation for ' . $confirm->address); - # working around some weird DB_DataObject behaviour - $confirm->whereAdd(''); # clears where stuff - $original = clone($confirm); - $confirm->claimed = common_sql_now(); - $result = $confirm->update($original); - if ($result) { - $this->log(LOG_INFO, 'Succeeded in claim! '. $result); - return $confirm; - } else { - $this->log(LOG_INFO, 'Failed in claim!'); - return false; - } - } - return null; - } - - function clear_old_confirm_claims() - { - $confirm = new Confirm(); - $confirm->claimed = null; - $confirm->whereAdd('now() - claimed > '.CLAIM_TIMEOUT); - $confirm->update(DB_DATAOBJECT_WHEREADD_ONLY); - $confirm->free(); - unset($confirm); - } -} - -// Abort immediately if xmpp is not enabled, otherwise the daemon chews up -// lots of CPU trying to connect to unconfigured servers -if (common_config('xmpp','enabled')==false) { - print "Aborting daemon - xmpp is disabled\n"; - exit(); -} - -if (have_option('i')) { - $id = get_option_value('i'); -} else if (have_option('--id')) { - $id = get_option_value('--id'); -} else if (count($args) > 0) { - $id = $args[0]; -} else { - $id = null; -} - -$handler = new XmppConfirmHandler($id); - -$handler->runOnce(); - diff --git a/scripts/xmppdaemon.php b/scripts/xmppdaemon.php index 20105b602e..cef9c4bd07 100755 --- a/scripts/xmppdaemon.php +++ b/scripts/xmppdaemon.php @@ -298,7 +298,7 @@ class XMPPDaemon extends Daemon $content_shortened = common_shorten_links($body); if (Notice::contentTooLong($content_shortened)) { $from = jabber_normalize_jid($pl['from']); - $this->from_site($from, sprintf(_("Message too long - maximum is %d characters, you sent %d"), + $this->from_site($from, sprintf(_('Message too long - maximum is %1$d characters, you sent %2$d.'), Notice::maxContent(), mb_strlen($content_shortened))); return; diff --git a/tests/oauth/README b/tests/oauth/README new file mode 100644 index 0000000000..dd76feb0c6 --- /dev/null +++ b/tests/oauth/README @@ -0,0 +1,22 @@ +Some very rough test scripts for hitting up the OAuth endpoints. + +Note: this works best if you register an OAuth application, leaving +the callback URL blank. + +Put your instance info and consumer key and secret in oauth.ini + +Example usage: +-------------- + +php getrequesttoken.php + +Gets a request token, token secret and a url to authorize it. Once +you authorize the request token you can exchange it for an access token... + +php exchangetokens.php --oauth_token=b9a79548a88c1aa9a5bea73103c6d41d --token_secret=4a47d9337fc0202a14ab552e17a3b657 + +Once you have your access token, go ahead and try a protected API +resource: + +php verifycreds.php --oauth_token=cf2de7665f0dda0a82c2dc39b01be7f9 --token_secret=4524c3b712200138e1a4cff2e9ca83d8 + diff --git a/tests/oauth/exchangetokens.php b/tests/oauth/exchangetokens.php new file mode 100755 index 0000000000..2394826c7e --- /dev/null +++ b/tests/oauth/exchangetokens.php @@ -0,0 +1,105 @@ +#!/usr/bin/env php +. + */ + +define('INSTALLDIR', realpath(dirname(__FILE__) . '/../..')); + +require_once INSTALLDIR . '/extlib/OAuth.php'; + +$ini = parse_ini_file("oauth.ini"); + +$test_consumer = new OAuthConsumer($ini['consumer_key'], $ini['consumer_secret']); + +$at_endpoint = $ini['apiroot'] . $ini['access_token_url']; + +$shortoptions = 't:s:'; +$longoptions = array('oauth_token=', 'token_secret='); + +$helptext = <<sign_request($hmac_method, $test_consumer, $rt); + +$r = httpRequest($req_req->to_url()); + +common_debug("Exchange request token = " . var_export($rt, true)); +common_debug("Exchange tokens URL: " . $req_req->to_url()); + +$body = $r->getBody(); + +$token_stuff = array(); +parse_str($body, $token_stuff); + +print 'Access token : ' . $token_stuff['oauth_token'] . "\n"; +print 'Access token secret : ' . $token_stuff['oauth_token_secret'] . "\n"; + +function httpRequest($url) +{ + $request = HTTPClient::start(); + + $request->setConfig(array( + 'follow_redirects' => true, + 'connect_timeout' => 120, + 'timeout' => 120, + 'ssl_verify_peer' => false, + 'ssl_verify_host' => false + )); + + return $request->get($url); +} + diff --git a/tests/oauth/getrequesttoken.php b/tests/oauth/getrequesttoken.php new file mode 100755 index 0000000000..fc546a0f4c --- /dev/null +++ b/tests/oauth/getrequesttoken.php @@ -0,0 +1,71 @@ +#!/usr/bin/env php +. + */ + +define('INSTALLDIR', realpath(dirname(__FILE__) . '/../..')); + +require_once INSTALLDIR . '/scripts/commandline.inc'; +require_once INSTALLDIR . '/extlib/OAuth.php'; + +$ini = parse_ini_file("oauth.ini"); + +$test_consumer = new OAuthConsumer($ini['consumer_key'], $ini['consumer_secret']); + +$rt_endpoint = $ini['apiroot'] . $ini['request_token_url']; + +$parsed = parse_url($rt_endpoint); +$params = array(); + +parse_str($parsed['query'], $params); + +$hmac_method = new OAuthSignatureMethod_HMAC_SHA1(); + +$req_req = OAuthRequest::from_consumer_and_token($test_consumer, NULL, "GET", $rt_endpoint, $params); +$req_req->sign_request($hmac_method, $test_consumer, NULL); + +$r = httpRequest($req_req->to_url()); + +$body = $r->getBody(); + +$token_stuff = array(); +parse_str($body, $token_stuff); + +$authurl = $ini['apiroot'] . $ini['authorize_url'] . '?oauth_token=' . $token_stuff['oauth_token']; + +print 'Request token : ' . $token_stuff['oauth_token'] . "\n"; +print 'Request token secret : ' . $token_stuff['oauth_token_secret'] . "\n"; +print "Authorize URL : $authurl\n"; + +//var_dump($req_req); + +function httpRequest($url) +{ + $request = HTTPClient::start(); + + $request->setConfig(array( + 'follow_redirects' => true, + 'connect_timeout' => 120, + 'timeout' => 120, + 'ssl_verify_peer' => false, + 'ssl_verify_host' => false + )); + + return $request->get($url); +} + diff --git a/tests/oauth/oauth.ini b/tests/oauth/oauth.ini new file mode 100644 index 0000000000..16b747fe43 --- /dev/null +++ b/tests/oauth/oauth.ini @@ -0,0 +1,10 @@ +; Setup OAuth info here +apiroot = "http://YOURSTATUSNET/api" + +request_token_url = "/oauth/request_token" +authorize_url = "/oauth/authorize" +access_token_url = "/oauth/access_token" + +consumer_key = "b748968e9bea81a53f3a3c15aa0c686f" +consumer_secret = "5434e18cce05d9e53cdd48029a62fa41" + diff --git a/tests/oauth/verifycreds.php b/tests/oauth/verifycreds.php new file mode 100755 index 0000000000..873bdb8bdd --- /dev/null +++ b/tests/oauth/verifycreds.php @@ -0,0 +1,101 @@ +#!/usr/bin/env php +. + */ + +define('INSTALLDIR', realpath(dirname(__FILE__) . '/../..')); + +require_once INSTALLDIR . '/extlib/OAuth.php'; + +$shortoptions = 'o:s:'; +$longoptions = array('oauth_token=', 'token_secret='); + +$helptext = <<sign_request($hmac_method, $test_consumer, $at); + +$r = httpRequest($req_req->to_url()); + +$body = $r->getBody(); + +print "$body\n"; + +//print $req_req->to_url() . "\n\n"; + +function httpRequest($url) +{ + $request = HTTPClient::start(); + + $request->setConfig(array( + 'follow_redirects' => true, + 'connect_timeout' => 120, + 'timeout' => 120, + 'ssl_verify_peer' => false, + 'ssl_verify_host' => false + )); + + return $request->get($url); +} + diff --git a/theme/base/css/display.css b/theme/base/css/display.css index cdacb9a629..fbf3b6a5b9 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -73,7 +73,7 @@ input.checkbox, input.radio { position:relative; top:2px; -left:0; +left:auto; border:0; } @@ -177,7 +177,8 @@ font-weight:bold; #form_password_recover legend, #form_password_change legend, .form_entity_block legend, -#form_filter_bytag legend { +#form_filter_bytag legend, +#apioauthauthorize_allowdeny { display:none; } @@ -554,28 +555,21 @@ width:81.5%; margin-bottom:0; line-height:1.618; } -.form_notice #notice_data-attach_selected code, -.form_notice #notice_data-geo_name { +.form_notice #notice_data-attach_selected code { float:left; width:80%; display:block; overflow:auto; margin-right:2.5%; -} -.form_notice #notice_data-attach_selected code { font-size:1.1em; } -.form_notice #notice_data-attach_selected button.close, -.form_notice #notice_data-geo_selected button.close { +.form_notice #notice_data-attach_selected button.close { float:right; font-size:0.8em; } -.form_notice #notice_data-geo_selected button.minimize { -float:left; -} - -.form_notice #notice_data-geo_wrap label { +.form_notice #notice_data-geo_wrap label, +.form_notice #notice_data-geo_wrap input { position:absolute; top:25px; right:4px; @@ -586,7 +580,7 @@ height:16px; display:block; } .form_notice #notice_data-geo_wrap input { -display:none; +visibility:hidden; } .form_notice #notice_data-geo_wrap label { font-weight:normal; @@ -594,10 +588,6 @@ font-size:1em; margin-bottom:0; text-indent:-9999px; } -.form_notice #notice_data-geo_name { -display:block; -padding-left:21px; -} button.close, button.minimize { @@ -906,9 +896,63 @@ font-weight:normal; margin-right:11px; } +/*applications*/ +.applications { +margin-bottom:18px; +float:left; +width:100%; +} +.applications li { +list-style-type:none; +} +.application img, +#showapplication .entity_profile img, +.form_data #application_icon img, +#apioauthauthorize .form_data img { +max-width:96px; +max-height:96px; +} +#apioauthauthorize .form_data img { +margin-right:18px; +float:left; +} +#showapplication .entity_profile { +width:68%; +} +#showapplication .entity_profile .entity_fn { +margin-left:0; +} +#showapplication .entity_profile .entity_fn .fn:before, +#showapplication .entity_profile .entity_fn .fn:after { +content:''; +} +#showapplication .entity_data { +clear:both; +margin-bottom:18px; +} +#showapplication .entity_data h2 { +display:none; +} +#showapplication .entity_data dl { +margin-bottom:18px; +} +#showapplication .entity_data dt { +font-weight:bold; +} +#showapplication .entity_data dd { +margin-left:1.795%; +font-family:monospace; +font-size:1.3em; +} +.form_data #application_types label.radio, +.form_data #default_access_types label.radio { +width:14.5%; +} + /* NOTICE */ .notice, -.profile { +.profile, +.application { position:relative; padding-top:11px; padding-bottom:11px; @@ -1502,7 +1546,7 @@ width:auto; .system_notice ul, .instructions ul { -list-style-position:inside; +margin-left:1em; } .instructions p, .instructions ul { diff --git a/theme/base/css/ie.css b/theme/base/css/ie.css index 4e50aadbe9..70a6fd11a5 100644 --- a/theme/base/css/ie.css +++ b/theme/base/css/ie.css @@ -19,10 +19,12 @@ display:block; width:17%; max-width:17%; } -.form_notice #notice_data-attach_selected { -width:78.5%; +.form_notice #notice_data-attach_selected, +.form_notice #notice_data-geo_selected { +width:78.75%; } -.form_notice #notice_data-attach_selected button { +.form_notice #notice_data-attach_selected button, +.form_notice #notice_data-geo_selected button { padding:0 4px; } .notice-options input.submit { diff --git a/theme/base/images/icons/icons-01.gif b/theme/base/images/icons/icons-01.gif index 06202a047b..f93d33d79b 100644 Binary files a/theme/base/images/icons/icons-01.gif and b/theme/base/images/icons/icons-01.gif differ diff --git a/theme/base/images/icons/twotone/green/key.gif b/theme/base/images/icons/twotone/green/key.gif new file mode 100644 index 0000000000..ccf357ab28 Binary files /dev/null and b/theme/base/images/icons/twotone/green/key.gif differ diff --git a/theme/default/css/display.css b/theme/default/css/display.css index 2360976e57..3aebb239d3 100644 --- a/theme/default/css/display.css +++ b/theme/default/css/display.css @@ -111,12 +111,6 @@ box-shadow:3px 3px 3px rgba(194, 194, 194, 0.1); text-shadow:none; } -.form_notice span#notice_data-geo_name { -background-position:0 47%; -} -.form_notice a#notice_data-geo_name { -background-position:0 -1711px; -} .form_notice label[for=notice_data-geo] { background-position:0 -1780px; } @@ -135,6 +129,7 @@ color:#002FA7; .notice, .profile, +.application, #content tbody tr { border-top-color:#C8D1D5; } @@ -192,9 +187,9 @@ button.close, .entity_silence input.submit, .entity_delete input.submit, .notice-options .repeated, -.form_notice a#notice_data-geo_name, .form_notice label[for=notice_data-geo], -button.minimize { +button.minimize, +.form_reset_key input.submit { background-image:url(../../base/images/icons/icons-01.gif); background-repeat:no-repeat; background-color:transparent; @@ -339,6 +334,9 @@ background-position: 5px -1445px; .entity_delete input.submit { background-position: 5px -1511px; } +.form_reset_key input.submit { +background-position: 5px -1973px; +} /* NOTICES */ .notice .attachment { @@ -385,6 +383,7 @@ box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); -webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); } #content .notices li:hover, +#content .applications li:hover, #content tbody tr:hover { background-color:rgba(240, 240, 240, 0.2); } diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 91af1d8ec8..2818196c20 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -111,12 +111,6 @@ box-shadow:3px 3px 3px rgba(194, 194, 194, 0.1); text-shadow:none; } -.form_notice span#notice_data-geo_name { -background-position:0 47%; -} -.form_notice a#notice_data-geo_name { -background-position:0 -1711px; -} .form_notice label[for=notice_data-geo] { background-position:0 -1780px; } @@ -135,6 +129,7 @@ color:#002FA7; .notice, .profile, +.application, #content tbody tr { border-top-color:#CEE1E9; } @@ -192,9 +187,9 @@ button.close, .entity_silence input.submit, .entity_delete input.submit, .notice-options .repeated, -.form_notice a#notice_data-geo_name, .form_notice label[for=notice_data-geo], -button.minimize { +button.minimize, +.form_reset_key input.submit { background-image:url(../../base/images/icons/icons-01.gif); background-repeat:no-repeat; background-color:transparent; @@ -338,6 +333,9 @@ background-position: 5px -1445px; .entity_delete input.submit { background-position: 5px -1511px; } +.form_reset_key input.submit { +background-position: 5px -1973px; +} /* NOTICES */ .notice .attachment { @@ -384,6 +382,7 @@ box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); -webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); } #content .notices li:hover, +#content .applications li:hover, #content tbody tr:hover { background-color:rgba(240, 240, 240, 0.2); }