summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--actions/all.php2
-rw-r--r--actions/apiaccountverifycredentials.php14
-rw-r--r--actions/apigroupjoin.php2
-rw-r--r--actions/apigroupleave.php2
-rw-r--r--actions/apioauthaccesstoken.php94
-rw-r--r--actions/apioauthauthorize.php376
-rw-r--r--actions/apioauthrequesttoken.php99
-rw-r--r--actions/apistatusesupdate.php5
-rw-r--r--actions/apitimelinefriends.php1
-rw-r--r--actions/confirmaddress.php2
-rw-r--r--actions/editapplication.php264
-rw-r--r--actions/newapplication.php277
-rw-r--r--actions/oauthappssettings.php166
-rw-r--r--actions/oauthconnectionssettings.php212
-rw-r--r--actions/othersettings.php2
-rw-r--r--actions/showapplication.php327
-rw-r--r--actions/version.php3
-rw-r--r--classes/Consumer.php21
-rw-r--r--classes/Inbox.php51
-rw-r--r--classes/Notice.php87
-rw-r--r--classes/Oauth_application.php140
-rw-r--r--classes/Oauth_application_user.php44
-rw-r--r--classes/Profile.php25
-rw-r--r--classes/Token.php6
-rw-r--r--classes/statusnet.ini34
-rw-r--r--db/rc2torc3.sql17
-rw-r--r--db/statusnet.sql30
-rw-r--r--index.php2
-rw-r--r--js/geometa.js133
-rw-r--r--js/util.js122
-rw-r--r--lib/api.php5
-rw-r--r--lib/apiauth.php112
-rw-r--r--lib/apioauth.php122
-rw-r--r--lib/apioauthstore.php163
-rw-r--r--lib/applicationeditform.php338
-rw-r--r--lib/applicationlist.php168
-rw-r--r--lib/authenticationplugin.php56
-rw-r--r--lib/common.php3
-rw-r--r--lib/connectsettingsaction.php6
-rw-r--r--lib/dbqueuemanager.php4
-rw-r--r--lib/default.php2
-rw-r--r--lib/iomaster.php4
-rw-r--r--lib/noticeform.php1
-rw-r--r--lib/queuemanager.php24
-rw-r--r--lib/router.php25
-rw-r--r--lib/stompqueuemanager.php52
-rw-r--r--lib/util.php2
-rw-r--r--lib/xmppmanager.php8
-rw-r--r--locale/ar/LC_MESSAGES/statusnet.po871
-rw-r--r--locale/arz/LC_MESSAGES/statusnet.po879
-rw-r--r--locale/bg/LC_MESSAGES/statusnet.po737
-rw-r--r--locale/ca/LC_MESSAGES/statusnet.po811
-rw-r--r--locale/cs/LC_MESSAGES/statusnet.po710
-rw-r--r--locale/de/LC_MESSAGES/statusnet.po742
-rw-r--r--locale/el/LC_MESSAGES/statusnet.po697
-rw-r--r--locale/en_GB/LC_MESSAGES/statusnet.po742
-rw-r--r--locale/es/LC_MESSAGES/statusnet.po750
-rw-r--r--locale/fa/LC_MESSAGES/statusnet.po730
-rw-r--r--locale/fi/LC_MESSAGES/statusnet.po736
-rw-r--r--locale/fr/LC_MESSAGES/statusnet.po820
-rw-r--r--locale/ga/LC_MESSAGES/statusnet.po730
-rw-r--r--locale/he/LC_MESSAGES/statusnet.po709
-rw-r--r--locale/hsb/LC_MESSAGES/statusnet.po751
-rw-r--r--locale/ia/LC_MESSAGES/statusnet.po728
-rw-r--r--locale/is/LC_MESSAGES/statusnet.po729
-rw-r--r--locale/it/LC_MESSAGES/statusnet.po796
-rw-r--r--locale/ja/LC_MESSAGES/statusnet.po954
-rw-r--r--locale/ko/LC_MESSAGES/statusnet.po729
-rw-r--r--locale/mk/LC_MESSAGES/statusnet.po796
-rw-r--r--locale/nb/LC_MESSAGES/statusnet.po706
-rw-r--r--locale/nl/LC_MESSAGES/statusnet.po813
-rw-r--r--locale/nn/LC_MESSAGES/statusnet.po729
-rw-r--r--locale/pl/LC_MESSAGES/statusnet.po756
-rw-r--r--locale/pt/LC_MESSAGES/statusnet.po795
-rw-r--r--locale/pt_BR/LC_MESSAGES/statusnet.po972
-rw-r--r--locale/ru/LC_MESSAGES/statusnet.po777
-rw-r--r--locale/statusnet.po673
-rw-r--r--locale/sv/LC_MESSAGES/statusnet.po760
-rw-r--r--locale/te/LC_MESSAGES/statusnet.po834
-rw-r--r--locale/tr/LC_MESSAGES/statusnet.po711
-rw-r--r--locale/uk/LC_MESSAGES/statusnet.po779
-rw-r--r--locale/vi/LC_MESSAGES/statusnet.po713
-rw-r--r--locale/zh_CN/LC_MESSAGES/statusnet.po727
-rw-r--r--locale/zh_TW/LC_MESSAGES/statusnet.po704
-rw-r--r--plugins/Imap/ImapPlugin.php36
-rwxr-xr-xplugins/Imap/imapdaemon.php147
-rw-r--r--plugins/Imap/imapmailhandler.php32
-rw-r--r--plugins/Imap/imapmanager.php129
-rw-r--r--plugins/LdapAuthentication/LdapAuthenticationPlugin.php16
-rw-r--r--plugins/MemcachePlugin.php20
-rw-r--r--scripts/initializeinbox.php38
-rwxr-xr-xscripts/queuedaemon.php9
-rwxr-xr-xscripts/update_po_templates.php12
-rw-r--r--tests/oauth/README22
-rwxr-xr-xtests/oauth/exchangetokens.php105
-rwxr-xr-xtests/oauth/getrequesttoken.php71
-rw-r--r--tests/oauth/oauth.ini10
-rwxr-xr-xtests/oauth/verifycreds.php101
-rw-r--r--theme/base/css/display.css84
-rw-r--r--theme/base/images/icons/icons-01.gifbin3607 -> 3650 bytes
-rw-r--r--theme/base/images/icons/twotone/green/key.gifbin0 -> 76 bytes
-rw-r--r--theme/default/css/display.css15
-rw-r--r--theme/identica/css/display.css15
103 files changed, 24245 insertions, 7868 deletions
diff --git a/actions/all.php b/actions/all.php
index efa4521e2..3eb185214 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 08b201dbf..1095d5162 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/apigroupjoin.php b/actions/apigroupjoin.php
index 3309d63e7..374cf83df 100644
--- a/actions/apigroupjoin.php
+++ b/actions/apigroupjoin.php
@@ -145,7 +145,7 @@ 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);
diff --git a/actions/apigroupleave.php b/actions/apigroupleave.php
index 6f8d40527..9848ece05 100644
--- a/actions/apigroupleave.php
+++ b/actions/apigroupleave.php
@@ -131,7 +131,7 @@ 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);
diff --git a/actions/apioauthaccesstoken.php b/actions/apioauthaccesstoken.php
new file mode 100644
index 000000000..085ef6f0b
--- /dev/null
+++ b/actions/apioauthaccesstoken.php
@@ -0,0 +1,94 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Exchange an authorized OAuth request token for an access token
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category API
+ * @package StatusNet
+ * @author Zach Copley <zach@status.net>
+ * @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 <zach@status.net>
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link http://status.net/
+ */
+
+class 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 000000000..19128bdce
--- /dev/null
+++ b/actions/apioauthauthorize.php
@@ -0,0 +1,376 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Authorize an OAuth request token
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category API
+ * @package StatusNet
+ * @author Zach Copley <zach@status.net>
+ * @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 <zach@status.net>
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link http://status.net/
+ */
+
+class 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 <strong>%1$s</strong> by <strong>%2$s</strong> would like " .
+ "the ability to <strong>%3$s</strong> 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 000000000..467640b9a
--- /dev/null
+++ b/actions/apioauthrequesttoken.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Get an OAuth request token
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category API
+ * @package StatusNet
+ * @author Zach Copley <zach@status.net>
+ * @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 <zach@status.net>
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link http://status.net/
+ */
+
+class 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/apistatusesupdate.php b/actions/apistatusesupdate.php
index f594bbf39..f8bf7cf87 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/apitimelinefriends.php b/actions/apitimelinefriends.php
index ef58b103c..4e3827bae 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)) {
diff --git a/actions/confirmaddress.php b/actions/confirmaddress.php
index 6fd74f3ff..cc8351d8d 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/editapplication.php b/actions/editapplication.php
new file mode 100644
index 000000000..3b120259a
--- /dev/null
+++ b/actions/editapplication.php
@@ -0,0 +1,264 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Edit an OAuth Application
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category Applications
+ * @package StatusNet
+ * @author Zach Copley <zach@status.net>
+ * @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 <zach@status.net>
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link http://status.net/
+ */
+
+class 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/newapplication.php b/actions/newapplication.php
new file mode 100644
index 000000000..bc5b4edaf
--- /dev/null
+++ b/actions/newapplication.php
@@ -0,0 +1,277 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Register a new OAuth Application
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category Applications
+ * @package StatusNet
+ * @author Zach Copley <zach@status.net>
+ * @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 <zach@status.net>
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link http://status.net/
+ */
+
+class 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/oauthappssettings.php b/actions/oauthappssettings.php
new file mode 100644
index 000000000..6c0670b17
--- /dev/null
+++ b/actions/oauthappssettings.php
@@ -0,0 +1,166 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * List the OAuth applications that a user has registered with this instance
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category Settings
+ * @package StatusNet
+ * @author Zach Copley <zach@status.net>
+ * @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 <zach@status.net>
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link http://status.net/
+ *
+ * @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 000000000..c2e8d441b
--- /dev/null
+++ b/actions/oauthconnectionssettings.php
@@ -0,0 +1,212 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * List a user's OAuth connected applications
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category Settings
+ * @package StatusNet
+ * @author Zach Copley <zach@status.net>
+ * @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 <zach@status.net>
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link http://status.net/
+ *
+ * @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 0de7cd908..10e9873b3 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/showapplication.php b/actions/showapplication.php
new file mode 100644
index 000000000..a6ff425c7
--- /dev/null
+++ b/actions/showapplication.php
@@ -0,0 +1,327 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Show an OAuth application
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category Application
+ * @package StatusNet
+ * @author Zach Copley <zach@status.net>
+ * @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 <zach@status.net>
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link http://status.net/
+ */
+
+class 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/version.php b/actions/version.php
index c1f673c45..b6593e5ed 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 d5b7b7e33..ad64a8491 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/Inbox.php b/classes/Inbox.php
index e14d4f4e7..086dba1c9 100644
--- a/classes/Inbox.php
+++ b/classes/Inbox.php
@@ -57,6 +57,22 @@ class Inbox extends Memcached_DataObject
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();
@@ -80,20 +96,14 @@ class Inbox extends Memcached_DataObject
$inbox->user_id = $user_id;
$inbox->notice_ids = call_user_func_array('pack', array_merge(array('N*'), $ids));
-
- $result = $inbox->insert();
-
- if (!$result) {
- common_log_db_error($inbox, 'INSERT', __FILE__);
- return null;
- }
+ $inbox->fake = true;
return $inbox;
}
static function insertNotice($user_id, $notice_id)
{
- $inbox = Inbox::staticGet('user_id', $user_id);
+ $inbox = DB_DataObject::staticGet('inbox', 'user_id', $user_id);
if (empty($inbox)) {
$inbox = Inbox::initialize($user_id);
@@ -133,16 +143,35 @@ class Inbox extends Memcached_DataObject
$inbox = Inbox::staticGet('user_id', $user_id);
if (empty($inbox)) {
- $inbox = Inbox::initialize($user_id);
+ $inbox = Inbox::fromNoticeInbox($user_id);
if (empty($inbox)) {
return array();
+ } else {
+ $inbox->encache();
}
}
$ids = unpack('N*', $inbox->notice_ids);
- // XXX: handle since_id
- // XXX: handle max_id
+ 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);
diff --git a/classes/Notice.php b/classes/Notice.php
index 02cd20391..38b10db04 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -335,7 +335,11 @@ class Notice extends Memcached_DataObject
$notice->saveTags();
- $notice->addToInboxes();
+ $groups = $notice->saveGroups();
+
+ $recipients = $notice->saveReplies();
+
+ $notice->addToInboxes($groups, $recipients);
$notice->saveUrls();
@@ -822,7 +826,11 @@ class Notice extends Memcached_DataObject
return $ids;
}
- function whoGets()
+ /**
+ * @param $groups array of Group *objects*
+ * @param $recipients array of profile *ids*
+ */
+ function whoGets($groups=null, $recipients=null)
{
$c = self::memcache();
@@ -833,6 +841,14 @@ class Notice extends Memcached_DataObject
}
}
+ if (is_null($groups)) {
+ $groups = $this->getGroups();
+ }
+
+ if (is_null($recipients)) {
+ $recipients = $this->getReplies();
+ }
+
$users = $this->getSubscribedUsers();
// FIXME: kind of ignoring 'transitional'...
@@ -845,7 +861,6 @@ class Notice extends Memcached_DataObject
$ni[$id] = NOTICE_INBOX_SOURCE_SUB;
}
- $groups = $this->saveGroups();
$profile = $this->getProfile();
foreach ($groups as $group) {
@@ -860,8 +875,6 @@ class Notice extends Memcached_DataObject
}
}
- $recipients = $this->saveReplies();
-
foreach ($recipients as $recipient) {
if (!array_key_exists($recipient, $ni)) {
@@ -880,9 +893,9 @@ class Notice extends Memcached_DataObject
return $ni;
}
- function addToInboxes()
+ function addToInboxes($groups, $recipients)
{
- $ni = $this->whoGets();
+ $ni = $this->whoGets($groups, $recipients);
Inbox::bulkInsert($this->id, array_keys($ni));
@@ -916,6 +929,9 @@ class Notice extends Memcached_DataObject
return $ids;
}
+ /**
+ * @return array of Group objects
+ */
function saveGroups()
{
// Don't save groups for repeats
@@ -1086,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/Oauth_application.php b/classes/Oauth_application.php
new file mode 100644
index 000000000..a6b539087
--- /dev/null
+++ b/classes/Oauth_application.php
@@ -0,0 +1,140 @@
+<?php
+/**
+ * Table Definition for oauth_application
+ */
+require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
+
+class Oauth_application extends Memcached_DataObject
+{
+ ###START_AUTOCODE
+ /* the code below is auto generated do not remove the above tag */
+
+ public $__table = 'oauth_application'; // table name
+ public $id; // int(4) primary_key not_null
+ public $owner; // int(4) not_null
+ public $consumer_key; // varchar(255) not_null
+ public $name; // varchar(255) not_null
+ public $description; // varchar(255)
+ public $icon; // varchar(255) not_null
+ public $source_url; // varchar(255)
+ public $organization; // varchar(255)
+ public $homepage; // varchar(255)
+ public $callback_url; // varchar(255) not_null
+ public $type; // tinyint(1)
+ public $access_type; // tinyint(1)
+ public $created; // datetime not_null
+ public $modified; // timestamp not_null default_CURRENT_TIMESTAMP
+
+ /* Static get */
+ function staticGet($k,$v=NULL) {
+ return Memcached_DataObject::staticGet('Oauth_application',$k,$v);
+ }
+ /* the code above is auto generated do not remove the tag below */
+ ###END_AUTOCODE
+
+ // Bit flags
+ public static $readAccess = 1;
+ public static $writeAccess = 2;
+
+ public static $browser = 1;
+ public static $desktop = 2;
+
+ function getConsumer()
+ {
+ return Consumer::staticGet('consumer_key', $this->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 000000000..57986281f
--- /dev/null
+++ b/classes/Oauth_application_user.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Table Definition for oauth_application_user
+ */
+require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
+
+class Oauth_application_user extends Memcached_DataObject
+{
+ ###START_AUTOCODE
+ /* the code below is auto generated do not remove the above tag */
+
+ public $__table = 'oauth_application_user'; // table name
+ public $profile_id; // int(4) primary_key not_null
+ public $application_id; // int(4) primary_key not_null
+ public $access_type; // tinyint(1)
+ public $token; // varchar(255)
+ public $created; // datetime not_null
+ public $modified; // timestamp not_null default_CURRENT_TIMESTAMP
+
+ /* Static get */
+ function staticGet($k,$v=NULL) {
+ return Memcached_DataObject::staticGet('Oauth_application_user',$k,$v);
+ }
+ /* the code above is auto generated do not remove the tag below */
+ ###END_AUTOCODE
+
+ static function getByKeys($user, $app)
+ {
+ if (empty($user) || empty($app)) {
+ return null;
+ }
+
+ $oau = new Oauth_application_user();
+
+ $oau->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 25d908dbf..1076fb2cb 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/Token.php b/classes/Token.php
index 1fabd72f1..a129d1fd1 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/statusnet.ini b/classes/statusnet.ini
index 73727a6d6..44088cf6b 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
@@ -348,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
@@ -484,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 000000000..886b9adf2
--- /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 cb33ccf33..2a9ab74c7 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 (
diff --git a/index.php b/index.php
index 59805f600..b5edc0f94 100644
--- a/index.php
+++ b/index.php
@@ -150,7 +150,7 @@ function checkMirror($action_obj, $args)
{
global $config;
- static $alwaysRW = array('session', 'remember_me', 'inbox');
+ static $alwaysRW = array('session', 'remember_me');
if (common_config('db', 'mirror') && $action_obj->isReadOnly($args)) {
if (is_array(common_config('db', 'mirror'))) {
diff --git a/js/geometa.js b/js/geometa.js
index 87e3c99a1..bba59b448 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 2cff4afc2..373a4f3b0 100644
--- a/js/util.js
+++ b/js/util.js
@@ -481,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('');
@@ -493,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;
@@ -514,17 +515,8 @@ var SN = { // StatusNet
NLN_text = location.name;
}
- $('#'+SN.C.S.NoticeGeoName)
- .replaceWith('<a id="notice_data-geo_name"/>');
-
- $('#'+SN.C.S.NoticeGeoName)
- .attr('href', location.url)
- .text(NLN_text)
- .click(function() {
- window.open(location.url);
-
- return false;
- });
+ $('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);
@@ -533,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));
});
@@ -558,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', NoticeDataGeo_text.ShareDisable);
-
- var S = '<div id="'+SN.C.S.NoticeDataGeoSelected+'" class="'+SN.C.S.Success+'"/>';
- var NDGS = $('#'+SN.C.S.NoticeDataGeoSelected);
-
- if (NDGS.length > 0) {
- NDGS.replaceWith(S);
- }
- else {
- $('#'+SN.C.S.FormNotice).append(S);
- }
-
- NDGS = $('#'+SN.C.S.NoticeDataGeoSelected);
- NDGS.prepend('<span id="'+SN.C.S.NoticeGeoName+'">Geo</span> <button class="minimize" title="'+NoticeDataGeo_text.InfoMinimize+'">&#95;</button> <button class="close" title="'+NoticeDataGeo_text.ShareDisable+'">&#215;</button>');
-
- 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) {
@@ -623,12 +566,12 @@ 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) {
@@ -637,7 +580,6 @@ var SN = { // StatusNet
removeNoticeDataGeo();
break;
case error.TIMEOUT:
- $('#'+SN.C.S.NoticeGeoName).text(NoticeDataGeo_text.ErrorTimeout).removeClass('processing');
$('#'+SN.C.S.NoticeDataGeo).attr('checked', false);
break;
}
@@ -656,7 +598,7 @@ var SN = { // StatusNet
'token': $('#token').val()
};
- getJSONgeocodeURL(geocodeURL, data);
+ getJSONgeocodeURL(geocodeURL, data, position);
}
else {
removeNoticeDataGeo();
@@ -668,27 +610,15 @@ 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('<a id="notice_data-geo_name"/>');
-
- $('#'+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 {
diff --git a/lib/api.php b/lib/api.php
index 707e4ac21..794b14050 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.
*
diff --git a/lib/apiauth.php b/lib/apiauth.php
index 7102764cb..691db584b 100644
--- a/lib/apiauth.php
+++ b/lib/apiauth.php
@@ -28,7 +28,7 @@
* @author Evan Prodromou <evan@status.net>
* @author mEDI <medi@milaro.net>
* @author Sarven Capadisli <csarven@status.net>
- * @author Zach Copley <zach@status.net>
+ * @author Zach Copley <zach@status.net>
* @copyright 2009 StatusNet, Inc.
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
@@ -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 000000000..4cb8a6775
--- /dev/null
+++ b/lib/apioauth.php
@@ -0,0 +1,122 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Base action for OAuth API endpoints
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category API
+ * @package StatusNet
+ * @author Zach Copley <zach@status.net>
+ * @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 <zach@status.net>
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link http://status.net/
+ */
+
+class 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 000000000..32110d057
--- /dev/null
+++ b/lib/apioauthstore.php
@@ -0,0 +1,163 @@
+<?php
+/*
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2008, 2009, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
+
+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 000000000..6f03a9bed
--- /dev/null
+++ b/lib/applicationeditform.php
@@ -0,0 +1,338 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Form for editing an application
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category Form
+ * @package StatusNet
+ * @author Zach Copley <zach@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link http://status.net/
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) {
+ exit(1);
+}
+
+require_once INSTALLDIR . '/lib/form.php';
+
+/**
+ * Form for editing an application
+ *
+ * @category Form
+ * @package StatusNet
+ * @author Zach Copley <zach@status.net>
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link http://status.net/
+ *
+ */
+
+class 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 000000000..3abb1f8aa
--- /dev/null
+++ b/lib/applicationlist.php
@@ -0,0 +1,168 @@
+<?php
+
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Widget to show a list of OAuth applications
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category Application
+ * @package StatusNet
+ * @author Zach Copley <zach@status.net>
+ * @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 <zach@status.net>
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link http://status.net/
+ */
+
+class 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 de479a576..17237086c 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/common.php b/lib/common.php
index 00e80373e..ada48b339 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');
@@ -136,7 +136,6 @@ try {
exit;
}
-
// XXX: other formats here
define('NICKNAME_FMT', VALIDATE_NUM.VALIDATE_ALPHA_LOWER);
diff --git a/lib/connectsettingsaction.php b/lib/connectsettingsaction.php
index e5fb8727b..b9c14799e 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 a5c6fd28b..889365b64 100644
--- a/lib/dbqueuemanager.php
+++ b/lib/dbqueuemanager.php
@@ -99,8 +99,8 @@ class DBQueueManager extends QueueManager
$this->_fail($notice, $queue);
}
} else {
- $this->_log(LOG_INFO, "[$queue:notice $notice->id] No handler for queue $queue");
- $this->_fail($notice, $queue);
+ $this->_log(LOG_INFO, "[$queue:notice $notice->id] No handler for queue $queue; discarding.");
+ $this->_done($notice, $queue);
}
return true;
}
diff --git a/lib/default.php b/lib/default.php
index f7f4777a2..82578fea8 100644
--- a/lib/default.php
+++ b/lib/default.php
@@ -204,6 +204,8 @@ $default =
'uploads' => true,
'filecommand' => '/usr/bin/file',
),
+ 'application' =>
+ array('desclimit' => null),
'group' =>
array('maxaliases' => 3,
'desclimit' => null),
diff --git a/lib/iomaster.php b/lib/iomaster.php
index aff5b145c..ce77b53b2 100644
--- a/lib/iomaster.php
+++ b/lib/iomaster.php
@@ -70,7 +70,7 @@ class IoMaster
$classes = array();
if (Event::handle('StartIoManagerClasses', array(&$classes))) {
$classes[] = 'QueueManager';
- if (common_config('xmpp', 'enabled')) {
+ if (common_config('xmpp', 'enabled') && !defined('XMPP_EMERGENCY_FLAG')) {
$classes[] = 'XmppManager'; // handles pings/reconnects
$classes[] = 'XmppConfirmManager'; // polls for outgoing confirmations
}
@@ -231,7 +231,7 @@ class IoMaster
return -1;
}
} else {
- return $this->parseMemoryLimit($limit);
+ return $this->parseMemoryLimit($softLimit);
}
return $softLimit;
}
diff --git a/lib/noticeform.php b/lib/noticeform.php
index a00615ce7..62df5c941 100644
--- a/lib/noticeform.php
+++ b/lib/noticeform.php
@@ -213,7 +213,6 @@ class NoticeForm extends Form
$this->out->elementEnd('div');
$this->out->inlineScript(' var NoticeDataGeo_text = {'.
'ShareDisable: "'._('Do not share my location').'",'.
- 'InfoMinimize: "'._('Hide this info').'",'.
'ErrorTimeout: "'._('Sorry, retrieving your geo location is taking longer than expected, please try again later').'"'.
'}');
}
diff --git a/lib/queuemanager.php b/lib/queuemanager.php
index a98c0efff..291174d3c 100644
--- a/lib/queuemanager.php
+++ b/lib/queuemanager.php
@@ -149,15 +149,17 @@ abstract class QueueManager extends IoManager
function initialize()
{
if (Event::handle('StartInitializeQueueManager', array($this))) {
- $this->connect('plugin', 'PluginQueueHandler');
- $this->connect('omb', 'OmbQueueHandler');
- $this->connect('ping', 'PingQueueHandler');
- if (common_config('sms', 'enabled')) {
- $this->connect('sms', 'SmsQueueHandler');
+ 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')) {
+ if (common_config('xmpp', 'enabled') && !defined('XMPP_EMERGENCY_FLAG')) {
$this->connect('jabber', 'JabberQueueHandler');
$this->connect('public', 'PublicQueueHandler');
@@ -165,10 +167,14 @@ abstract class QueueManager extends IoManager
$this->connect('confirm', 'XmppConfirmHandler');
}
- // For compat with old plugins not registering their own handlers.
- $this->connect('plugin', 'PluginQueueHandler');
+ 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));
}
- Event::handle('EndInitializeQueueManager', array($this));
}
/**
diff --git a/lib/router.php b/lib/router.php
index 6b87ed27f..42bff2778 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -140,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'));
}
@@ -641,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/lib/stompqueuemanager.php b/lib/stompqueuemanager.php
index 3090e0bfb..00590fdb6 100644
--- a/lib/stompqueuemanager.php
+++ b/lib/stompqueuemanager.php
@@ -66,10 +66,62 @@ class StompQueueManager extends QueueManager
*
* @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;
}
/**
diff --git a/lib/util.php b/lib/util.php
index 9255b9b37..ef8a5d1f0 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -173,10 +173,8 @@ function common_ensure_session()
}
if (array_key_exists(session_name(), $_GET)) {
$id = $_GET[session_name()];
- common_log(LOG_INFO, 'Setting session from GET parameter: '.$id);
} else if (array_key_exists(session_name(), $_COOKIE)) {
$id = $_COOKIE[session_name()];
- common_log(LOG_INFO, 'Setting session from COOKIE: '.$id);
}
if (isset($id)) {
session_id($id);
diff --git a/lib/xmppmanager.php b/lib/xmppmanager.php
index 9662e97d1..dfff63a30 100644
--- a/lib/xmppmanager.php
+++ b/lib/xmppmanager.php
@@ -81,7 +81,7 @@ class XmppManager extends IoManager
parent::start($master);
$this->switchSite();
- require_once "lib/jabber.php";
+ require_once INSTALLDIR . "/lib/jabber.php";
# Low priority; we don't want to receive messages
@@ -118,7 +118,11 @@ class XmppManager extends IoManager
*/
public function getSockets()
{
- return array($this->conn->getSocket());
+ if ($this->conn) {
+ return array($this->conn->getSocket());
+ } else {
+ return array();
+ }
}
/**
diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po
index 7f80c9be3..456587040 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-11 23:25+0000\n"
-"PO-Revision-Date: 2010-01-11 23:26:04+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 (r60950); 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,8 +35,8 @@ 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
@@ -45,15 +45,20 @@ msgstr "لا صÙحة كهذه"
#: 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!"
@@ -127,7 +132,7 @@ msgstr ""
#: 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/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
@@ -146,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."
@@ -175,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 ""
@@ -254,18 +260,16 @@ msgid "No status found with that ID."
msgstr ""
#: actions/apifavoritecreate.php:119
-#, fuzzy
msgid "This status is already a favorite."
-msgstr "هذا الإشعار Ù…Ùضلة مسبقًا!"
+msgstr "هذه الحالة Ù…Ùضلة بالÙعل."
#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176
msgid "Could not create favorite."
msgstr "تعذّر إنشاء Ù…Ùضلة."
#: actions/apifavoritedestroy.php:122
-#, fuzzy
msgid "That status is not a favorite."
-msgstr "تلك الحالة ليست Ù…Ùضلة!"
+msgstr "تلك الحالة ليست Ù…Ùضلة."
#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
msgid "Could not delete favorite."
@@ -285,9 +289,8 @@ msgid "Could not unfollow user: User not found."
msgstr ""
#: actions/apifriendshipsdestroy.php:120
-#, fuzzy
msgid "You cannot unfollow yourself."
-msgstr "لا يمكنك منع Ù†Ùسك!"
+msgstr "لا يمكنك عدم متابعة Ù†Ùسك."
#: actions/apifriendshipsexists.php:94
msgid "Two user ids or screen_names must be supplied."
@@ -319,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."
@@ -331,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 ""
@@ -379,19 +384,19 @@ msgstr ""
msgid "You have been blocked from that group by the admin."
msgstr ""
-#: actions/apigroupjoin.php:138 actions/joingroup.php:128
-#, 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
@@ -408,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 ""
@@ -437,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 ""
@@ -591,29 +687,6 @@ msgstr "ارÙع"
msgid "Crop"
msgstr ""
-#: 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/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,7 +751,7 @@ msgstr "Ùشل Ø­Ùظ معلومات المنع."
#: actions/grouplogo.php:99 actions/groupmembers.php:83
#: actions/grouprss.php:98 actions/groupunblock.php:86
#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86
-#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263
+#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:260
msgid "No such group."
msgstr "لا مجموعة كهذه."
@@ -688,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."
@@ -747,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
@@ -929,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 "أرسل"
@@ -950,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"
@@ -961,9 +1105,8 @@ msgstr "يجب أن تكون والجًا لتنشئ مجموعة."
#: 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."
-msgstr "يجب أن تكون إداريًا لتعدّل المجموعة"
+msgstr "يجب أن تكون إداريا لتعدل المجموعة."
#: actions/editgroup.php:154
msgid "Use this form to edit the group."
@@ -987,7 +1130,6 @@ msgid "Options saved."
msgstr "Ø­ÙÙظت الخيارات."
#: actions/emailsettings.php:60
-#, fuzzy
msgid "Email settings"
msgstr "إعدادات البريد الإلكتروني"
@@ -1018,14 +1160,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
-#, fuzzy
msgid "Email address"
-msgstr "عناوين البريد الإلكتروني"
+msgstr "عنوان البريد الإلكتروني"
#: actions/emailsettings.php:123
msgid "Email address, like \"UserName@example.org\""
@@ -1374,9 +1516,8 @@ msgid ""
msgstr ""
#: actions/grouplogo.php:178
-#, fuzzy
msgid "User without matching profile."
-msgstr "ليس للمستخدم مل٠شخصي."
+msgstr "المستخدم بدون مل٠مطابق."
#: actions/grouplogo.php:362
msgid "Pick a square area of the image to be the logo."
@@ -1396,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."
@@ -1496,7 +1637,6 @@ msgid "Error removing the block."
msgstr "خطأ أثناء منع الحجب."
#: actions/imsettings.php:59
-#, fuzzy
msgid "IM settings"
msgstr "إعدادات المراسلة الÙورية"
@@ -1523,7 +1663,6 @@ msgid ""
msgstr ""
#: actions/imsettings.php:124
-#, fuzzy
msgid "IM address"
msgstr "عنوان المراسلة الÙورية"
@@ -1616,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)"
@@ -1657,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 "أرسل"
@@ -1701,27 +1840,23 @@ msgstr ""
msgid "You must be logged in to join a group."
msgstr ""
-#: actions/joingroup.php:135
-#, 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
-#, 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:80 actions/otp.php:62 actions/register.php:137
msgid "Already logged in."
@@ -1744,17 +1879,6 @@ msgstr "Ù„Ùج"
msgid "Login to site"
msgstr "Ù„Ùج إلى الموقع"
-#: actions/login.php:230 actions/profilesettings.php:106
-#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94
-#: lib/groupeditform.php:152 lib/userprofile.php:131
-msgid "Nickname"
-msgstr "الاسم المستعار"
-
-#: actions/login.php:233 actions/register.php:429
-#: lib/accountsettingsaction.php:116
-msgid "Password"
-msgstr "كلمة السر"
-
#: actions/login.php:236 actions/register.php:478
msgid "Remember me"
msgstr "تذكّرني"
@@ -1790,19 +1914,39 @@ msgid "%1$s is already an admin for group \"%2$s\"."
msgstr ""
#: actions/makeadmin.php:132
-#, fuzzy, php-format
+#, php-format
msgid "Can't get membership record for %1$s in group %2$s."
-msgstr "تعذّر إنشاء المجموعة."
+msgstr "لم يمكن الحصول على تسجيل العضوية Ù„%1$s ÙÙŠ المجموعة %2$s."
#: actions/makeadmin.php:145
-#, fuzzy, php-format
+#, php-format
msgid "Can't make %1$s an admin for group %2$s."
-msgstr "تعذّر إنشاء المجموعة."
+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 "مجموعة جديدة"
@@ -1815,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 "لا محتوى!"
@@ -1828,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 ""
@@ -1838,9 +1982,9 @@ msgid "Message sent"
msgstr "Ø£Ùرسلت الرسالة"
#: actions/newmessage.php:185
-#, fuzzy, php-format
+#, php-format
msgid "Direct message to %s sent."
-msgstr "رسالة مباشرة %s"
+msgstr "رسالة مباشرة ل%s تم إرسالها."
#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
msgid "Ajax Error"
@@ -1866,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
@@ -1907,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 ""
@@ -1924,8 +2110,8 @@ msgstr "نوع المحتوى "
msgid "Only "
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033
-#: lib/api.php:1061 lib/api.php:1171
+#: 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 "ليس نسق بيانات مدعوم."
@@ -1938,7 +2124,7 @@ msgid "Notice Search"
msgstr "بحث الإشعارات"
#: actions/othersettings.php:60
-msgid "Other Settings"
+msgid "Other settings"
msgstr "إعدادات أخرى"
#: actions/othersettings.php:71
@@ -1970,29 +2156,24 @@ msgid "URL shortening service is too long (max 50 chars)."
msgstr ""
#: actions/otp.php:69
-#, fuzzy
msgid "No user ID specified."
-msgstr "لا مجموعة Ù…Ùحدّدة."
+msgstr "لا هوية مستخدم محددة."
#: actions/otp.php:83
-#, fuzzy
msgid "No login token specified."
-msgstr "لا ملاحظة محددة."
+msgstr "لا محتوى دخول محدد."
#: actions/otp.php:90
-#, fuzzy
msgid "No login token requested."
-msgstr "لا طلب استيثاق!"
+msgstr "لا طلب استيثاق."
#: actions/otp.php:95
-#, fuzzy
msgid "Invalid login token specified."
-msgstr "لا ملاحظة محددة."
+msgstr "توكن دخول غير صحيح محدد."
#: actions/otp.php:104
-#, fuzzy
msgid "Login token expired."
-msgstr "Ù„Ùج إلى الموقع"
+msgstr "توكن الدخول انتهى."
#: actions/outbox.php:61
#, php-format
@@ -2190,9 +2371,8 @@ msgid "When to use SSL"
msgstr ""
#: actions/pathsadminpanel.php:308
-#, fuzzy
msgid "SSL server"
-msgstr "خادوم SSL"
+msgstr "خادم SSL"
#: actions/pathsadminpanel.php:309
msgid "Server to direct SSL requests to"
@@ -2256,7 +2436,7 @@ msgid "Full name"
msgstr "الاسم الكامل"
#: actions/profilesettings.php:115 actions/register.php:453
-#: lib/groupeditform.php:161
+#: lib/applicationeditform.php:230 lib/groupeditform.php:161
msgid "Homepage"
msgstr "الصÙحة الرئيسية"
@@ -2816,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 ""
@@ -2925,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 "أنشئ"
@@ -3065,14 +3315,13 @@ msgid "Site name must have non-zero length."
msgstr "يجب ألا يكون طول اسم الموقع صÙرًا."
#: actions/siteadminpanel.php:154
-#, fuzzy
msgid "You must have a valid contact email address."
-msgstr "يجب أن تملك عنوان بريد إلكتروني صالح للاتصال"
+msgstr "يجب أن تملك عنوان بريد إلكتروني صحيح."
#: actions/siteadminpanel.php:172
-#, fuzzy, php-format
+#, php-format
msgid "Unknown language \"%s\"."
-msgstr "لغة غير معروÙØ© \"%s\""
+msgstr "لغة غير معروÙØ© \"%s\"."
#: actions/siteadminpanel.php:179
msgid "Invalid snapshot report URL."
@@ -3251,7 +3500,6 @@ msgid "Save site settings"
msgstr "اذ٠إعدادت الموقع"
#: actions/smssettings.php:58
-#, fuzzy
msgid "SMS settings"
msgstr "إعدادات الرسائل القصيرة"
@@ -3281,9 +3529,8 @@ msgid "Enter the code you received on your phone."
msgstr ""
#: actions/smssettings.php:138
-#, fuzzy
msgid "SMS phone number"
-msgstr "لا رقم هاتÙ."
+msgstr "رقم هات٠SMS"
#: actions/smssettings.php:140
msgid "Phone number, no punctuation or spaces, with area code"
@@ -3366,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."
@@ -3403,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."
@@ -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,24 +4030,13 @@ 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 "المؤلÙ"
-
-#: actions/version.php:198 lib/groupeditform.php:172
-msgid "Description"
-msgstr "الوصÙ"
+msgstr "المؤلÙ(ون)"
#: classes/File.php:144
#, php-format
@@ -3820,8 +4055,20 @@ msgstr ""
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
-#, fuzzy, php-format
+#, php-format
msgid "Could not create login token for %s"
msgstr "لم يمكن إنشاء توكن الولوج ل%s"
@@ -3837,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!"
@@ -3921,9 +4168,9 @@ msgid "Other options"
msgstr "خيارات أخرى"
#: lib/action.php:144
-#, fuzzy, php-format
+#, php-format
msgid "%1$s - %2$s"
-msgstr "%1$s (%2$s)"
+msgstr "%1$s - %2$s"
#: lib/action.php:159
msgid "Untitled page"
@@ -3942,10 +4189,6 @@ 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 ""
@@ -4099,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."
@@ -4136,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 "مرÙقات"
@@ -4156,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"
@@ -4183,18 +4480,18 @@ msgid "Sorry, this command is not yet implemented."
msgstr ""
#: lib/command.php:88
-#, fuzzy, php-format
+#, php-format
msgid "Could not find a user with nickname %s"
-msgstr "تعذّر إيجاد المستخدم الهدÙ."
+msgstr "لم يمكن إيجاد مستخدم بالاسم %s"
#: lib/command.php:92
msgid "It does not make a lot of sense to nudge yourself!"
msgstr ""
#: lib/command.php:99
-#, fuzzy, php-format
+#, php-format
msgid "Nudge sent to %s"
-msgstr "أرسل التنبيه"
+msgstr "التنبيه تم إرساله إلى %s"
#: lib/command.php:126
#, php-format
@@ -4207,14 +4504,12 @@ msgstr ""
"المشتركون: %2$s\n"
"الإشعارات: %3$s"
-#: lib/command.php:152 lib/command.php:399 lib/command.php:460
-#, fuzzy
+#: lib/command.php:152 lib/command.php:390 lib/command.php:451
msgid "Notice with that id does not exist"
-msgstr "لا مل٠بهذه الهوية."
+msgstr "الملاحظة بهذا الرقم غير موجودة"
-#: lib/command.php:168 lib/command.php:415 lib/command.php:476
-#: lib/command.php:532
-#, fuzzy
+#: lib/command.php:168 lib/command.php:406 lib/command.php:467
+#: lib/command.php:523
msgid "User has no last notice"
msgstr "ليس للمستخدم إشعار أخير"
@@ -4223,149 +4518,146 @@ msgid "Notice marked as fave."
msgstr ""
#: lib/command.php:217
-#, fuzzy
msgid "You are already a member of that group"
-msgstr "لست عضوا ÙÙŠ تلك المجموعة."
+msgstr "أنت بالÙعل عضو ÙÙŠ هذه المجموعة"
-#: lib/command.php:234
-#, fuzzy, php-format
+#: lib/command.php:231
+#, php-format
msgid "Could not join user %s to group %s"
-msgstr "تعذّر إنشاء المجموعة."
+msgstr "لم يمكن ضم المستخدم %s إلى المجموعة %s"
-#: lib/command.php:239
-#, fuzzy, php-format
+#: lib/command.php:236
+#, php-format
msgid "%s joined group %s"
msgstr "%s انضم إلى مجموعة %s"
-#: lib/command.php:284
-#, fuzzy, php-format
+#: lib/command.php:275
+#, php-format
msgid "Could not remove user %s to group %s"
-msgstr "تعذّر إنشاء المجموعة."
+msgstr "لم يمكن إزالة المستخدم %s من المجموعة %s"
-#: lib/command.php:289
-#, fuzzy, php-format
+#: lib/command.php:280
+#, php-format
msgid "%s left group %s"
-msgstr "%s انضم إلى مجموعة %s"
+msgstr "%s ترك المجموعة %s"
-#: lib/command.php:318
-#, fuzzy, php-format
+#: lib/command.php:309
+#, php-format
msgid "Fullname: %s"
msgstr "الاسم الكامل: %s"
-#: lib/command.php:321 lib/mail.php:254
+#: lib/command.php:312 lib/mail.php:254
#, php-format
msgid "Location: %s"
msgstr "الموقع: %s"
-#: lib/command.php:324 lib/mail.php:256
+#: 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 %d characters, you sent %d"
msgstr ""
-#: lib/command.php:376
-#, fuzzy, php-format
+#: lib/command.php:367
+#, php-format
msgid "Direct message to %s sent"
-msgstr "رسالة مباشرة %s"
+msgstr "رسالة مباشرة إلى %s تم إرسالها"
-#: lib/command.php:378
+#: lib/command.php:369
msgid "Error sending direct message."
msgstr ""
-#: lib/command.php:422
-#, fuzzy
+#: lib/command.php:413
msgid "Cannot repeat your own notice"
-msgstr "لا يمكنك تكرار ملحوظتك الخاصة."
+msgstr "لا يمكنك تكرار ملاحظتك الخاصة"
-#: lib/command.php:427
-#, fuzzy
+#: lib/command.php:418
msgid "Already repeated that notice"
-msgstr "كرر بالÙعل هذه الملاحظة."
+msgstr "كرر بالÙعل هذا الإشعار"
-#: lib/command.php:435
-#, fuzzy, php-format
+#: 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 %d characters, you sent %d"
msgstr ""
-#: lib/command.php:500
-#, fuzzy, php-format
+#: 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
+#: 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
+#: 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
+#: lib/command.php:641
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:661
+#: lib/command.php:652
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:677
+#: lib/command.php:668
msgid "You are not subscribed to anyone."
msgstr "لست Ù…Ùشتركًا بأي أحد."
-#: lib/command.php:679
+#: lib/command.php:670
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "لست مشتركًا بأحد."
@@ -4375,11 +4667,11 @@ msgstr[3] "أنت مشترك بهؤلاء الأشخاص:"
msgstr[4] ""
msgstr[5] ""
-#: lib/command.php:699
+#: lib/command.php:690
msgid "No one is subscribed to you."
msgstr "لا أحد مشترك بك."
-#: lib/command.php:701
+#: lib/command.php:692
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "لا أحد مشترك بك."
@@ -4389,11 +4681,11 @@ msgstr[3] "هؤلاء الأشخاص مشتركون بك:"
msgstr[4] ""
msgstr[5] ""
-#: lib/command.php:721
+#: lib/command.php:712
msgid "You are not a member of any groups."
msgstr "لست عضوًا ÙÙŠ أي مجموعة."
-#: lib/command.php:723
+#: lib/command.php:714
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "لست عضوًا ÙÙŠ أي مجموعة."
@@ -4403,7 +4695,7 @@ msgstr[3] "أنت عضو ÙÙŠ هذه المجموعات:"
msgstr[4] ""
msgstr[5] ""
-#: lib/command.php:737
+#: lib/command.php:728
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4444,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 "اذهب إلى المÙثبّت."
@@ -4472,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 "خطأ قاعدة بيانات"
@@ -4654,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 "انضم"
@@ -4717,9 +5022,9 @@ msgid ""
msgstr ""
#: lib/mail.php:258
-#, fuzzy, php-format
+#, php-format
msgid "Bio: %s"
-msgstr "السيرة: %s\n"
+msgstr "السيرة: %s"
#: lib/mail.php:286
#, php-format
@@ -4870,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."
@@ -4913,9 +5218,8 @@ msgid "File could not be moved to destination directory."
msgstr ""
#: lib/mediafile.php:201 lib/mediafile.php:237
-#, fuzzy
msgid "Could not determine file's MIME type."
-msgstr "تعذّر حذ٠المÙضلة."
+msgstr "لم يمكن تحديد نوع MIME للملÙ."
#: lib/mediafile.php:270
#, php-format
@@ -4957,17 +5261,17 @@ msgid "Attach a file"
msgstr "أرÙÙ‚ ملÙًا"
#: lib/noticeform.php:212
-#, fuzzy
msgid "Share my location"
-msgstr "لم يمكن Ø­Ùظ تÙضيلات الموقع."
+msgstr "شارك موقعي"
-#: lib/noticeform.php:214
-#, fuzzy
+#: lib/noticeform.php:215
msgid "Do not share my location"
-msgstr "لم يمكن Ø­Ùظ تÙضيلات الموقع."
+msgstr "لا تشارك موقعي"
-#: lib/noticeform.php:215
-msgid "Hide this info"
+#: lib/noticeform.php:216
+msgid ""
+"Sorry, retrieving your geo location is taking longer than expected, please "
+"try again later"
msgstr ""
#: lib/noticelist.php:428
@@ -5085,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"
@@ -5228,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 "تعذّر حذ٠الاشتراك."
@@ -5318,47 +5621,47 @@ msgstr "رسالة"
msgid "Moderate"
msgstr ""
-#: lib/util.php:884
+#: lib/util.php:875
msgid "a few seconds ago"
msgstr "قبل لحظات قليلة"
-#: lib/util.php:886
+#: lib/util.php:877
msgid "about a minute ago"
msgstr "قبل دقيقة تقريبًا"
-#: lib/util.php:888
+#: lib/util.php:879
#, php-format
msgid "about %d minutes ago"
msgstr ""
-#: lib/util.php:890
+#: lib/util.php:881
msgid "about an hour ago"
msgstr "قبل ساعة تقريبًا"
-#: lib/util.php:892
+#: lib/util.php:883
#, php-format
msgid "about %d hours ago"
msgstr ""
-#: lib/util.php:894
+#: lib/util.php:885
msgid "about a day ago"
msgstr "قبل يوم تقريبا"
-#: lib/util.php:896
+#: lib/util.php:887
#, php-format
msgid "about %d days ago"
msgstr ""
-#: lib/util.php:898
+#: lib/util.php:889
msgid "about a month ago"
msgstr "قبل شهر تقريبًا"
-#: lib/util.php:900
+#: lib/util.php:891
#, php-format
msgid "about %d months ago"
msgstr ""
-#: lib/util.php:902
+#: lib/util.php:893
msgid "about a year ago"
msgstr "قبل سنة تقريبًا"
diff --git a/locale/arz/LC_MESSAGES/statusnet.po b/locale/arz/LC_MESSAGES/statusnet.po
index 2c8fc18d1..8de26e44b 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-11 23:25+0000\n"
-"PO-Revision-Date: 2010-01-11 23:26:08+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 (r60950); 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,8 +35,8 @@ 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
@@ -44,15 +45,20 @@ msgstr "لا صÙحه كهذه"
#: 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!"
@@ -126,7 +132,7 @@ msgstr ""
#: 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/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
@@ -145,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."
@@ -174,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 ""
@@ -253,18 +260,16 @@ msgid "No status found with that ID."
msgstr ""
#: actions/apifavoritecreate.php:119
-#, fuzzy
msgid "This status is already a favorite."
-msgstr "هذا الإشعار Ù…Ùضله مسبقًا!"
+msgstr "هذه الحاله Ù…Ùضله بالÙعل."
#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176
msgid "Could not create favorite."
msgstr "تعذّر إنشاء Ù…Ùضله."
#: actions/apifavoritedestroy.php:122
-#, fuzzy
msgid "That status is not a favorite."
-msgstr "تلك الحاله ليست Ù…Ùضلة!"
+msgstr "تلك الحاله ليست Ù…Ùضله."
#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
msgid "Could not delete favorite."
@@ -284,9 +289,8 @@ msgid "Could not unfollow user: User not found."
msgstr ""
#: actions/apifriendshipsdestroy.php:120
-#, fuzzy
msgid "You cannot unfollow yourself."
-msgstr "لا يمكنك منع Ù†Ùسك!"
+msgstr "لا يمكنك عدم متابعه Ù†Ùسك."
#: actions/apifriendshipsexists.php:94
msgid "Two user ids or screen_names must be supplied."
@@ -318,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."
@@ -330,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 ""
@@ -378,19 +384,19 @@ msgstr ""
msgid "You have been blocked from that group by the admin."
msgstr ""
-#: actions/apigroupjoin.php:138 actions/joingroup.php:128
-#, 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
@@ -407,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 ""
@@ -436,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 ""
@@ -590,29 +687,6 @@ msgstr "ارÙع"
msgid "Crop"
msgstr ""
-#: 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/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 ""
@@ -677,7 +751,7 @@ msgstr "Ùشل Ø­Ùظ معلومات المنع."
#: actions/grouplogo.php:99 actions/groupmembers.php:83
#: actions/grouprss.php:98 actions/groupunblock.php:86
#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86
-#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263
+#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:260
msgid "No such group."
msgstr "لا مجموعه كهذه."
@@ -687,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."
@@ -746,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
@@ -928,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 "أرسل"
@@ -949,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"
@@ -960,9 +1105,8 @@ msgstr "يجب أن تكون والجًا لتنشئ مجموعه."
#: 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."
-msgstr "يجب أن تكون إداريًا لتعدّل المجموعة"
+msgstr "يجب أن تكون إداريا لتعدل المجموعه."
#: actions/editgroup.php:154
msgid "Use this form to edit the group."
@@ -986,7 +1130,6 @@ msgid "Options saved."
msgstr "Ø­ÙÙظت الخيارات."
#: actions/emailsettings.php:60
-#, fuzzy
msgid "Email settings"
msgstr "إعدادات البريد الإلكتروني"
@@ -1017,14 +1160,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
-#, fuzzy
msgid "Email address"
-msgstr "عناوين البريد الإلكتروني"
+msgstr "عنوان البريد الإلكتروني"
#: actions/emailsettings.php:123
msgid "Email address, like \"UserName@example.org\""
@@ -1373,9 +1516,8 @@ msgid ""
msgstr ""
#: actions/grouplogo.php:178
-#, fuzzy
msgid "User without matching profile."
-msgstr "ليس للمستخدم مل٠شخصى."
+msgstr "المستخدم بدون مل٠مطابق."
#: actions/grouplogo.php:362
msgid "Pick a square area of the image to be the logo."
@@ -1395,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."
@@ -1495,7 +1637,6 @@ msgid "Error removing the block."
msgstr "خطأ أثناء منع الحجب."
#: actions/imsettings.php:59
-#, fuzzy
msgid "IM settings"
msgstr "إعدادات المراسله الÙورية"
@@ -1522,7 +1663,6 @@ msgid ""
msgstr ""
#: actions/imsettings.php:124
-#, fuzzy
msgid "IM address"
msgstr "عنوان المراسله الÙورية"
@@ -1615,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)"
@@ -1656,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 "أرسل"
@@ -1700,27 +1840,23 @@ msgstr ""
msgid "You must be logged in to join a group."
msgstr ""
-#: actions/joingroup.php:135
-#, 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
-#, 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:80 actions/otp.php:62 actions/register.php:137
msgid "Already logged in."
@@ -1743,17 +1879,6 @@ msgstr "Ù„Ùج"
msgid "Login to site"
msgstr "Ù„Ùج إلى الموقع"
-#: actions/login.php:230 actions/profilesettings.php:106
-#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94
-#: lib/groupeditform.php:152 lib/userprofile.php:131
-msgid "Nickname"
-msgstr "الاسم المستعار"
-
-#: actions/login.php:233 actions/register.php:429
-#: lib/accountsettingsaction.php:116
-msgid "Password"
-msgstr "كلمه السر"
-
#: actions/login.php:236 actions/register.php:478
msgid "Remember me"
msgstr "تذكّرني"
@@ -1789,19 +1914,39 @@ msgid "%1$s is already an admin for group \"%2$s\"."
msgstr ""
#: actions/makeadmin.php:132
-#, fuzzy, php-format
+#, php-format
msgid "Can't get membership record for %1$s in group %2$s."
-msgstr "تعذّر إنشاء المجموعه."
+msgstr "لم يمكن الحصول على تسجيل العضويه Ù„%1$s ÙÙ‰ المجموعه %2$s."
#: actions/makeadmin.php:145
-#, fuzzy, php-format
+#, php-format
msgid "Can't make %1$s an admin for group %2$s."
-msgstr "تعذّر إنشاء المجموعه."
+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 "مجموعه جديدة"
@@ -1814,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 "لا محتوى!"
@@ -1827,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 ""
@@ -1837,9 +1982,9 @@ msgid "Message sent"
msgstr "Ø£Ùرسلت الرسالة"
#: actions/newmessage.php:185
-#, fuzzy, php-format
+#, php-format
msgid "Direct message to %s sent."
-msgstr "رساله مباشره %s"
+msgstr "رساله مباشره ل%s تم إرسالها."
#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
msgid "Ajax Error"
@@ -1865,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
@@ -1906,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 ""
@@ -1923,22 +2110,22 @@ msgstr "نوع المحتوى "
msgid "Only "
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033
-#: lib/api.php:1061 lib/api.php:1171
+#: 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."
@@ -1969,29 +2156,24 @@ msgid "URL shortening service is too long (max 50 chars)."
msgstr ""
#: actions/otp.php:69
-#, fuzzy
msgid "No user ID specified."
-msgstr "لا مجموعه Ù…Ùحدّده."
+msgstr "لا هويه مستخدم محدده."
#: actions/otp.php:83
-#, fuzzy
msgid "No login token specified."
-msgstr "لا ملاحظه محدده."
+msgstr "لا محتوى دخول محدد."
#: actions/otp.php:90
-#, fuzzy
msgid "No login token requested."
-msgstr "لا طلب استيثاق!"
+msgstr "لا طلب استيثاق."
#: actions/otp.php:95
-#, fuzzy
msgid "Invalid login token specified."
-msgstr "لا ملاحظه محدده."
+msgstr "توكن دخول غير صحيح محدد."
#: actions/otp.php:104
-#, fuzzy
msgid "Login token expired."
-msgstr "Ù„Ùج إلى الموقع"
+msgstr "توكن الدخول انتهى."
#: actions/outbox.php:61
#, php-format
@@ -2189,9 +2371,8 @@ msgid "When to use SSL"
msgstr ""
#: actions/pathsadminpanel.php:308
-#, fuzzy
msgid "SSL server"
-msgstr "خادوم SSL"
+msgstr "خادم SSL"
#: actions/pathsadminpanel.php:309
msgid "Server to direct SSL requests to"
@@ -2255,7 +2436,7 @@ msgid "Full name"
msgstr "الاسم الكامل"
#: actions/profilesettings.php:115 actions/register.php:453
-#: lib/groupeditform.php:161
+#: lib/applicationeditform.php:230 lib/groupeditform.php:161
msgid "Homepage"
msgstr "الصÙحه الرئيسية"
@@ -2815,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 ""
@@ -2924,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 "أنشئ"
@@ -3064,14 +3315,13 @@ msgid "Site name must have non-zero length."
msgstr "يجب ألا يكون طول اسم الموقع صÙرًا."
#: actions/siteadminpanel.php:154
-#, fuzzy
msgid "You must have a valid contact email address."
-msgstr "يجب أن تملك عنوان بريد إلكترونى صالح للاتصال"
+msgstr "يجب أن تملك عنوان بريد إلكترونى صحيح."
#: actions/siteadminpanel.php:172
-#, fuzzy, php-format
+#, php-format
msgid "Unknown language \"%s\"."
-msgstr "لغه غير معروÙÙ‡ \"%s\""
+msgstr "لغه غير معروÙÙ‡ \"%s\"."
#: actions/siteadminpanel.php:179
msgid "Invalid snapshot report URL."
@@ -3250,7 +3500,6 @@ msgid "Save site settings"
msgstr "اذ٠إعدادت الموقع"
#: actions/smssettings.php:58
-#, fuzzy
msgid "SMS settings"
msgstr "إعدادات الرسائل القصيرة"
@@ -3280,9 +3529,8 @@ msgid "Enter the code you received on your phone."
msgstr ""
#: actions/smssettings.php:138
-#, fuzzy
msgid "SMS phone number"
-msgstr "لا رقم هاتÙ."
+msgstr "رقم هات٠SMS"
#: actions/smssettings.php:140
msgid "Phone number, no punctuation or spaces, with area code"
@@ -3365,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."
@@ -3402,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."
@@ -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,24 +4030,13 @@ 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 "المؤلÙ"
-
-#: actions/version.php:198 lib/groupeditform.php:172
-msgid "Description"
-msgstr "الوصÙ"
+msgstr "المؤلÙ(ون)"
#: classes/File.php:144
#, php-format
@@ -3819,8 +4055,20 @@ msgstr ""
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
-#, fuzzy, php-format
+#, php-format
msgid "Could not create login token for %s"
msgstr "لم يمكن إنشاء توكن الولوج ل%s"
@@ -3836,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!"
@@ -3920,9 +4168,9 @@ msgid "Other options"
msgstr "خيارات أخرى"
#: lib/action.php:144
-#, fuzzy, php-format
+#, php-format
msgid "%1$s - %2$s"
-msgstr "%1$s (%2$s)"
+msgstr "%1$s - %2$s"
#: lib/action.php:159
msgid "Untitled page"
@@ -3941,10 +4189,6 @@ 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 ""
@@ -4098,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."
@@ -4135,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 "مرÙقات"
@@ -4155,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"
@@ -4182,18 +4481,18 @@ msgid "Sorry, this command is not yet implemented."
msgstr ""
#: lib/command.php:88
-#, fuzzy, php-format
+#, php-format
msgid "Could not find a user with nickname %s"
-msgstr "تعذّر إيجاد المستخدم الهدÙ."
+msgstr "لم يمكن إيجاد مستخدم بالاسم %s"
#: lib/command.php:92
msgid "It does not make a lot of sense to nudge yourself!"
msgstr ""
#: lib/command.php:99
-#, fuzzy, php-format
+#, php-format
msgid "Nudge sent to %s"
-msgstr "أرسل التنبيه"
+msgstr "التنبيه تم إرساله إلى %s"
#: lib/command.php:126
#, php-format
@@ -4206,14 +4505,12 @@ msgstr ""
"المشتركون: %2$s\n"
"الإشعارات: %3$s"
-#: lib/command.php:152 lib/command.php:399 lib/command.php:460
-#, fuzzy
+#: lib/command.php:152 lib/command.php:390 lib/command.php:451
msgid "Notice with that id does not exist"
-msgstr "لا مل٠بهذه الهويه."
+msgstr "الملاحظه بهذا الرقم غير موجودة"
-#: lib/command.php:168 lib/command.php:415 lib/command.php:476
-#: lib/command.php:532
-#, fuzzy
+#: lib/command.php:168 lib/command.php:406 lib/command.php:467
+#: lib/command.php:523
msgid "User has no last notice"
msgstr "ليس للمستخدم إشعار أخير"
@@ -4222,149 +4519,146 @@ msgid "Notice marked as fave."
msgstr ""
#: lib/command.php:217
-#, fuzzy
msgid "You are already a member of that group"
-msgstr "لست عضوا ÙÙ‰ تلك المجموعه."
+msgstr "أنت بالÙعل عضو ÙÙ‰ هذه المجموعة"
-#: lib/command.php:234
-#, fuzzy, php-format
+#: lib/command.php:231
+#, php-format
msgid "Could not join user %s to group %s"
-msgstr "تعذّر إنشاء المجموعه."
+msgstr "لم يمكن ضم المستخدم %s إلى المجموعه %s"
-#: lib/command.php:239
-#, fuzzy, php-format
+#: lib/command.php:236
+#, php-format
msgid "%s joined group %s"
msgstr "%s انضم إلى مجموعه %s"
-#: lib/command.php:284
-#, fuzzy, php-format
+#: lib/command.php:275
+#, php-format
msgid "Could not remove user %s to group %s"
-msgstr "تعذّر إنشاء المجموعه."
+msgstr "لم يمكن إزاله المستخدم %s من المجموعه %s"
-#: lib/command.php:289
-#, fuzzy, php-format
+#: lib/command.php:280
+#, php-format
msgid "%s left group %s"
-msgstr "%s انضم إلى مجموعه %s"
+msgstr "%s ترك المجموعه %s"
-#: lib/command.php:318
-#, fuzzy, php-format
+#: lib/command.php:309
+#, php-format
msgid "Fullname: %s"
msgstr "الاسم الكامل: %s"
-#: lib/command.php:321 lib/mail.php:254
+#: lib/command.php:312 lib/mail.php:254
#, php-format
msgid "Location: %s"
msgstr "الموقع: %s"
-#: lib/command.php:324 lib/mail.php:256
+#: 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 %d characters, you sent %d"
msgstr ""
-#: lib/command.php:376
-#, fuzzy, php-format
+#: lib/command.php:367
+#, php-format
msgid "Direct message to %s sent"
-msgstr "رساله مباشره %s"
+msgstr "رساله مباشره إلى %s تم إرسالها"
-#: lib/command.php:378
+#: lib/command.php:369
msgid "Error sending direct message."
msgstr ""
-#: lib/command.php:422
-#, fuzzy
+#: lib/command.php:413
msgid "Cannot repeat your own notice"
-msgstr "لا يمكنك تكرار ملحوظتك الخاصه."
+msgstr "لا يمكنك تكرار ملاحظتك الخاصة"
-#: lib/command.php:427
-#, fuzzy
+#: lib/command.php:418
msgid "Already repeated that notice"
-msgstr "كرر بالÙعل هذه الملاحظه."
+msgstr "كرر بالÙعل هذا الإشعار"
-#: lib/command.php:435
-#, fuzzy, php-format
+#: 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 %d characters, you sent %d"
msgstr ""
-#: lib/command.php:500
-#, fuzzy, php-format
+#: 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
+#: 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
+#: 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
+#: lib/command.php:641
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:661
+#: lib/command.php:652
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:677
+#: lib/command.php:668
msgid "You are not subscribed to anyone."
msgstr "لست Ù…Ùشتركًا بأى أحد."
-#: lib/command.php:679
+#: lib/command.php:670
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "لست مشتركًا بأحد."
@@ -4374,11 +4668,11 @@ msgstr[3] "أنت مشترك بهؤلاء الأشخاص:"
msgstr[4] ""
msgstr[5] ""
-#: lib/command.php:699
+#: lib/command.php:690
msgid "No one is subscribed to you."
msgstr "لا أحد مشترك بك."
-#: lib/command.php:701
+#: lib/command.php:692
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "لا أحد مشترك بك."
@@ -4388,11 +4682,11 @@ msgstr[3] "هؤلاء الأشخاص مشتركون بك:"
msgstr[4] ""
msgstr[5] ""
-#: lib/command.php:721
+#: lib/command.php:712
msgid "You are not a member of any groups."
msgstr "لست عضوًا ÙÙ‰ أى مجموعه."
-#: lib/command.php:723
+#: lib/command.php:714
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "لست عضوًا ÙÙ‰ أى مجموعه."
@@ -4402,7 +4696,7 @@ msgstr[3] "أنت عضو ÙÙ‰ هذه المجموعات:"
msgstr[4] ""
msgstr[5] ""
-#: lib/command.php:737
+#: lib/command.php:728
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4443,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 "اذهب إلى المÙثبّت."
@@ -4471,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 "خطأ قاعده بيانات"
@@ -4653,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 "انضم"
@@ -4716,9 +5023,9 @@ msgid ""
msgstr ""
#: lib/mail.php:258
-#, fuzzy, php-format
+#, php-format
msgid "Bio: %s"
-msgstr "السيرة: %s\n"
+msgstr "السيرة: %s"
#: lib/mail.php:286
#, php-format
@@ -4869,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."
@@ -4912,9 +5219,8 @@ msgid "File could not be moved to destination directory."
msgstr ""
#: lib/mediafile.php:201 lib/mediafile.php:237
-#, fuzzy
msgid "Could not determine file's MIME type."
-msgstr "تعذّر حذ٠المÙضله."
+msgstr "لم يمكن تحديد نوع MIME للملÙ."
#: lib/mediafile.php:270
#, php-format
@@ -4956,17 +5262,17 @@ msgid "Attach a file"
msgstr "أرÙÙ‚ ملÙًا"
#: lib/noticeform.php:212
-#, fuzzy
msgid "Share my location"
-msgstr "لم يمكن Ø­Ùظ تÙضيلات الموقع."
+msgstr "شارك موقعى"
-#: lib/noticeform.php:214
-#, fuzzy
+#: lib/noticeform.php:215
msgid "Do not share my location"
-msgstr "لم يمكن Ø­Ùظ تÙضيلات الموقع."
+msgstr "لا تشارك موقعي"
-#: lib/noticeform.php:215
-msgid "Hide this info"
+#: lib/noticeform.php:216
+msgid ""
+"Sorry, retrieving your geo location is taking longer than expected, please "
+"try again later"
msgstr ""
#: lib/noticelist.php:428
@@ -5084,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"
@@ -5227,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 "تعذّر حذ٠الاشتراك."
@@ -5317,47 +5622,47 @@ msgstr "رسالة"
msgid "Moderate"
msgstr ""
-#: lib/util.php:884
+#: lib/util.php:875
msgid "a few seconds ago"
msgstr "قبل لحظات قليلة"
-#: lib/util.php:886
+#: lib/util.php:877
msgid "about a minute ago"
msgstr "قبل دقيقه تقريبًا"
-#: lib/util.php:888
+#: lib/util.php:879
#, php-format
msgid "about %d minutes ago"
msgstr ""
-#: lib/util.php:890
+#: lib/util.php:881
msgid "about an hour ago"
msgstr "قبل ساعه تقريبًا"
-#: lib/util.php:892
+#: lib/util.php:883
#, php-format
msgid "about %d hours ago"
msgstr ""
-#: lib/util.php:894
+#: lib/util.php:885
msgid "about a day ago"
msgstr "قبل يوم تقريبا"
-#: lib/util.php:896
+#: lib/util.php:887
#, php-format
msgid "about %d days ago"
msgstr ""
-#: lib/util.php:898
+#: lib/util.php:889
msgid "about a month ago"
msgstr "قبل شهر تقريبًا"
-#: lib/util.php:900
+#: lib/util.php:891
#, php-format
msgid "about %d months ago"
msgstr ""
-#: lib/util.php:902
+#: lib/util.php:893
msgid "about a year ago"
msgstr "قبل سنه تقريبًا"
diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po
index db950916b..5bca81663 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-11 23:25+0000\n"
-"PO-Revision-Date: 2010-01-11 23:26:12+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 (r60950); 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,8 +34,8 @@ 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
@@ -44,15 +44,20 @@ msgstr "ÐÑма такака Ñтраница."
#: 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!"
@@ -126,7 +131,7 @@ msgstr "Бележки от %1$s и приÑтели в %2$s."
#: 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/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
@@ -145,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."
@@ -174,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 ""
@@ -325,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."
@@ -337,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 Ñимвола)."
@@ -385,7 +393,7 @@ msgstr "Вече членувате в тази група."
msgid "You have been blocked from that group by the admin."
msgstr ""
-#: actions/apigroupjoin.php:138 actions/joingroup.php:128
+#: actions/apigroupjoin.php:138 actions/joingroup.php:124
#, fuzzy, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "Грешка при проÑледÑване — потребителÑÑ‚ не е намерен."
@@ -394,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 "Грешка при проÑледÑване — потребителÑÑ‚ не е намерен."
@@ -414,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."
@@ -443,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 ""
@@ -599,29 +702,6 @@ msgstr "Качване"
msgid "Crop"
msgstr "ИзрÑзване"
-#: 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/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,7 +766,7 @@ msgstr "Грешка при запиÑване данните за блокирÐ
#: actions/grouplogo.php:99 actions/groupmembers.php:83
#: actions/grouprss.php:98 actions/groupunblock.php:86
#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86
-#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263
+#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:260
msgid "No such group."
msgstr "ÐÑма такава група"
@@ -757,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
@@ -944,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 "Запазване"
@@ -965,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"
@@ -1036,7 +1198,8 @@ 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 "Отказ"
@@ -1665,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)"
@@ -1710,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 "Прати"
@@ -1780,7 +1943,7 @@ msgstr ""
msgid "You must be logged in to join a group."
msgstr "За да Ñе приÑъедините към група, Ñ‚Ñ€Ñбва да Ñте влезли."
-#: actions/joingroup.php:135
+#: actions/joingroup.php:131
#, fuzzy, php-format
msgid "%1$s joined group %2$s"
msgstr "%s Ñе приÑъедини към групата %s"
@@ -1789,16 +1952,11 @@ 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
+#: actions/leavegroup.php:127
#, fuzzy, php-format
msgid "%1$s left group %2$s"
msgstr "%s напуÑна групата %s"
@@ -1825,17 +1983,6 @@ msgstr "Вход"
msgid "Login to site"
msgstr ""
-#: actions/login.php:230 actions/profilesettings.php:106
-#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94
-#: lib/groupeditform.php:152 lib/userprofile.php:131
-msgid "Nickname"
-msgstr "ПÑевдоним"
-
-#: actions/login.php:233 actions/register.php:429
-#: lib/accountsettingsaction.php:116
-msgid "Password"
-msgstr "Парола"
-
#: actions/login.php:236 actions/register.php:478
msgid "Remember me"
msgstr "Запомни ме"
@@ -1888,6 +2035,29 @@ msgstr "За да редактирате групата, Ñ‚Ñ€Ñбва да ÑÑ‚Ð
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 "Ðова група"
@@ -1900,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 "ÐÑма Ñъдържание!"
@@ -1913,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 ""
@@ -1996,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 "Бележката нÑма профил"
@@ -2013,8 +2228,8 @@ msgstr "вид Ñъдържание "
msgid "Only "
msgstr "Само "
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033
-#: lib/api.php:1061 lib/api.php:1171
+#: 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 "Ðеподдържан формат на данните"
@@ -2027,7 +2242,8 @@ msgid "Notice Search"
msgstr "ТърÑене на бележки"
#: actions/othersettings.php:60
-msgid "Other Settings"
+#, fuzzy
+msgid "Other settings"
msgstr "Други наÑтройки"
#: actions/othersettings.php:71
@@ -2349,7 +2565,7 @@ msgid "Full name"
msgstr "Пълно име"
#: actions/profilesettings.php:115 actions/register.php:453
-#: lib/groupeditform.php:161
+#: lib/applicationeditform.php:230 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Лична Ñтраница"
@@ -2937,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 "Грешка при изтеглÑне на любимите бележки"
@@ -3042,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 "Създадена на"
@@ -3934,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"
@@ -3949,10 +4235,6 @@ msgstr "СеÑии"
msgid "Author(s)"
msgstr "Ðвтор"
-#: actions/version.php:198 lib/groupeditform.php:172
-msgid "Description"
-msgstr "ОпиÑание"
-
#: classes/File.php:144
#, php-format
msgid ""
@@ -3970,6 +4252,21 @@ msgstr ""
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"
@@ -3988,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 "
@@ -4018,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!"
@@ -4101,10 +4398,6 @@ 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 "ПромÑна на поща, аватар, парола, профил"
@@ -4262,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 "Ðе можете да променÑте този Ñайт."
@@ -4302,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 ""
@@ -4322,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 "Паролата е запиÑана."
@@ -4358,7 +4713,7 @@ msgid "It does not make a lot of sense to nudge yourself!"
msgstr ""
#: lib/command.php:99
-#, fuzzy, php-format
+#, php-format
msgid "Nudge sent to %s"
msgstr "Изпратено е побутване на %s"
@@ -4373,14 +4728,13 @@ 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"
msgstr "Ðе е открита бележка Ñ Ñ‚Ð°ÐºÑŠÐ² идентификатор."
-#: lib/command.php:168 lib/command.php:415 lib/command.php:476
-#: lib/command.php:532
-#, fuzzy
+#: lib/command.php:168 lib/command.php:406 lib/command.php:467
+#: lib/command.php:523
msgid "User has no last notice"
msgstr "ПотребителÑÑ‚ нÑма поÑледна бележка"
@@ -4389,179 +4743,174 @@ msgid "Notice marked as fave."
msgstr "Бележката е отбелÑзана като любима."
#: lib/command.php:217
-#, fuzzy
msgid "You are already a member of that group"
msgstr "Вече членувате в тази група."
-#: lib/command.php:234
+#: lib/command.php:231
#, fuzzy, php-format
msgid "Could not join user %s to group %s"
msgstr "Грешка при проÑледÑване — потребителÑÑ‚ не е намерен."
-#: lib/command.php:239
-#, fuzzy, php-format
+#: lib/command.php:236
+#, php-format
msgid "%s joined group %s"
msgstr "%s Ñе приÑъедини към групата %s"
-#: lib/command.php:284
+#: lib/command.php:275
#, fuzzy, php-format
msgid "Could not remove user %s to group %s"
msgstr "Грешка при проÑледÑване — потребителÑÑ‚ не е намерен."
-#: lib/command.php:289
-#, fuzzy, php-format
+#: lib/command.php:280
+#, php-format
msgid "%s left group %s"
msgstr "%s напуÑна групата %s"
-#: lib/command.php:318
-#, fuzzy, php-format
+#: lib/command.php:309
+#, php-format
msgid "Fullname: %s"
msgstr "Пълно име: %s"
-#: lib/command.php:321 lib/mail.php:254
+#: lib/command.php:312 lib/mail.php:254
#, php-format
msgid "Location: %s"
msgstr "МеÑтоположение: %s"
-#: lib/command.php:324 lib/mail.php:256
+#: 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 %d characters, you sent %d"
msgstr ""
"Съобщението е твърде дълго. Ðай-много може да е 140 знака, а Ñте въвели %d."
-#: lib/command.php:376
-#, fuzzy, php-format
+#: 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:422
-#, fuzzy
+#: lib/command.php:413
msgid "Cannot repeat your own notice"
-msgstr "Ðе можете да повтарÑте ÑобÑтвени бележки."
+msgstr "Ðе можете да повтарÑте ÑобÑтвена бележка"
-#: lib/command.php:427
-#, fuzzy
+#: lib/command.php:418
msgid "Already repeated that notice"
msgstr "Вече Ñте повторили тази бележка."
-#: lib/command.php:435
-#, fuzzy, php-format
+#: 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 %d characters, you sent %d"
msgstr ""
"Съобщението е твърде дълго. Ðай-много може да е 140 знака, а Ñте въвели %d."
-#: lib/command.php:500
-#, fuzzy, php-format
+#: 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
+#: 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
+#: 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
+#: lib/command.php:641
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:661
+#: lib/command.php:652
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:677
+#: lib/command.php:668
msgid "You are not subscribed to anyone."
msgstr "Ðе Ñте абонирани за никого."
-#: lib/command.php:679
+#: 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:699
+#: lib/command.php:690
msgid "No one is subscribed to you."
msgstr "Ðикой не е абониран за ваÑ."
-#: lib/command.php:701
+#: 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:721
+#: lib/command.php:712
msgid "You are not a member of any groups."
msgstr "Ðе членувате в нито една група."
-#: lib/command.php:723
+#: 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:737
+#: lib/command.php:728
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4602,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 "Влизане в Ñайта"
@@ -4631,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 "Грешка в базата от данни"
@@ -4818,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 "ПриÑъединÑване"
@@ -5137,13 +5500,15 @@ msgstr "ПрикрепÑне на файл"
msgid "Share my location"
msgstr "Грешка при запазване етикетите."
-#: lib/noticeform.php:214
+#: lib/noticeform.php:215
#, fuzzy
msgid "Do not share my location"
msgstr "Грешка при запазване етикетите."
-#: lib/noticeform.php:215
-msgid "Hide this info"
+#: lib/noticeform.php:216
+msgid ""
+"Sorry, retrieving your geo location is taking longer than expected, please "
+"try again later"
msgstr ""
#: lib/noticelist.php:428
@@ -5412,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 "Грешка при изтриване на абонамента."
@@ -5506,47 +5871,47 @@ msgstr "Съобщение"
msgid "Moderate"
msgstr ""
-#: lib/util.php:884
+#: lib/util.php:875
msgid "a few seconds ago"
msgstr "преди нÑколко Ñекунди"
-#: lib/util.php:886
+#: lib/util.php:877
msgid "about a minute ago"
msgstr "преди около минута"
-#: lib/util.php:888
+#: lib/util.php:879
#, php-format
msgid "about %d minutes ago"
msgstr "преди около %d минути"
-#: lib/util.php:890
+#: lib/util.php:881
msgid "about an hour ago"
msgstr "преди около чаÑ"
-#: lib/util.php:892
+#: lib/util.php:883
#, php-format
msgid "about %d hours ago"
msgstr "преди около %d чаÑа"
-#: lib/util.php:894
+#: lib/util.php:885
msgid "about a day ago"
msgstr "преди около ден"
-#: lib/util.php:896
+#: lib/util.php:887
#, php-format
msgid "about %d days ago"
msgstr "преди около %d дни"
-#: lib/util.php:898
+#: lib/util.php:889
msgid "about a month ago"
msgstr "преди около меÑец"
-#: lib/util.php:900
+#: lib/util.php:891
#, php-format
msgid "about %d months ago"
msgstr "преди около %d меÑеца"
-#: lib/util.php:902
+#: lib/util.php:893
msgid "about a year ago"
msgstr "преди около година"
diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po
index eb6a6a3af..ce09f82d3 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-11 23:25+0000\n"
-"PO-Revision-Date: 2010-01-11 23:26:17+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 (r60950); 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,8 +34,8 @@ 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
@@ -44,15 +44,20 @@ msgstr "No existeix la pàgina."
#: 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!"
@@ -128,7 +133,7 @@ msgstr "Actualitzacions de %1$s i amics a %2$s!"
#: 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/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
@@ -148,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."
@@ -179,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 ""
@@ -333,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."
@@ -345,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)."
@@ -391,9 +399,9 @@ 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 actions/joingroup.php:128
+#: 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."
@@ -402,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."
@@ -422,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."
@@ -453,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 ""
@@ -525,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
@@ -535,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."
@@ -608,31 +714,6 @@ msgstr "Puja"
msgid "Crop"
msgstr "Retalla"
-#: 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/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 ""
@@ -699,7 +780,7 @@ msgstr "Error al guardar la informació del block."
#: actions/grouplogo.php:99 actions/groupmembers.php:83
#: actions/grouprss.php:98 actions/groupunblock.php:86
#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86
-#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263
+#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:260
msgid "No such group."
msgstr "No s'ha trobat el grup."
@@ -719,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"
@@ -770,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
@@ -957,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"
@@ -978,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"
@@ -1048,7 +1210,8 @@ 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"
@@ -1377,7 +1540,7 @@ 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 actions/userbyid.php:70
#, fuzzy
@@ -1544,9 +1707,8 @@ msgid "Error removing the block."
msgstr "S'ha produït un error en suprimir el bloc."
#: actions/imsettings.php:59
-#, fuzzy
msgid "IM settings"
-msgstr "Configuració de missatgeria instantània"
+msgstr "Paràmetres de missatgeria instantània"
#: actions/imsettings.php:70
#, php-format
@@ -1576,7 +1738,6 @@ msgstr ""
"llista d'amics?)"
#: actions/imsettings.php:124
-#, fuzzy
msgid "IM address"
msgstr "Adreça de missatgeria instantània"
@@ -1680,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)"
@@ -1726,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"
@@ -1796,24 +1957,20 @@ msgstr ""
msgid "You must be logged in to join a group."
msgstr "Has d'haver entrat per participar en un grup."
-#: actions/joingroup.php:135
-#, 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
+#: actions/leavegroup.php:127
#, fuzzy, php-format
msgid "%1$s left group %2$s"
msgstr "%s ha abandonat el grup %s"
@@ -1840,17 +1997,6 @@ msgstr "Inici de sessió"
msgid "Login to site"
msgstr "Accedir al lloc"
-#: actions/login.php:230 actions/profilesettings.php:106
-#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94
-#: lib/groupeditform.php:152 lib/userprofile.php:131
-msgid "Nickname"
-msgstr "Sobrenom"
-
-#: actions/login.php:233 actions/register.php:429
-#: lib/accountsettingsaction.php:116
-msgid "Password"
-msgstr "Contrasenya"
-
#: actions/login.php:236 actions/register.php:478
msgid "Remember me"
msgstr "Recorda'm"
@@ -1906,6 +2052,29 @@ msgstr "No es pot fer %s un administrador del grup %s"
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"
@@ -1918,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!"
@@ -1931,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ò."
@@ -1971,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
@@ -2015,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"
@@ -2032,8 +2246,8 @@ msgstr "tipus de contingut "
msgid "Only "
msgstr "Només "
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033
-#: lib/api.php:1061 lib/api.php:1171
+#: 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."
@@ -2046,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
@@ -2373,7 +2588,7 @@ msgid "Full name"
msgstr "Nom complet"
#: actions/profilesettings.php:115 actions/register.php:453
-#: lib/groupeditform.php:161
+#: lib/applicationeditform.php:230 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Pàgina personal"
@@ -2469,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."
@@ -2488,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."
@@ -2521,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!"
@@ -2979,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."
@@ -3084,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"
@@ -3278,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"
@@ -3318,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"
@@ -3339,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"
@@ -3358,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"
@@ -3366,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"
@@ -3390,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"
@@ -3415,9 +3707,8 @@ 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
#, fuzzy
@@ -3570,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
@@ -3578,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
@@ -3585,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."
@@ -3701,9 +3994,8 @@ 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."
@@ -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"
@@ -3959,7 +4251,7 @@ msgstr "S'ha suprimit l'estat."
#: actions/version.php:161
msgid "Contributors"
-msgstr ""
+msgstr "Col·laboració"
#: actions/version.php:168
msgid ""
@@ -3986,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
@@ -4003,10 +4290,6 @@ msgstr "Sessions"
msgid "Author(s)"
msgstr "Autoria"
-#: actions/version.php:198 lib/groupeditform.php:172
-msgid "Description"
-msgstr "Descripció"
-
#: classes/File.php:144
#, php-format
msgid ""
@@ -4024,15 +4307,29 @@ msgstr ""
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
+#: classes/Group_member.php:41
+#, fuzzy
+msgid "Group join failed."
+msgstr "Perfil del grup"
+
+#: 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
-#, fuzzy
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!"
@@ -4154,10 +4451,6 @@ 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"
@@ -4312,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."
@@ -4352,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"
@@ -4372,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."
@@ -4419,14 +4774,13 @@ 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"
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
+#: 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"
@@ -4435,181 +4789,178 @@ msgid "Notice marked as fave."
msgstr "Nota marcada com a favorita."
#: lib/command.php:217
-#, fuzzy
msgid "You are already a member of that group"
msgstr "Ja sou membre del grup."
-#: lib/command.php:234
-#, fuzzy, php-format
+#: 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:239
-#, fuzzy, php-format
+#: lib/command.php:236
+#, php-format
msgid "%s joined group %s"
msgstr "%s s'ha pogut afegir al grup %s"
-#: lib/command.php:284
-#, fuzzy, php-format
+#: 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:289
-#, fuzzy, php-format
+#: lib/command.php:280
+#, php-format
msgid "%s left group %s"
msgstr "%s ha abandonat el grup %s"
-#: lib/command.php:318
-#, fuzzy, php-format
+#: lib/command.php:309
+#, php-format
msgid "Fullname: %s"
msgstr "Nom complet: %s"
-#: lib/command.php:321 lib/mail.php:254
+#: lib/command.php:312 lib/mail.php:254
#, php-format
msgid "Location: %s"
msgstr "Localització: %s"
-#: lib/command.php:324 lib/mail.php:256
+#: 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 %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
+#: 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:422
+#: lib/command.php:413
#, fuzzy
msgid "Cannot repeat your own notice"
msgstr "No es poden posar en on les notificacions."
-#: lib/command.php:427
+#: lib/command.php:418
#, fuzzy
msgid "Already repeated that notice"
msgstr "Eliminar aquesta nota"
-#: lib/command.php:435
+#: lib/command.php:426
#, fuzzy, php-format
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 %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
+#: 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
+#: 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
+#: 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
+#: lib/command.php:641
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:661
+#: lib/command.php:652
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:677
+#: lib/command.php:668
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "No estàs subscrit a aquest perfil."
-#: lib/command.php:679
+#: 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:699
+#: 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:701
+#: 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:721
+#: lib/command.php:712
msgid "You are not a member of any groups."
msgstr "No sou membre de cap grup."
-#: lib/command.php:723
+#: 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:737
+#: lib/command.php:728
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4650,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."
@@ -4678,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"
@@ -4864,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ó"
@@ -5187,13 +5552,15 @@ msgstr "Adjunta un fitxer"
msgid "Share my location"
msgstr "Comparteix la vostra ubicació"
-#: lib/noticeform.php:214
+#: lib/noticeform.php:215
#, fuzzy
msgid "Do not share my location"
msgstr "Comparteix la vostra ubicació"
-#: lib/noticeform.php:215
-msgid "Hide this info"
+#: lib/noticeform.php:216
+msgid ""
+"Sorry, retrieving your geo location is taking longer than expected, please "
+"try again later"
msgstr ""
#: lib/noticelist.php:428
@@ -5461,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ó."
@@ -5554,47 +5921,47 @@ msgstr "Missatge"
msgid "Moderate"
msgstr "Modera"
-#: lib/util.php:884
+#: lib/util.php:875
msgid "a few seconds ago"
msgstr "fa pocs segons"
-#: lib/util.php:886
+#: lib/util.php:877
msgid "about a minute ago"
msgstr "fa un minut"
-#: lib/util.php:888
+#: lib/util.php:879
#, php-format
msgid "about %d minutes ago"
msgstr "fa %d minuts"
-#: lib/util.php:890
+#: lib/util.php:881
msgid "about an hour ago"
msgstr "fa una hora"
-#: lib/util.php:892
+#: lib/util.php:883
#, php-format
msgid "about %d hours ago"
msgstr "fa %d hores"
-#: lib/util.php:894
+#: lib/util.php:885
msgid "about a day ago"
msgstr "fa un dia"
-#: lib/util.php:896
+#: lib/util.php:887
#, php-format
msgid "about %d days ago"
msgstr "fa %d dies"
-#: lib/util.php:898
+#: lib/util.php:889
msgid "about a month ago"
msgstr "fa un mes"
-#: lib/util.php:900
+#: lib/util.php:891
#, php-format
msgid "about %d months ago"
msgstr "fa %d mesos"
-#: lib/util.php:902
+#: lib/util.php:893
msgid "about a year ago"
msgstr "fa un any"
diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po
index 53b0f3b4c..53fd42feb 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-11 23:25+0000\n"
-"PO-Revision-Date: 2010-01-11 23:26:21+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 (r60950); 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,8 +35,8 @@ 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
@@ -45,15 +45,20 @@ msgstr "Žádné takové oznámení."
#: 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!"
@@ -128,7 +133,7 @@ msgstr ""
#: 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/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
@@ -148,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 ""
@@ -179,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 ""
@@ -327,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."
@@ -339,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ů)"
@@ -389,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 actions/joingroup.php:128
+#: 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"
@@ -399,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"
@@ -419,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 ""
@@ -451,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 ""
@@ -609,29 +713,6 @@ msgstr "Upload"
msgid "Crop"
msgstr ""
-#: 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/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 ""
@@ -699,7 +780,7 @@ msgstr ""
#: actions/grouplogo.php:99 actions/groupmembers.php:83
#: actions/grouprss.php:98 actions/groupunblock.php:86
#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86
-#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263
+#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:260
#, fuzzy
msgid "No such group."
msgstr "Žádné takové oznámení."
@@ -771,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
@@ -963,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"
@@ -984,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"
@@ -1053,7 +1213,8 @@ 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"
@@ -1688,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 ""
@@ -1729,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"
@@ -1773,7 +1934,7 @@ msgstr ""
msgid "You must be logged in to join a group."
msgstr ""
-#: actions/joingroup.php:135
+#: actions/joingroup.php:131
#, php-format
msgid "%1$s joined group %2$s"
msgstr ""
@@ -1782,16 +1943,12 @@ 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
+#: actions/leavegroup.php:127
#, fuzzy, php-format
msgid "%1$s left group %2$s"
msgstr "%1 statusů na %2"
@@ -1818,17 +1975,6 @@ msgstr "Přihlásit"
msgid "Login to site"
msgstr ""
-#: actions/login.php:230 actions/profilesettings.php:106
-#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94
-#: lib/groupeditform.php:152 lib/userprofile.php:131
-msgid "Nickname"
-msgstr "Přezdívka"
-
-#: actions/login.php:233 actions/register.php:429
-#: lib/accountsettingsaction.php:116
-msgid "Password"
-msgstr "Heslo"
-
#: actions/login.php:236 actions/register.php:478
msgid "Remember me"
msgstr "Zapamatuj si mÄ›"
@@ -1880,6 +2026,27 @@ msgstr "Uživatel nemá profil."
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"
@@ -1892,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!"
@@ -1905,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 ""
@@ -1987,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"
@@ -2005,8 +2215,8 @@ msgstr "Připojit"
msgid "Only "
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033
-#: lib/api.php:1061 lib/api.php:1171
+#: 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 ""
@@ -2020,7 +2230,7 @@ msgstr ""
#: actions/othersettings.php:60
#, fuzzy
-msgid "Other Settings"
+msgid "Other settings"
msgstr "Nastavení"
#: actions/othersettings.php:71
@@ -2354,7 +2564,7 @@ msgid "Full name"
msgstr "Celé jméno"
#: actions/profilesettings.php:115 actions/register.php:453
-#: lib/groupeditform.php:161
+#: lib/applicationeditform.php:230 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Moje stránky"
@@ -2933,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 ""
@@ -3040,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"
@@ -3943,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"
@@ -3957,11 +4236,6 @@ msgstr "Osobní"
msgid "Author(s)"
msgstr ""
-#: actions/version.php:198 lib/groupeditform.php:172
-#, fuzzy
-msgid "Description"
-msgstr "Odběry"
-
#: classes/File.php:144
#, php-format
msgid ""
@@ -3979,6 +4253,21 @@ msgstr ""
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"
@@ -3996,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 ""
@@ -4107,11 +4396,6 @@ 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 ""
@@ -4274,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 ""
@@ -4313,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 ""
@@ -4333,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"
@@ -4360,7 +4706,7 @@ msgid "Sorry, this command is not yet implemented."
msgstr ""
#: lib/command.php:88
-#, fuzzy, php-format
+#, php-format
msgid "Could not find a user with nickname %s"
msgstr "Nelze aktualizovat uživatele"
@@ -4381,13 +4727,13 @@ 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"
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"
msgstr "Uživatel nemá profil."
@@ -4401,179 +4747,179 @@ msgstr ""
msgid "You are already a member of that group"
msgstr "Již jste přihlášen"
-#: lib/command.php:234
+#: lib/command.php:231
#, fuzzy, php-format
msgid "Could not join user %s to group %s"
msgstr "Nelze přesměrovat na server: %s"
-#: lib/command.php:239
+#: lib/command.php:236
#, fuzzy, php-format
msgid "%s joined group %s"
msgstr "%1 statusů na %2"
-#: lib/command.php:284
+#: 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:289
+#: lib/command.php:280
#, fuzzy, php-format
msgid "%s left group %s"
msgstr "%1 statusů na %2"
-#: lib/command.php:318
+#: lib/command.php:309
#, fuzzy, php-format
msgid "Fullname: %s"
msgstr "Celé jméno"
-#: lib/command.php:321 lib/mail.php:254
+#: lib/command.php:312 lib/mail.php:254
#, php-format
msgid "Location: %s"
msgstr ""
-#: lib/command.php:324 lib/mail.php:256
+#: 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 %d characters, you sent %d"
msgstr ""
-#: lib/command.php:376
+#: lib/command.php:367
#, php-format
msgid "Direct message to %s sent"
msgstr ""
-#: lib/command.php:378
+#: lib/command.php:369
msgid "Error sending direct message."
msgstr ""
-#: lib/command.php:422
+#: lib/command.php:413
#, fuzzy
msgid "Cannot repeat your own notice"
msgstr "Nemůžete se registrovat, pokud nesouhlasíte s licencí."
-#: lib/command.php:427
+#: lib/command.php:418
#, fuzzy
msgid "Already repeated that notice"
msgstr "Odstranit toto oznámení"
-#: lib/command.php:435
+#: lib/command.php:426
#, fuzzy, php-format
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 %d characters, you sent %d"
msgstr ""
-#: lib/command.php:500
+#: lib/command.php:491
#, fuzzy, php-format
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
+#: 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
+#: 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
+#: lib/command.php:641
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:661
+#: lib/command.php:652
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:677
+#: lib/command.php:668
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Neodeslal jste nám profil"
-#: lib/command.php:679
+#: 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:699
+#: lib/command.php:690
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Vzdálený odběr"
-#: lib/command.php:701
+#: 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:721
+#: lib/command.php:712
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Neodeslal jste nám profil"
-#: lib/command.php:723
+#: 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:737
+#: lib/command.php:728
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4614,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 ""
@@ -4643,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 ""
@@ -4833,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"
@@ -5152,13 +5512,15 @@ msgstr ""
msgid "Share my location"
msgstr "Nelze uložit profil"
-#: lib/noticeform.php:214
+#: lib/noticeform.php:215
#, fuzzy
msgid "Do not share my location"
msgstr "Nelze uložit profil"
-#: lib/noticeform.php:215
-msgid "Hide this info"
+#: lib/noticeform.php:216
+msgid ""
+"Sorry, retrieving your geo location is taking longer than expected, please "
+"try again later"
msgstr ""
#: lib/noticelist.php:428
@@ -5433,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í"
@@ -5528,47 +5890,47 @@ msgstr "Zpráva"
msgid "Moderate"
msgstr ""
-#: lib/util.php:884
+#: lib/util.php:875
msgid "a few seconds ago"
msgstr "před pár sekundami"
-#: lib/util.php:886
+#: lib/util.php:877
msgid "about a minute ago"
msgstr "asi před minutou"
-#: lib/util.php:888
+#: lib/util.php:879
#, php-format
msgid "about %d minutes ago"
msgstr "asi před %d minutami"
-#: lib/util.php:890
+#: lib/util.php:881
msgid "about an hour ago"
msgstr "asi před hodinou"
-#: lib/util.php:892
+#: lib/util.php:883
#, php-format
msgid "about %d hours ago"
msgstr "asi před %d hodinami"
-#: lib/util.php:894
+#: lib/util.php:885
msgid "about a day ago"
msgstr "asi přede dnem"
-#: lib/util.php:896
+#: lib/util.php:887
#, php-format
msgid "about %d days ago"
msgstr "před %d dny"
-#: lib/util.php:898
+#: lib/util.php:889
msgid "about a month ago"
msgstr "asi před měsícem"
-#: lib/util.php:900
+#: lib/util.php:891
#, php-format
msgid "about %d months ago"
msgstr "asi před %d mesíci"
-#: lib/util.php:902
+#: lib/util.php:893
msgid "about a year ago"
msgstr "asi před rokem"
diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po
index 152836338..3a06b9870 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-11 23:25+0000\n"
-"PO-Revision-Date: 2010-01-11 23:26:26+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 (r60950); 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,8 +37,8 @@ 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
@@ -47,15 +47,20 @@ msgstr "Seite nicht vorhanden"
#: 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!"
@@ -139,7 +144,7 @@ msgstr "Aktualisierungen von %1$s und Freunden auf %2$s!"
#: 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/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
@@ -158,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."
@@ -187,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 ""
@@ -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)."
@@ -394,7 +402,7 @@ msgstr "Du bist bereits Mitglied dieser Gruppe"
msgid "You have been blocked from that group by the admin."
msgstr "Der Admin dieser Gruppe hat dich gesperrt."
-#: actions/apigroupjoin.php:138 actions/joingroup.php:128
+#: 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."
@@ -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 ""
@@ -610,29 +713,6 @@ msgstr "Hochladen"
msgid "Crop"
msgstr "Zuschneiden"
-#: 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/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 ""
@@ -698,7 +778,7 @@ msgstr "Konnte Blockierungsdaten nicht speichern."
#: actions/grouplogo.php:99 actions/groupmembers.php:83
#: actions/grouprss.php:98 actions/groupunblock.php:86
#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86
-#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263
+#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:260
msgid "No such group."
msgstr "Keine derartige Gruppe."
@@ -767,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
@@ -953,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"
@@ -974,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"
@@ -1044,7 +1207,8 @@ 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"
@@ -1673,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)"
@@ -1723,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"
@@ -1792,7 +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:135
+#: actions/joingroup.php:131
#, fuzzy, php-format
msgid "%1$s joined group %2$s"
msgstr "%s ist der Gruppe %s beigetreten"
@@ -1801,15 +1965,11 @@ 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
+#: actions/leavegroup.php:127
#, fuzzy, php-format
msgid "%1$s left group %2$s"
msgstr "%s hat die Gruppe %s verlassen"
@@ -1836,17 +1996,6 @@ msgstr "Anmelden"
msgid "Login to site"
msgstr "An Seite anmelden"
-#: actions/login.php:230 actions/profilesettings.php:106
-#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94
-#: lib/groupeditform.php:152 lib/userprofile.php:131
-msgid "Nickname"
-msgstr "Nutzername"
-
-#: actions/login.php:233 actions/register.php:429
-#: lib/accountsettingsaction.php:116
-msgid "Password"
-msgstr "Passwort"
-
#: actions/login.php:236 actions/register.php:478
msgid "Remember me"
msgstr "Anmeldedaten merken"
@@ -1899,6 +2048,29 @@ msgstr "Konnte %s nicht zum Administrator der Gruppe %s machen"
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"
@@ -1911,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!"
@@ -1924,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 ""
@@ -2009,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"
@@ -2026,8 +2243,8 @@ msgstr "Content-Typ "
msgid "Only "
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033
-#: lib/api.php:1061 lib/api.php:1171
+#: 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."
@@ -2040,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
@@ -2367,7 +2585,7 @@ msgid "Full name"
msgstr "Vollständiger Name"
#: actions/profilesettings.php:115 actions/register.php:453
-#: lib/groupeditform.php:161
+#: lib/applicationeditform.php:230 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Homepage"
@@ -2975,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."
@@ -3080,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"
@@ -4005,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"
@@ -4020,10 +4308,6 @@ msgstr "Eigene"
msgid "Author(s)"
msgstr "Autor"
-#: actions/version.php:198 lib/groupeditform.php:172
-msgid "Description"
-msgstr "Beschreibung"
-
#: classes/File.php:144
#, php-format
msgid ""
@@ -4041,6 +4325,21 @@ msgstr ""
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"
@@ -4059,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 "
@@ -4088,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!"
@@ -4171,10 +4470,6 @@ 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"
@@ -4332,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."
@@ -4373,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"
@@ -4393,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"
@@ -4420,7 +4777,7 @@ msgid "Sorry, this command is not yet implemented."
msgstr "Leider ist dieser Befehl noch nicht implementiert."
#: lib/command.php:88
-#, fuzzy, php-format
+#, php-format
msgid "Could not find a user with nickname %s"
msgstr "Die bestätigte E-Mail-Adresse konnte nicht gespeichert werden."
@@ -4441,14 +4798,12 @@ msgid ""
"Notices: %3$s"
msgstr ""
-#: lib/command.php:152 lib/command.php:399 lib/command.php:460
-#, fuzzy
+#: 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
+#: 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"
@@ -4457,179 +4812,174 @@ msgid "Notice marked as fave."
msgstr "Nachricht als Favorit markiert."
#: lib/command.php:217
-#, fuzzy
msgid "You are already a member of that group"
msgstr "Du bist bereits Mitglied dieser Gruppe"
-#: lib/command.php:234
-#, fuzzy, php-format
+#: 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."
+msgstr "Konnte Benutzer %s nicht der Gruppe %s hinzufügen"
-#: lib/command.php:239
-#, fuzzy, php-format
+#: lib/command.php:236
+#, php-format
msgid "%s joined group %s"
msgstr "%s ist der Gruppe %s beigetreten"
-#: lib/command.php:284
-#, fuzzy, php-format
+#: 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:289
-#, fuzzy, php-format
+#: lib/command.php:280
+#, php-format
msgid "%s left group %s"
msgstr "%s hat die Gruppe %s verlassen"
-#: lib/command.php:318
-#, fuzzy, php-format
+#: lib/command.php:309
+#, php-format
msgid "Fullname: %s"
msgstr "Vollständiger Name: %s"
-#: lib/command.php:321 lib/mail.php:254
+#: lib/command.php:312 lib/mail.php:254
#, php-format
msgid "Location: %s"
msgstr "Standort: %s"
-#: lib/command.php:324 lib/mail.php:256
+#: 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
+#: 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
+#: 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:422
-#, fuzzy
+#: lib/command.php:413
msgid "Cannot repeat your own notice"
msgstr "Du kannst deine eigenen Nachrichten nicht wiederholen."
-#: lib/command.php:427
-#, fuzzy
+#: lib/command.php:418
msgid "Already repeated that notice"
msgstr "Nachricht bereits wiederholt"
-#: lib/command.php:435
+#: lib/command.php:426
#, fuzzy, php-format
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 %d characters, you sent %d"
msgstr "Nachricht zu lange - maximal 140 Zeichen erlaubt, du hast %s gesendet"
-#: lib/command.php:500
-#, fuzzy, php-format
+#: 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
+#: 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
+#: 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
+#: lib/command.php:641
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:661
+#: lib/command.php:652
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:677
+#: lib/command.php:668
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Du hast dieses Profil nicht abonniert."
-#: lib/command.php:679
+#: 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:699
+#: lib/command.php:690
msgid "No one is subscribed to you."
msgstr "Niemand hat Dich abonniert."
-#: lib/command.php:701
+#: 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:721
+#: lib/command.php:712
msgid "You are not a member of any groups."
msgstr "Du bist in keiner Gruppe Mitglied."
-#: lib/command.php:723
+#: 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:737
+#: lib/command.php:728
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4670,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"
@@ -4699,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."
@@ -4890,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"
@@ -5265,13 +5629,15 @@ msgstr ""
msgid "Share my location"
msgstr "Konnte Tags nicht speichern."
-#: lib/noticeform.php:214
+#: lib/noticeform.php:215
#, fuzzy
msgid "Do not share my location"
msgstr "Konnte Tags nicht speichern."
-#: lib/noticeform.php:215
-msgid "Hide this info"
+#: lib/noticeform.php:216
+msgid ""
+"Sorry, retrieving your geo location is taking longer than expected, please "
+"try again later"
msgstr ""
#: lib/noticelist.php:428
@@ -5545,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."
@@ -5639,47 +6005,47 @@ msgstr "Nachricht"
msgid "Moderate"
msgstr ""
-#: lib/util.php:884
+#: lib/util.php:875
msgid "a few seconds ago"
msgstr "vor wenigen Sekunden"
-#: lib/util.php:886
+#: lib/util.php:877
msgid "about a minute ago"
msgstr "vor einer Minute"
-#: lib/util.php:888
+#: lib/util.php:879
#, php-format
msgid "about %d minutes ago"
msgstr "vor %d Minuten"
-#: lib/util.php:890
+#: lib/util.php:881
msgid "about an hour ago"
msgstr "vor einer Stunde"
-#: lib/util.php:892
+#: lib/util.php:883
#, php-format
msgid "about %d hours ago"
msgstr "vor %d Stunden"
-#: lib/util.php:894
+#: lib/util.php:885
msgid "about a day ago"
msgstr "vor einem Tag"
-#: lib/util.php:896
+#: lib/util.php:887
#, php-format
msgid "about %d days ago"
msgstr "vor %d Tagen"
-#: lib/util.php:898
+#: lib/util.php:889
msgid "about a month ago"
msgstr "vor einem Monat"
-#: lib/util.php:900
+#: lib/util.php:891
#, php-format
msgid "about %d months ago"
msgstr "vor %d Monaten"
-#: lib/util.php:902
+#: lib/util.php:893
msgid "about a year ago"
msgstr "vor einem Jahr"
diff --git a/locale/el/LC_MESSAGES/statusnet.po b/locale/el/LC_MESSAGES/statusnet.po
index ea2ad34fa..6d333e39a 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-11 23:25+0000\n"
-"PO-Revision-Date: 2010-01-11 23:26:31+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 (r60950); 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,8 +34,8 @@ 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
@@ -44,15 +44,20 @@ msgstr "Δεν υπάÏχει τέτοιο σελίδα."
#: 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!"
@@ -126,7 +131,7 @@ msgstr ""
#: 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/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
@@ -146,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 ""
@@ -177,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 ""
@@ -324,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."
@@ -336,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 χαÏακτ.)."
@@ -384,7 +392,7 @@ msgstr ""
msgid "You have been blocked from that group by the admin."
msgstr ""
-#: actions/apigroupjoin.php:138 actions/joingroup.php:128
+#: actions/apigroupjoin.php:138 actions/joingroup.php:124
#, fuzzy, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "ΑδÏνατη η αποθήκευση των νέων πληÏοφοÏιών του Ï€Ïοφίλ"
@@ -393,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 "ΑδÏνατη η αποθήκευση του Ï€Ïοφίλ."
@@ -413,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 ""
@@ -444,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 ""
@@ -598,29 +699,6 @@ msgstr ""
msgid "Crop"
msgstr ""
-#: 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/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 ""
@@ -688,7 +766,7 @@ msgstr ""
#: actions/grouplogo.php:99 actions/groupmembers.php:83
#: actions/grouprss.php:98 actions/groupunblock.php:86
#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86
-#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263
+#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:260
#, fuzzy
msgid "No such group."
msgstr "ΑδÏνατη η αποθήκευση του Ï€Ïοφίλ."
@@ -758,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
@@ -946,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 ""
@@ -967,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"
@@ -1039,7 +1196,8 @@ 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 "ΑκÏÏωση"
@@ -1655,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 ""
@@ -1696,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 ""
@@ -1740,7 +1898,7 @@ msgstr ""
msgid "You must be logged in to join a group."
msgstr ""
-#: actions/joingroup.php:135
+#: actions/joingroup.php:131
#, php-format
msgid "%1$s joined group %2$s"
msgstr ""
@@ -1749,15 +1907,11 @@ 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
+#: actions/leavegroup.php:127
#, php-format
msgid "%1$s left group %2$s"
msgstr ""
@@ -1783,17 +1937,6 @@ msgstr "ΣÏνδεση"
msgid "Login to site"
msgstr ""
-#: actions/login.php:230 actions/profilesettings.php:106
-#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94
-#: lib/groupeditform.php:152 lib/userprofile.php:131
-msgid "Nickname"
-msgstr "Ψευδώνυμο"
-
-#: actions/login.php:233 actions/register.php:429
-#: lib/accountsettingsaction.php:116
-msgid "Password"
-msgstr "Κωδικός"
-
#: actions/login.php:236 actions/register.php:478
msgid "Remember me"
msgstr ""
@@ -1847,6 +1990,27 @@ msgstr "ΑδÏνατη η αποθήκευση του Ï€Ïοφίλ."
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 ""
@@ -1859,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 ""
@@ -1872,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 ""
@@ -1951,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 ""
@@ -1969,8 +2176,8 @@ msgstr "ΣÏνδεση"
msgid "Only "
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033
-#: lib/api.php:1061 lib/api.php:1171
+#: 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 ""
@@ -1984,7 +2191,7 @@ msgstr ""
#: actions/othersettings.php:60
#, fuzzy
-msgid "Other Settings"
+msgid "Other settings"
msgstr "Ρυθμίσεις OpenID"
#: actions/othersettings.php:71
@@ -2308,7 +2515,7 @@ msgid "Full name"
msgstr "Ονοματεπώνυμο"
#: actions/profilesettings.php:115 actions/register.php:453
-#: lib/groupeditform.php:161
+#: lib/applicationeditform.php:230 lib/groupeditform.php:161
msgid "Homepage"
msgstr "ΑÏχική σελίδα"
@@ -2897,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 ""
@@ -3003,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 "ΔημιουÏγημένος"
@@ -3878,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"
@@ -3892,10 +4166,6 @@ msgstr "ΠÏοσωπικά"
msgid "Author(s)"
msgstr ""
-#: actions/version.php:198 lib/groupeditform.php:172
-msgid "Description"
-msgstr "ΠεÏιγÏαφή"
-
#: classes/File.php:144
#, php-format
msgid ""
@@ -3913,6 +4183,21 @@ msgstr ""
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"
@@ -3930,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 ""
@@ -4036,10 +4321,6 @@ 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 ""
@@ -4192,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 ""
@@ -4231,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 ""
@@ -4251,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 "Ο κωδικός αποθηκεÏτηκε."
@@ -4299,12 +4638,12 @@ 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
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
msgid "User has no last notice"
msgstr ""
@@ -4317,173 +4656,173 @@ msgstr ""
msgid "You are already a member of that group"
msgstr "Ομάδες με τα πεÏισσότεÏα μέλη"
-#: lib/command.php:234
+#: lib/command.php:231
#, fuzzy, php-format
msgid "Could not join user %s to group %s"
msgstr "ΑδÏνατη η αποθήκευση των νέων πληÏοφοÏιών του Ï€Ïοφίλ"
-#: lib/command.php:239
+#: lib/command.php:236
#, fuzzy, php-format
msgid "%s joined group %s"
msgstr "ομάδες των χÏηστών %s"
-#: lib/command.php:284
+#: lib/command.php:275
#, fuzzy, php-format
msgid "Could not remove user %s to group %s"
msgstr "ΑδÏνατη η αποθήκευση του Ï€Ïοφίλ."
-#: lib/command.php:289
+#: lib/command.php:280
#, fuzzy, php-format
msgid "%s left group %s"
msgstr "ομάδες των χÏηστών %s"
-#: lib/command.php:318
+#: lib/command.php:309
#, fuzzy, php-format
msgid "Fullname: %s"
msgstr "Ονοματεπώνυμο"
-#: lib/command.php:321 lib/mail.php:254
+#: lib/command.php:312 lib/mail.php:254
#, php-format
msgid "Location: %s"
msgstr ""
-#: lib/command.php:324 lib/mail.php:256
+#: 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 %d characters, you sent %d"
msgstr ""
-#: lib/command.php:376
+#: lib/command.php:367
#, php-format
msgid "Direct message to %s sent"
msgstr ""
-#: lib/command.php:378
+#: lib/command.php:369
msgid "Error sending direct message."
msgstr ""
-#: lib/command.php:422
+#: lib/command.php:413
#, fuzzy
msgid "Cannot repeat your own notice"
msgstr "Αδυναμία διαγÏαφής Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… μηνÏματος."
-#: lib/command.php:427
+#: lib/command.php:418
#, fuzzy
msgid "Already repeated that notice"
msgstr "Αδυναμία διαγÏαφής Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… μηνÏματος."
-#: lib/command.php:435
+#: lib/command.php:426
#, fuzzy, php-format
msgid "Notice from %s repeated"
msgstr "Ρυθμίσεις OpenID"
-#: 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 %d characters, you sent %d"
msgstr ""
-#: lib/command.php:500
+#: lib/command.php:491
#, 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
+#: 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
+#: 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
+#: lib/command.php:641
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:661
+#: lib/command.php:652
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:677
+#: lib/command.php:668
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Δεν επιτÏέπεται να κάνεις συνδÏομητές του λογαÏÎ¹Î±ÏƒÎ¼Î¿Ï ÏƒÎ¿Ï… άλλους."
-#: lib/command.php:679
+#: 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:699
+#: lib/command.php:690
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Δεν επιτÏέπεται να κάνεις συνδÏομητές του λογαÏÎ¹Î±ÏƒÎ¼Î¿Ï ÏƒÎ¿Ï… άλλους."
-#: lib/command.php:701
+#: 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:721
+#: lib/command.php:712
msgid "You are not a member of any groups."
msgstr "Δεν είστε μέλος καμίας ομάδας."
-#: lib/command.php:723
+#: 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:737
+#: lib/command.php:728
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4524,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 ""
@@ -4553,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 ""
@@ -4737,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 "Συμμετοχή"
@@ -5046,13 +5399,15 @@ msgstr ""
msgid "Share my location"
msgstr "ΑδÏνατη η αποθήκευση του Ï€Ïοφίλ."
-#: lib/noticeform.php:214
+#: lib/noticeform.php:215
#, fuzzy
msgid "Do not share my location"
msgstr "ΑδÏνατη η αποθήκευση του Ï€Ïοφίλ."
-#: lib/noticeform.php:215
-msgid "Hide this info"
+#: lib/noticeform.php:216
+msgid ""
+"Sorry, retrieving your geo location is taking longer than expected, please "
+"try again later"
msgstr ""
#: lib/noticelist.php:428
@@ -5318,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 "Απέτυχε η διαγÏαφή συνδÏομής."
@@ -5412,47 +5767,47 @@ msgstr "Μήνυμα"
msgid "Moderate"
msgstr ""
-#: lib/util.php:884
+#: lib/util.php:875
msgid "a few seconds ago"
msgstr ""
-#: lib/util.php:886
+#: lib/util.php:877
msgid "about a minute ago"
msgstr ""
-#: lib/util.php:888
+#: lib/util.php:879
#, php-format
msgid "about %d minutes ago"
msgstr ""
-#: lib/util.php:890
+#: lib/util.php:881
msgid "about an hour ago"
msgstr ""
-#: lib/util.php:892
+#: lib/util.php:883
#, php-format
msgid "about %d hours ago"
msgstr ""
-#: lib/util.php:894
+#: lib/util.php:885
msgid "about a day ago"
msgstr ""
-#: lib/util.php:896
+#: lib/util.php:887
#, php-format
msgid "about %d days ago"
msgstr ""
-#: lib/util.php:898
+#: lib/util.php:889
msgid "about a month ago"
msgstr ""
-#: lib/util.php:900
+#: lib/util.php:891
#, php-format
msgid "about %d months ago"
msgstr ""
-#: lib/util.php:902
+#: lib/util.php:893
msgid "about a year ago"
msgstr ""
diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po
index 61965f97c..6735bd23c 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-11 23:25+0000\n"
-"PO-Revision-Date: 2010-01-11 23:26:35+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 (r60950); 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,8 +35,8 @@ 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
@@ -45,15 +45,20 @@ msgstr "No such page"
#: 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!"
@@ -134,7 +139,7 @@ msgstr "Updates from %1$s and friends on %2$s!"
#: 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/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
@@ -153,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."
@@ -186,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 ""
@@ -332,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."
@@ -344,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)"
@@ -392,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 actions/joingroup.php:128
+#: 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."
@@ -401,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."
@@ -421,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."
@@ -450,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."
@@ -604,29 +708,6 @@ msgstr "Upload"
msgid "Crop"
msgstr "Crop"
-#: 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/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"
@@ -694,7 +775,7 @@ msgstr "Failed to save block information."
#: actions/grouplogo.php:99 actions/groupmembers.php:83
#: actions/grouprss.php:98 actions/groupunblock.php:86
#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86
-#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263
+#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:260
msgid "No such group."
msgstr "No such group."
@@ -763,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
@@ -953,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"
@@ -974,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"
@@ -1044,7 +1207,8 @@ 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"
@@ -1683,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)"
@@ -1728,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"
@@ -1798,7 +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:135
+#: actions/joingroup.php:131
#, fuzzy, php-format
msgid "%1$s joined group %2$s"
msgstr "%s joined group %s"
@@ -1807,15 +1971,11 @@ 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
+#: actions/leavegroup.php:127
#, fuzzy, php-format
msgid "%1$s left group %2$s"
msgstr "%s left group %s"
@@ -1842,17 +2002,6 @@ msgstr "Login"
msgid "Login to site"
msgstr "Login to site"
-#: actions/login.php:230 actions/profilesettings.php:106
-#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94
-#: lib/groupeditform.php:152 lib/userprofile.php:131
-msgid "Nickname"
-msgstr "Nickname"
-
-#: actions/login.php:233 actions/register.php:429
-#: lib/accountsettingsaction.php:116
-msgid "Password"
-msgstr "Password"
-
#: actions/login.php:236 actions/register.php:478
msgid "Remember me"
msgstr "Remember me"
@@ -1905,6 +2054,29 @@ msgstr "You must be an admin to edit the group"
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"
@@ -1917,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!"
@@ -1930,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 ""
@@ -2013,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"
@@ -2031,8 +2248,8 @@ msgstr "Connect"
msgid "Only "
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033
-#: lib/api.php:1061 lib/api.php:1171
+#: 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."
@@ -2045,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
@@ -2372,7 +2590,7 @@ msgid "Full name"
msgstr "Full name"
#: actions/profilesettings.php:115 actions/register.php:453
-#: lib/groupeditform.php:161
+#: lib/applicationeditform.php:230 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Homepage"
@@ -2976,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."
@@ -3081,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"
@@ -3990,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"
@@ -4004,10 +4291,6 @@ msgstr "Personal"
msgid "Author(s)"
msgstr ""
-#: actions/version.php:198 lib/groupeditform.php:172
-msgid "Description"
-msgstr "Description"
-
#: classes/File.php:144
#, php-format
msgid ""
@@ -4025,6 +4308,21 @@ msgstr ""
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"
@@ -4043,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 "
@@ -4071,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!"
@@ -4152,10 +4450,6 @@ 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"
@@ -4311,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."
@@ -4354,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 ""
@@ -4375,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"
@@ -4402,7 +4758,7 @@ msgid "Sorry, this command is not yet implemented."
msgstr "Sorry, this command is not yet implemented."
#: lib/command.php:88
-#, fuzzy, php-format
+#, php-format
msgid "Could not find a user with nickname %s"
msgstr "Could not find a user with nickname %s"
@@ -4411,7 +4767,7 @@ msgid "It does not make a lot of sense to nudge yourself!"
msgstr ""
#: lib/command.php:99
-#, fuzzy, php-format
+#, php-format
msgid "Nudge sent to %s"
msgstr "Nudge sent to %s"
@@ -4423,14 +4779,13 @@ 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"
msgstr "No profile with that id."
-#: lib/command.php:168 lib/command.php:415 lib/command.php:476
-#: lib/command.php:532
-#, fuzzy
+#: 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"
@@ -4439,181 +4794,176 @@ msgid "Notice marked as fave."
msgstr "Notice marked as fave."
#: lib/command.php:217
-#, fuzzy
msgid "You are already a member of that group"
msgstr "You are already a member of that group."
-#: lib/command.php:234
-#, fuzzy, php-format
+#: 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:239
-#, fuzzy, php-format
+#: lib/command.php:236
+#, php-format
msgid "%s joined group %s"
msgstr "%s joined group %s"
-#: lib/command.php:284
-#, fuzzy, php-format
+#: 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:289
-#, fuzzy, php-format
+#: lib/command.php:280
+#, php-format
msgid "%s left group %s"
msgstr "%s left group %s"
-#: lib/command.php:318
-#, fuzzy, php-format
+#: lib/command.php:309
+#, php-format
msgid "Fullname: %s"
msgstr "Fullname: %s"
-#: lib/command.php:321 lib/mail.php:254
+#: lib/command.php:312 lib/mail.php:254
#, php-format
msgid "Location: %s"
msgstr "Location: %s"
-#: lib/command.php:324 lib/mail.php:256
+#: 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
+#: 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
+#: 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:422
-#, fuzzy
+#: lib/command.php:413
msgid "Cannot repeat your own notice"
msgstr "Cannot repeat your own notice."
-#: lib/command.php:427
-#, fuzzy
+#: lib/command.php:418
msgid "Already repeated that notice"
msgstr "Already repeated that notice."
-#: lib/command.php:435
+#: lib/command.php:426
#, fuzzy, php-format
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
+#: 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
+#: 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
+#: 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
+#: 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
+#: lib/command.php:641
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:661
+#: lib/command.php:652
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:677
+#: lib/command.php:668
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "You are not subscribed to that profile."
-#: lib/command.php:679
+#: 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:699
+#: lib/command.php:690
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Could not subscribe other to you."
-#: lib/command.php:701
+#: 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:721
+#: 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:723
+#: 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:737
+#: lib/command.php:728
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4654,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."
@@ -4682,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 ""
@@ -4867,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"
@@ -5195,13 +5559,15 @@ msgstr ""
msgid "Share my location"
msgstr "Couldn't save tags."
-#: lib/noticeform.php:214
+#: lib/noticeform.php:215
#, fuzzy
msgid "Do not share my location"
msgstr "Couldn't save tags."
-#: lib/noticeform.php:215
-msgid "Hide this info"
+#: lib/noticeform.php:216
+msgid ""
+"Sorry, retrieving your geo location is taking longer than expected, please "
+"try again later"
msgstr ""
#: lib/noticelist.php:428
@@ -5469,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."
@@ -5561,47 +5927,47 @@ msgstr "Message"
msgid "Moderate"
msgstr ""
-#: lib/util.php:884
+#: lib/util.php:875
msgid "a few seconds ago"
msgstr "a few seconds ago"
-#: lib/util.php:886
+#: lib/util.php:877
msgid "about a minute ago"
msgstr "about a minute ago"
-#: lib/util.php:888
+#: lib/util.php:879
#, php-format
msgid "about %d minutes ago"
msgstr "about %d minutes ago"
-#: lib/util.php:890
+#: lib/util.php:881
msgid "about an hour ago"
msgstr "about an hour ago"
-#: lib/util.php:892
+#: lib/util.php:883
#, php-format
msgid "about %d hours ago"
msgstr "about %d hours ago"
-#: lib/util.php:894
+#: lib/util.php:885
msgid "about a day ago"
msgstr "about a day ago"
-#: lib/util.php:896
+#: lib/util.php:887
#, php-format
msgid "about %d days ago"
msgstr "about %d days ago"
-#: lib/util.php:898
+#: lib/util.php:889
msgid "about a month ago"
msgstr "about a month ago"
-#: lib/util.php:900
+#: lib/util.php:891
#, php-format
msgid "about %d months ago"
msgstr "about %d months ago"
-#: lib/util.php:902
+#: lib/util.php:893
msgid "about a year ago"
msgstr "about a year ago"
diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po
index acc7f4a30..c035fc281 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-11 23:25+0000\n"
-"PO-Revision-Date: 2010-01-11 23:26:39+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 (r60950); 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,8 +37,8 @@ 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
@@ -46,34 +47,39 @@ msgstr "No existe tal página"
#: 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!"
@@ -128,7 +134,7 @@ msgstr "¡Actualizaciones de %1$s y amigos en %2$s!"
#: 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/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
@@ -148,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."
@@ -179,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 ""
@@ -262,18 +269,16 @@ msgid "No status found with that ID."
msgstr "No se encontró estado para ese ID"
#: actions/apifavoritecreate.php:119
-#, fuzzy
msgid "This status is already a favorite."
-msgstr "¡Este status ya está en favoritos!"
+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
-#, fuzzy
msgid "That status is not a favorite."
-msgstr "¡Este status no es un favorito!"
+msgstr "Este status no es un favorito."
#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
msgid "Could not delete favorite."
@@ -293,9 +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
-#, fuzzy
msgid "You cannot unfollow yourself."
-msgstr "¡No puedes dejar de seguirte a ti mismo!"
+msgstr "No puedes dejar de seguirte a ti mismo."
#: actions/apifriendshipsexists.php:94
msgid "Two user ids or screen_names must be supplied."
@@ -329,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."
@@ -341,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)."
@@ -390,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 actions/joingroup.php:128
+#: 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"
@@ -399,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"
@@ -419,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"
@@ -450,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 ""
@@ -606,30 +708,6 @@ msgstr "Cargar"
msgid "Crop"
msgstr "Cortar"
-#: 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/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"
@@ -697,7 +775,7 @@ msgstr "No se guardó información de bloqueo."
#: actions/grouplogo.php:99 actions/groupmembers.php:83
#: actions/grouprss.php:98 actions/groupunblock.php:86
#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86
-#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263
+#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:260
msgid "No such group."
msgstr "No existe ese grupo."
@@ -767,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
@@ -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 "Guardar"
@@ -981,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"
@@ -1052,7 +1212,8 @@ 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"
@@ -1690,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)"
@@ -1735,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"
@@ -1805,7 +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:135
+#: actions/joingroup.php:131
#, fuzzy, php-format
msgid "%1$s joined group %2$s"
msgstr "%s se unió a grupo %s"
@@ -1814,17 +1975,12 @@ 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
+#: actions/leavegroup.php:127
#, fuzzy, php-format
msgid "%1$s left group %2$s"
msgstr "%s dejó grupo %s"
@@ -1851,17 +2007,6 @@ msgstr "Inicio de sesión"
msgid "Login to site"
msgstr "Ingresar a sitio"
-#: actions/login.php:230 actions/profilesettings.php:106
-#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94
-#: lib/groupeditform.php:152 lib/userprofile.php:131
-msgid "Nickname"
-msgstr "Apodo"
-
-#: actions/login.php:233 actions/register.php:429
-#: lib/accountsettingsaction.php:116
-msgid "Password"
-msgstr "Contraseña"
-
#: actions/login.php:236 actions/register.php:478
msgid "Remember me"
msgstr "Recordarme"
@@ -1917,6 +2062,29 @@ msgstr "Debes ser un admin para editar el grupo"
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 "
@@ -1929,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!"
@@ -1942,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."
@@ -2028,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"
@@ -2046,8 +2259,8 @@ msgstr "Conectarse"
msgid "Only "
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033
-#: lib/api.php:1061 lib/api.php:1171
+#: 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"
@@ -2061,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
@@ -2400,7 +2613,7 @@ msgid "Full name"
msgstr "Nombre completo"
#: actions/profilesettings.php:115 actions/register.php:453
-#: lib/groupeditform.php:161
+#: lib/applicationeditform.php:230 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Página de inicio"
@@ -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."
@@ -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"
@@ -4041,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"
@@ -4055,10 +4337,6 @@ msgstr "Sesiones"
msgid "Author(s)"
msgstr ""
-#: actions/version.php:198 lib/groupeditform.php:172
-msgid "Description"
-msgstr "Descripción"
-
#: classes/File.php:144
#, php-format
msgid ""
@@ -4076,6 +4354,21 @@ msgstr ""
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"
@@ -4094,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 "
@@ -4125,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!"
@@ -4207,10 +4500,6 @@ 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"
@@ -4365,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."
@@ -4409,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 ""
@@ -4429,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 "
@@ -4466,7 +4817,7 @@ msgid "It does not make a lot of sense to nudge yourself!"
msgstr ""
#: lib/command.php:99
-#, fuzzy, php-format
+#, php-format
msgid "Nudge sent to %s"
msgstr "zumbido enviado a %s"
@@ -4478,14 +4829,13 @@ 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"
msgstr "Ningún perfil con ese ID."
-#: lib/command.php:168 lib/command.php:415 lib/command.php:476
-#: lib/command.php:532
-#, fuzzy
+#: 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"
@@ -4498,175 +4848,173 @@ msgstr "Aviso marcado como favorito."
msgid "You are already a member of that group"
msgstr "Ya eres miembro de ese grupo"
-#: lib/command.php:234
+#: lib/command.php:231
#, fuzzy, php-format
msgid "Could not join user %s to group %s"
msgstr "No se puede unir usuario %s a grupo %s"
-#: lib/command.php:239
-#, fuzzy, php-format
+#: lib/command.php:236
+#, php-format
msgid "%s joined group %s"
msgstr "%s se unió a grupo %s"
-#: lib/command.php:284
+#: 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:289
-#, fuzzy, php-format
+#: lib/command.php:280
+#, php-format
msgid "%s left group %s"
msgstr "%s dejó grupo %s"
-#: lib/command.php:318
-#, fuzzy, php-format
+#: lib/command.php:309
+#, php-format
msgid "Fullname: %s"
msgstr "Nombre completo: %s"
-#: lib/command.php:321 lib/mail.php:254
+#: lib/command.php:312 lib/mail.php:254
#, php-format
msgid "Location: %s"
msgstr "Lugar: %s"
-#: lib/command.php:324 lib/mail.php:256
+#: 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 %d characters, you sent %d"
msgstr "Mensaje muy largo - máximo 140 caracteres, enviaste %d"
-#: lib/command.php:376
-#, fuzzy, php-format
+#: 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:422
+#: lib/command.php:413
#, fuzzy
msgid "Cannot repeat your own notice"
msgstr "No se puede activar notificación."
-#: lib/command.php:427
+#: lib/command.php:418
#, fuzzy
msgid "Already repeated that notice"
msgstr "Borrar este aviso"
-#: lib/command.php:435
+#: lib/command.php:426
#, fuzzy, php-format
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 %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"
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
+#: 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
+#: 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
+#: lib/command.php:641
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:661
+#: lib/command.php:652
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:677
+#: lib/command.php:668
msgid "You are not subscribed to anyone."
msgstr "No estás suscrito a nadie."
-#: lib/command.php:679
+#: 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:699
+#: lib/command.php:690
msgid "No one is subscribed to you."
msgstr "Nadie está suscrito a ti."
-#: lib/command.php:701
+#: 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:721
+#: lib/command.php:712
msgid "You are not a member of any groups."
msgstr "No eres miembro de ningún grupo"
-#: lib/command.php:723
+#: 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:737
+#: lib/command.php:728
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4707,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."
@@ -4735,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 ""
@@ -4922,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"
@@ -5247,13 +5609,15 @@ msgstr ""
msgid "Share my location"
msgstr "No se pudo guardar tags."
-#: lib/noticeform.php:214
+#: lib/noticeform.php:215
#, fuzzy
msgid "Do not share my location"
msgstr "No se pudo guardar tags."
-#: lib/noticeform.php:215
-msgid "Hide this info"
+#: 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 +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."
@@ -5619,47 +5983,47 @@ msgstr "Mensaje"
msgid "Moderate"
msgstr "Moderar"
-#: lib/util.php:884
+#: lib/util.php:875
msgid "a few seconds ago"
msgstr "hace unos segundos"
-#: lib/util.php:886
+#: lib/util.php:877
msgid "about a minute ago"
msgstr "hace un minuto"
-#: lib/util.php:888
+#: lib/util.php:879
#, php-format
msgid "about %d minutes ago"
msgstr "hace %d minutos"
-#: lib/util.php:890
+#: lib/util.php:881
msgid "about an hour ago"
msgstr "hace una hora"
-#: lib/util.php:892
+#: lib/util.php:883
#, php-format
msgid "about %d hours ago"
msgstr "hace %d horas"
-#: lib/util.php:894
+#: lib/util.php:885
msgid "about a day ago"
msgstr "hace un día"
-#: lib/util.php:896
+#: lib/util.php:887
#, php-format
msgid "about %d days ago"
msgstr "hace %d días"
-#: lib/util.php:898
+#: lib/util.php:889
msgid "about a month ago"
msgstr "hace un mes"
-#: lib/util.php:900
+#: lib/util.php:891
#, php-format
msgid "about %d months ago"
msgstr "hace %d meses"
-#: lib/util.php:902
+#: lib/util.php:893
msgid "about a year ago"
msgstr "hace un año"
diff --git a/locale/fa/LC_MESSAGES/statusnet.po b/locale/fa/LC_MESSAGES/statusnet.po
index 4cd62b0f6..c5999c1e2 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-11 23:25+0000\n"
-"PO-Revision-Date: 2010-01-11 23:26:49+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 (r60950); 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,8 +37,8 @@ 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
@@ -47,15 +47,20 @@ msgstr "چنین صÙحه‌ای وجود ندارد"
#: 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!"
@@ -135,7 +140,7 @@ msgstr "به روز رسانی از %1$ و دوستان در %2$"
#: 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/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
@@ -154,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 "برای استÙاده از این روش باید اطلاعات را به صورت پست بÙرستید"
@@ -183,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 ""
@@ -328,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."
@@ -340,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 حرÙ)."
@@ -388,7 +396,7 @@ msgstr "شما از پیش یک عضو این گروه هستید."
msgid "You have been blocked from that group by the admin."
msgstr "دسترسی شما به گروه توسط مدیر آن محدود شده است."
-#: actions/apigroupjoin.php:138 actions/joingroup.php:128
+#: 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 نا موÙÙ‚ بود."
@@ -397,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 نا موÙÙ‚ بود"
@@ -417,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 است."
@@ -446,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 حر٠است که شامل ضمیمه نیز می‌باشد"
@@ -601,29 +703,6 @@ msgstr "پایین‌گذاری"
msgid "Crop"
msgstr "برش"
-#: 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/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 "یک مربع از عکس خود را انتخاب کنید تا چهره‌ی شما باشد."
@@ -692,7 +771,7 @@ msgstr ""
#: actions/grouplogo.php:99 actions/groupmembers.php:83
#: actions/grouprss.php:98 actions/groupunblock.php:86
#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86
-#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263
+#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:260
msgid "No such group."
msgstr "چنین گروهی وجود ندارد."
@@ -761,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
@@ -949,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 "ذخیره‌کردن"
@@ -970,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"
@@ -1038,7 +1197,8 @@ 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 "انصراÙ"
@@ -1661,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 ""
@@ -1705,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 "Ùرستادن"
@@ -1749,7 +1909,7 @@ msgstr ""
msgid "You must be logged in to join a group."
msgstr "برای پیوستن به یک گروه، باید وارد شده باشید."
-#: actions/joingroup.php:135
+#: actions/joingroup.php:131
#, fuzzy, php-format
msgid "%1$s joined group %2$s"
msgstr "ملحق شدن به گروه"
@@ -1758,15 +1918,11 @@ 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
+#: actions/leavegroup.php:127
#, fuzzy, php-format
msgid "%1$s left group %2$s"
msgstr "%s گروه %s را ترک کرد."
@@ -1792,17 +1948,6 @@ msgstr "ورود"
msgid "Login to site"
msgstr "ورود به وب‌گاه"
-#: actions/login.php:230 actions/profilesettings.php:106
-#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94
-#: lib/groupeditform.php:152 lib/userprofile.php:131
-msgid "Nickname"
-msgstr "نام کاربری"
-
-#: actions/login.php:233 actions/register.php:429
-#: lib/accountsettingsaction.php:116
-msgid "Password"
-msgstr "گذرواژه"
-
#: actions/login.php:236 actions/register.php:478
msgid "Remember me"
msgstr "مرا به یاد بسپار"
@@ -1855,6 +2000,29 @@ msgstr "نمی‌توان %s را مدیر گروه %s کرد."
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 "گروه جدید"
@@ -1867,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 "بدون محتوا!"
@@ -1880,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 "یک پیام را به خودتان Ù†Ùرستید؛ در عوض آن را آهسته برای خود بگویید."
@@ -1967,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 "ابن خبر ذخیره ای ندارد ."
@@ -1984,8 +2197,8 @@ msgstr "نوع محتوا "
msgid "Only "
msgstr " Ùقط"
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033
-#: lib/api.php:1061 lib/api.php:1171
+#: 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 "یک قالب دادهٔ پشتیبانی‌شده نیست."
@@ -1998,7 +2211,8 @@ msgid "Notice Search"
msgstr "جست‌وجوی آگهی‌ها"
#: actions/othersettings.php:60
-msgid "Other Settings"
+#, fuzzy
+msgid "Other settings"
msgstr "تنظیمات دیگر"
#: actions/othersettings.php:71
@@ -2321,7 +2535,7 @@ msgid "Full name"
msgstr "نام‌کامل"
#: actions/profilesettings.php:115 actions/register.php:453
-#: lib/groupeditform.php:161
+#: lib/applicationeditform.php:230 lib/groupeditform.php:161
msgid "Homepage"
msgstr "صÙحهٔ خانگی"
@@ -2885,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 "ناتوان در بازیابی آگهی های محبوب."
@@ -2990,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 "ساخته شد"
@@ -3857,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"
@@ -3872,10 +4156,6 @@ msgstr "شخصی"
msgid "Author(s)"
msgstr "مؤلÙ"
-#: actions/version.php:198 lib/groupeditform.php:172
-msgid "Description"
-msgstr ""
-
#: classes/File.php:144
#, php-format
msgid ""
@@ -3893,6 +4173,19 @@ msgstr ""
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"
@@ -3910,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."
@@ -3938,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!"
@@ -4019,10 +4312,6 @@ 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 "آدرس ایمیل، آواتار، کلمه ÛŒ عبور، پروÙایل خود را تغییر دهید"
@@ -4171,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 "شما نمی توانید در این سایت تغیری ایجاد کنید"
@@ -4208,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 "ضمائم"
@@ -4228,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 "تغییر گذرواژه"
@@ -4255,7 +4603,7 @@ msgid "Sorry, this command is not yet implemented."
msgstr "متاسÙانه این دستور هنوز اجرا نشده."
#: lib/command.php:88
-#, fuzzy, php-format
+#, php-format
msgid "Could not find a user with nickname %s"
msgstr "پیدا نشد %s کاریری یا نام مستعار"
@@ -4279,14 +4627,12 @@ msgstr ""
"مشترک : %2$s\n"
"خبر : %3$s"
-#: lib/command.php:152 lib/command.php:399 lib/command.php:460
-#, fuzzy
+#: 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
+#: lib/command.php:168 lib/command.php:406 lib/command.php:467
+#: lib/command.php:523
msgid "User has no last notice"
msgstr "کاربر آگهی آخر ندارد"
@@ -4295,177 +4641,173 @@ msgid "Notice marked as fave."
msgstr ""
#: lib/command.php:217
-#, fuzzy
msgid "You are already a member of that group"
msgstr "شما از پیش یک عضو این گروه هستید."
-#: lib/command.php:234
-#, fuzzy, php-format
+#: lib/command.php:231
+#, php-format
msgid "Could not join user %s to group %s"
msgstr "عضویت %s در گروه %s نا موÙÙ‚ بود."
-#: lib/command.php:239
-#, fuzzy, php-format
+#: lib/command.php:236
+#, php-format
msgid "%s joined group %s"
msgstr "ملحق شدن به گروه"
-#: lib/command.php:284
+#: lib/command.php:275
#, fuzzy, php-format
msgid "Could not remove user %s to group %s"
msgstr "خارج شدن %s از گروه %s نا موÙÙ‚ بود"
-#: lib/command.php:289
-#, fuzzy, php-format
+#: lib/command.php:280
+#, php-format
msgid "%s left group %s"
msgstr "%s گروه %s را ترک کرد."
-#: lib/command.php:318
-#, fuzzy, php-format
+#: lib/command.php:309
+#, php-format
msgid "Fullname: %s"
msgstr "نام کامل : %s"
-#: lib/command.php:321 lib/mail.php:254
+#: lib/command.php:312 lib/mail.php:254
#, php-format
msgid "Location: %s"
msgstr "موقعیت : %s"
-#: lib/command.php:324 lib/mail.php:256
+#: 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
+#: 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
+#: 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:422
-#, fuzzy
+#: lib/command.php:413
msgid "Cannot repeat your own notice"
-msgstr "نمی توانید خبر خود را تکرار کنید."
+msgstr "نمی توان آگهی خودتان را تکرار کرد"
-#: lib/command.php:427
-#, fuzzy
+#: lib/command.php:418
msgid "Already repeated that notice"
-msgstr "ابن خبر قبلا Ùرستاده شده"
+msgstr "آن آگهی قبلا تکرار شده است."
-#: lib/command.php:435
+#: lib/command.php:426
#, fuzzy, php-format
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 %d characters, you sent %d"
msgstr ""
"پیغام بسیار طولانی است - بیشترین اندازه امکان پذیر %d کاراکتر است , شما %d "
"تا Ùرستادید"
-#: lib/command.php:500
+#: lib/command.php:491
#, fuzzy, 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
+#: 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
+#: 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
+#: lib/command.php:641
msgid "Login command is disabled"
msgstr "Ùرمان ورود از کار اÙتاده است"
-#: lib/command.php:661
+#: lib/command.php:652
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:677
+#: lib/command.php:668
msgid "You are not subscribed to anyone."
msgstr "شما توسط هیچ کس تصویب نشده اید ."
-#: lib/command.php:679
+#: lib/command.php:670
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "هم اکنون شما این کاربران را دنبال می‌کنید: "
-#: lib/command.php:699
+#: lib/command.php:690
msgid "No one is subscribed to you."
msgstr "هیچکس شما را تایید نکرده ."
-#: lib/command.php:701
+#: lib/command.php:692
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "هیچکس شما را تایید نکرده ."
-#: lib/command.php:721
+#: lib/command.php:712
msgid "You are not a member of any groups."
msgstr "شما در هیچ گروهی عضو نیستید ."
-#: lib/command.php:723
+#: 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:737
+#: lib/command.php:728
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4506,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 "برو به نصاب."
@@ -4534,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 "خطای پایگاه داده"
@@ -4717,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 "مشارکت کردن"
@@ -5031,13 +5387,15 @@ msgstr "یک Ùایل ضمیمه کنید"
msgid "Share my location"
msgstr "نمی‌توان تنظیمات مکانی را تنظیم کرد."
-#: lib/noticeform.php:214
+#: lib/noticeform.php:215
#, fuzzy
msgid "Do not share my location"
msgstr "نمی‌توان تنظیمات مکانی را تنظیم کرد."
-#: lib/noticeform.php:215
-msgid "Hide this info"
+#: lib/noticeform.php:216
+msgid ""
+"Sorry, retrieving your geo location is taking longer than expected, please "
+"try again later"
msgstr ""
#: lib/noticelist.php:428
@@ -5298,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 ""
@@ -5388,47 +5746,47 @@ msgstr "پیام"
msgid "Moderate"
msgstr ""
-#: lib/util.php:884
+#: lib/util.php:875
msgid "a few seconds ago"
msgstr "چند ثانیه پیش"
-#: lib/util.php:886
+#: lib/util.php:877
msgid "about a minute ago"
msgstr "حدود یک دقیقه پیش"
-#: lib/util.php:888
+#: lib/util.php:879
#, php-format
msgid "about %d minutes ago"
msgstr "حدود %d دقیقه پیش"
-#: lib/util.php:890
+#: lib/util.php:881
msgid "about an hour ago"
msgstr "حدود یک ساعت پیش"
-#: lib/util.php:892
+#: lib/util.php:883
#, php-format
msgid "about %d hours ago"
msgstr "حدود %d ساعت پیش"
-#: lib/util.php:894
+#: lib/util.php:885
msgid "about a day ago"
msgstr "حدود یک روز پیش"
-#: lib/util.php:896
+#: lib/util.php:887
#, php-format
msgid "about %d days ago"
msgstr "حدود %d روز پیش"
-#: lib/util.php:898
+#: lib/util.php:889
msgid "about a month ago"
msgstr "حدود یک ماه پیش"
-#: lib/util.php:900
+#: lib/util.php:891
#, php-format
msgid "about %d months ago"
msgstr "حدود %d ماه پیش"
-#: lib/util.php:902
+#: lib/util.php:893
msgid "about a year ago"
msgstr "حدود یک سال پیش"
diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po
index 5bbcb949f..d22532009 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-11 23:25+0000\n"
-"PO-Revision-Date: 2010-01-11 23:26:45+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 (r60950); 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,8 +35,8 @@ 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
@@ -45,15 +45,20 @@ msgstr "Sivua ei ole."
#: 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!"
@@ -133,7 +138,7 @@ msgstr "Käyttäjän %1$s ja kavereiden päivitykset palvelussa %2$s!"
#: 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/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
@@ -153,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."
@@ -184,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 ""
@@ -336,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."
@@ -348,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ä)."
@@ -396,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 actions/joingroup.php:128
+#: 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."
@@ -405,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"
@@ -425,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."
@@ -456,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."
@@ -611,31 +717,6 @@ msgstr "Lataa"
msgid "Crop"
msgstr "Rajaa"
-#: 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/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"
@@ -701,7 +782,7 @@ msgstr "Käyttäjän estotiedon tallennus epäonnistui."
#: actions/grouplogo.php:99 actions/groupmembers.php:83
#: actions/grouprss.php:98 actions/groupunblock.php:86
#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86
-#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263
+#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:260
msgid "No such group."
msgstr "Tuota ryhmää ei ole."
@@ -771,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
@@ -964,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"
@@ -985,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"
@@ -1056,7 +1220,8 @@ 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"
@@ -1686,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)"
@@ -1733,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ä"
@@ -1802,7 +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:135
+#: actions/joingroup.php:131
#, fuzzy, php-format
msgid "%1$s joined group %2$s"
msgstr "%s liittyi ryhmään %s"
@@ -1811,15 +1976,11 @@ 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
+#: actions/leavegroup.php:127
#, fuzzy, php-format
msgid "%1$s left group %2$s"
msgstr "%s erosi ryhmästä %s"
@@ -1846,17 +2007,6 @@ msgstr "Kirjaudu sisään"
msgid "Login to site"
msgstr "Kirjaudu sisään"
-#: actions/login.php:230 actions/profilesettings.php:106
-#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94
-#: lib/groupeditform.php:152 lib/userprofile.php:131
-msgid "Nickname"
-msgstr "Tunnus"
-
-#: actions/login.php:233 actions/register.php:429
-#: lib/accountsettingsaction.php:116
-msgid "Password"
-msgstr "Salasana"
-
#: actions/login.php:236 actions/register.php:478
msgid "Remember me"
msgstr "Muista minut"
@@ -1912,6 +2062,29 @@ msgstr "Ei voitu tehdä käyttäjästä %s ylläpitäjää ryhmään %s"
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ä"
@@ -1924,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öä!"
@@ -1937,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."
@@ -2022,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"
@@ -2040,8 +2259,8 @@ msgstr "Yhdistä"
msgid "Only "
msgstr "Vain "
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033
-#: lib/api.php:1061 lib/api.php:1171
+#: 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."
@@ -2054,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
@@ -2391,7 +2611,7 @@ msgid "Full name"
msgstr "Koko nimi"
#: actions/profilesettings.php:115 actions/register.php:453
-#: lib/groupeditform.php:161
+#: lib/applicationeditform.php:230 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Kotisivu"
@@ -3002,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ä."
@@ -3107,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"
@@ -4025,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"
@@ -4039,10 +4328,6 @@ msgstr "Omat"
msgid "Author(s)"
msgstr ""
-#: actions/version.php:198 lib/groupeditform.php:172
-msgid "Description"
-msgstr "Kuvaus"
-
#: classes/File.php:144
#, php-format
msgid ""
@@ -4060,6 +4345,21 @@ msgstr ""
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"
@@ -4078,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."
@@ -4107,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"
@@ -4189,10 +4489,6 @@ 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"
@@ -4350,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."
@@ -4394,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 ""
@@ -4415,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"
@@ -4463,14 +4821,13 @@ 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"
msgstr "Ei profiilia tuolla id:llä."
-#: lib/command.php:168 lib/command.php:415 lib/command.php:476
-#: lib/command.php:532
-#, fuzzy
+#: 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ä"
@@ -4479,182 +4836,179 @@ msgid "Notice marked as fave."
msgstr "Päivitys on merkitty suosikiksi."
#: lib/command.php:217
-#, fuzzy
msgid "You are already a member of that group"
msgstr "Sinä kuulut jo tähän ryhmään."
-#: lib/command.php:234
-#, fuzzy, php-format
+#: 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:239
-#, fuzzy, php-format
+#: lib/command.php:236
+#, php-format
msgid "%s joined group %s"
msgstr "%s liittyi ryhmään %s"
-#: lib/command.php:284
-#, fuzzy, php-format
+#: 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:289
-#, fuzzy, php-format
+#: lib/command.php:280
+#, php-format
msgid "%s left group %s"
msgstr "%s erosi ryhmästä %s"
-#: lib/command.php:318
-#, fuzzy, php-format
+#: lib/command.php:309
+#, php-format
msgid "Fullname: %s"
msgstr "Koko nimi: %s"
-#: lib/command.php:321 lib/mail.php:254
+#: lib/command.php:312 lib/mail.php:254
#, php-format
msgid "Location: %s"
msgstr "Kotipaikka: %s"
-#: lib/command.php:324 lib/mail.php:256
+#: 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 %d characters, you sent %d"
msgstr "Viesti oli liian pitkä - maksimikoko on 140 merkkiä, lähetit %d"
-#: lib/command.php:376
-#, fuzzy, php-format
+#: 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:422
+#: lib/command.php:413
#, fuzzy
msgid "Cannot repeat your own notice"
msgstr "Ilmoituksia ei voi pistää päälle."
-#: lib/command.php:427
+#: lib/command.php:418
#, fuzzy
msgid "Already repeated that notice"
msgstr "Poista tämä päivitys"
-#: lib/command.php:435
+#: lib/command.php:426
#, fuzzy, php-format
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 %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"
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
+#: 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
+#: 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
+#: lib/command.php:641
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:661
+#: lib/command.php:652
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:677
+#: 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:679
+#: 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:699
+#: lib/command.php:690
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Toista ei voitu asettaa tilaamaan sinua."
-#: lib/command.php:701
+#: 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:721
+#: 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:723
+#: 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:737
+#: lib/command.php:728
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4695,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"
@@ -4725,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"
@@ -4914,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"
@@ -5242,13 +5610,15 @@ msgstr ""
msgid "Share my location"
msgstr "Tageja ei voitu tallentaa."
-#: lib/noticeform.php:214
+#: lib/noticeform.php:215
#, fuzzy
msgid "Do not share my location"
msgstr "Tageja ei voitu tallentaa."
-#: lib/noticeform.php:215
-msgid "Hide this info"
+#: 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 +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."
@@ -5621,47 +5991,47 @@ msgstr "Viesti"
msgid "Moderate"
msgstr ""
-#: lib/util.php:884
+#: lib/util.php:875
msgid "a few seconds ago"
msgstr "muutama sekunti sitten"
-#: lib/util.php:886
+#: lib/util.php:877
msgid "about a minute ago"
msgstr "noin minuutti sitten"
-#: lib/util.php:888
+#: lib/util.php:879
#, php-format
msgid "about %d minutes ago"
msgstr "noin %d minuuttia sitten"
-#: lib/util.php:890
+#: lib/util.php:881
msgid "about an hour ago"
msgstr "noin tunti sitten"
-#: lib/util.php:892
+#: lib/util.php:883
#, php-format
msgid "about %d hours ago"
msgstr "noin %d tuntia sitten"
-#: lib/util.php:894
+#: lib/util.php:885
msgid "about a day ago"
msgstr "noin päivä sitten"
-#: lib/util.php:896
+#: lib/util.php:887
#, php-format
msgid "about %d days ago"
msgstr "noin %d päivää sitten"
-#: lib/util.php:898
+#: lib/util.php:889
msgid "about a month ago"
msgstr "noin kuukausi sitten"
-#: lib/util.php:900
+#: lib/util.php:891
#, php-format
msgid "about %d months ago"
msgstr "noin %d kuukautta sitten"
-#: lib/util.php:902
+#: lib/util.php:893
msgid "about a year ago"
msgstr "noin vuosi sitten"
diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po
index 2fa90cfd1..44a011329 100644
--- a/locale/fr/LC_MESSAGES/statusnet.po
+++ b/locale/fr/LC_MESSAGES/statusnet.po
@@ -1,5 +1,6 @@
# Translation of StatusNet to French
#
+# Author@translatewiki.net: Crochet.david
# Author@translatewiki.net: IAlex
# Author@translatewiki.net: Isoph
# Author@translatewiki.net: Jean-Frédéric
@@ -12,12 +13,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-11 23:25+0000\n"
-"PO-Revision-Date: 2010-01-11 23:26:54+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 (r60950); 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"
@@ -37,8 +38,8 @@ 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
@@ -47,15 +48,20 @@ msgstr "Page non trouvée"
#: 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"
@@ -116,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!"
@@ -138,7 +144,7 @@ msgstr "Statuts de %1$s et ses amis dans %2$s!"
#: 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/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
@@ -157,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."
@@ -188,8 +194,9 @@ 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 ""
@@ -335,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."
@@ -347,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)."
@@ -395,7 +404,7 @@ msgstr "Vous êtes déjà membre de ce groupe."
msgid "You have been blocked from that group by the admin."
msgstr "Vous avez été bloqué de ce groupe par l’administrateur."
-#: actions/apigroupjoin.php:138 actions/joingroup.php:128
+#: 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 %1$s au groupe %2$s."
@@ -404,7 +413,7 @@ msgstr "Impossible de joindre l’utilisateur %1$s au groupe %2$s."
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
+#: 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 %1$s du groupe %2$s."
@@ -424,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."
@@ -453,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 ""
@@ -611,31 +716,6 @@ msgstr "Transfert"
msgid "Crop"
msgstr "Recadrer"
-#: 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/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"
@@ -703,7 +783,7 @@ msgstr "Impossible d’enregistrer les informations de blocage."
#: actions/grouplogo.php:99 actions/groupmembers.php:83
#: actions/grouprss.php:98 actions/groupunblock.php:86
#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86
-#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263
+#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:260
msgid "No such group."
msgstr "Aucun groupe trouvé."
@@ -772,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
@@ -960,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"
@@ -981,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"
@@ -1049,7 +1212,8 @@ 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"
@@ -1691,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)"
@@ -1737,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"
@@ -1809,7 +1973,7 @@ msgstr ""
msgid "You must be logged in to join a group."
msgstr "Vous devez ouvrir une session pour rejoindre un groupe."
-#: actions/joingroup.php:135
+#: actions/joingroup.php:131
#, php-format
msgid "%1$s joined group %2$s"
msgstr "%1$s a rejoint le groupe %2$s"
@@ -1818,15 +1982,11 @@ msgstr "%1$s a rejoint le groupe %2$s"
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
+#: actions/leavegroup.php:127
#, php-format
msgid "%1$s left group %2$s"
msgstr "%1$s a quitté le groupe %2$s"
@@ -1854,17 +2014,6 @@ msgstr "Ouvrir une session"
msgid "Login to site"
msgstr "Ouverture de session"
-#: actions/login.php:230 actions/profilesettings.php:106
-#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94
-#: lib/groupeditform.php:152 lib/userprofile.php:131
-msgid "Nickname"
-msgstr "Pseudo"
-
-#: actions/login.php:233 actions/register.php:429
-#: lib/accountsettingsaction.php:116
-msgid "Password"
-msgstr "Mot de passe"
-
#: actions/login.php:236 actions/register.php:478
msgid "Remember me"
msgstr "Se souvenir de moi"
@@ -1923,6 +2072,29 @@ msgstr "Impossible de rendre %1$s administrateur du groupe %2$s."
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"
@@ -1935,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 !"
@@ -1948,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 ""
@@ -2037,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"
@@ -2054,8 +2271,8 @@ msgstr "type de contenu "
msgid "Only "
msgstr "Seulement "
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033
-#: lib/api.php:1061 lib/api.php:1171
+#: 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é."
@@ -2068,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
@@ -2100,29 +2318,24 @@ 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
-#, fuzzy
msgid "No user ID specified."
-msgstr "Aucun groupe n’a été spécifié."
+msgstr "Aucun identifiant d'utilisateur n’a été spécifié."
#: actions/otp.php:83
-#, fuzzy
msgid "No login token specified."
-msgstr "Aucun avis n’a été spécifié."
+msgstr "Aucun jeton d'identification n’a été spécifié."
#: actions/otp.php:90
-#, fuzzy
msgid "No login token requested."
-msgstr "Aucune identité de profil dans la requête."
+msgstr "Aucune jeton d'identification requis."
#: actions/otp.php:95
-#, fuzzy
msgid "Invalid login token specified."
-msgstr "Jeton invalide ou expiré."
+msgstr "Jeton d'identification invalide."
#: actions/otp.php:104
-#, fuzzy
msgid "Login token expired."
-msgstr "Ouverture de session"
+msgstr "Jeton d'identification périmé."
#: actions/outbox.php:61
#, php-format
@@ -2393,7 +2606,7 @@ msgid "Full name"
msgstr "Nom complet"
#: actions/profilesettings.php:115 actions/register.php:453
-#: lib/groupeditform.php:161
+#: lib/applicationeditform.php:230 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Site personnel"
@@ -3011,6 +3224,84 @@ msgstr ""
msgid "User is already sandboxed."
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."
msgstr "Impossible d’afficher les favoris."
@@ -3124,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éé"
@@ -4062,10 +4349,6 @@ msgstr ""
msgid "Plugins"
msgstr "Extensions"
-#: actions/version.php:195
-msgid "Name"
-msgstr "Nom"
-
#: actions/version.php:196 lib/action.php:741
msgid "Version"
msgstr "Version"
@@ -4074,10 +4357,6 @@ msgstr "Version"
msgid "Author(s)"
msgstr "Auteur(s)"
-#: actions/version.php:198 lib/groupeditform.php:172
-msgid "Description"
-msgstr "Description"
-
#: classes/File.php:144
#, php-format
msgid ""
@@ -4097,10 +4376,22 @@ msgstr "Un fichier aussi gros dépasserai votre quota utilisateur de %d octets."
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
-#, fuzzy, php-format
+#, php-format
msgid "Could not create login token for %s"
-msgstr "Impossible de créer le jeton d’ouverture de session pour %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."
@@ -4114,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."
@@ -4142,25 +4433,25 @@ 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 "Bienvenue à %1$s, @%2$s !"
@@ -4202,9 +4493,9 @@ msgid "Other options"
msgstr "Autres options "
#: lib/action.php:144
-#, fuzzy, php-format
+#, php-format
msgid "%1$s - %2$s"
-msgstr "%1$s (%2$s)"
+msgstr "%1$s - %2$s"
#: lib/action.php:159
msgid "Untitled page"
@@ -4223,10 +4514,6 @@ 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"
@@ -4380,10 +4667,6 @@ 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."
@@ -4416,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"
@@ -4436,11 +4787,11 @@ 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"
@@ -4461,18 +4812,18 @@ msgid "Sorry, this command is not yet implemented."
msgstr "Désolé, cette commande n’a pas encore été implémentée."
#: lib/command.php:88
-#, fuzzy, php-format
+#, php-format
msgid "Could not find a user with nickname %s"
-msgstr "Impossible de trouver un utilisateur avec le pseudo %s."
+msgstr "Impossible de trouver un utilisateur avec le pseudo %s"
#: lib/command.php:92
msgid "It does not make a lot of sense to nudge yourself!"
msgstr "Ça n’a pas de sens de se faire un clin d’œil à soi-même !"
#: lib/command.php:99
-#, fuzzy, php-format
+#, php-format
msgid "Nudge sent to %s"
-msgstr "Clin d’œil envoyé à %s."
+msgstr "Coup de code envoyé à %s"
#: lib/command.php:126
#, php-format
@@ -4485,201 +4836,192 @@ msgstr ""
"Abonnés : %2$s\n"
"Messages : %3$s"
-#: lib/command.php:152 lib/command.php:399 lib/command.php:460
-#, fuzzy
+#: 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."
+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
+#: 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."
+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:217
-#, fuzzy
msgid "You are already a member of that group"
-msgstr "Vous êtes déjà membre de ce groupe."
+msgstr "Vous êtes déjà membre de ce groupe"
-#: lib/command.php:234
-#, fuzzy, php-format
+#: lib/command.php:231
+#, php-format
msgid "Could not join user %s to group %s"
-msgstr "Impossible de joindre l’utilisateur %1$s au groupe %2$s."
+msgstr "Impossible d’inscrire l’utilisateur %s au groupe %s"
-#: lib/command.php:239
-#, fuzzy, php-format
+#: lib/command.php:236
+#, php-format
msgid "%s joined group %s"
msgstr "%1$s a rejoint le groupe %2$s"
-#: lib/command.php:284
-#, fuzzy, php-format
+#: lib/command.php:275
+#, php-format
msgid "Could not remove user %s to group %s"
-msgstr "Impossible de retirer l’utilisateur %1$s du groupe %2$s."
+msgstr "Impossible de retirer l’utilisateur %s du groupe %s"
-#: lib/command.php:289
-#, fuzzy, php-format
+#: lib/command.php:280
+#, php-format
msgid "%s left group %s"
msgstr "%1$s a quitté le groupe %2$s"
-#: lib/command.php:318
-#, fuzzy, php-format
+#: lib/command.php:309
+#, php-format
msgid "Fullname: %s"
msgstr "Nom complet : %s"
-#: lib/command.php:321 lib/mail.php:254
+#: lib/command.php:312 lib/mail.php:254
#, php-format
msgid "Location: %s"
msgstr "Emplacement : %s"
-#: lib/command.php:324 lib/mail.php:256
+#: 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
+#: 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 %1$d caractères ; vous en avez "
-"entré %2$d."
+"Message trop long ! La taille maximale est de %d caractères ; vous en avez "
+"entré %d."
-#: lib/command.php:376
-#, fuzzy, php-format
+#: 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:422
-#, fuzzy
+#: lib/command.php:413
msgid "Cannot repeat your own notice"
-msgstr "Vous ne pouvez pas reprendre votre propre avis."
+msgstr "Impossible de reprendre votre propre avis"
-#: lib/command.php:427
-#, fuzzy
+#: lib/command.php:418
msgid "Already repeated that notice"
-msgstr "Vous avez déjà repris cet avis."
+msgstr "Avis déjà repris"
-#: lib/command.php:435
-#, fuzzy, php-format
+#: lib/command.php:426
+#, php-format
msgid "Notice from %s repeated"
-msgstr "Avis de %s repris."
+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."
-#: lib/command.php:491
-#, fuzzy, php-format
+#: 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 %1$d caractères ; vous en avez "
-"entré %2$d."
+"Avis trop long ! La taille maximale est de %d caractères ; vous en avez "
+"entré %d."
-#: lib/command.php:500
-#, fuzzy, php-format
+#: lib/command.php:491
+#, php-format
msgid "Reply to %s sent"
-msgstr "Réponse à %s envoyée."
+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
+#: 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."
+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
+#: 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."
+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
+#: lib/command.php:641
msgid "Login command is disabled"
-msgstr "La commande d’ouverture de session est désactivée."
+msgstr "La commande d'ouverture de session est désactivée"
-#: lib/command.php:661
-#, fuzzy, php-format
+#: 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."
+"pendant 2 minutes : %s"
-#: lib/command.php:677
+#: lib/command.php:668
msgid "You are not subscribed to anyone."
msgstr "Vous n'êtes pas abonné(e) à personne."
-#: lib/command.php:679
+#: 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:699
+#: lib/command.php:690
msgid "No one is subscribed to you."
msgstr "Personne ne s’est abonné à vous."
-#: lib/command.php:701
+#: 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:721
+#: lib/command.php:712
msgid "You are not a member of any groups."
msgstr "Vous n’êtes membre d’aucun groupe."
-#: lib/command.php:723
+#: 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:737
+#: lib/command.php:728
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4758,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é. "
-#: 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"
@@ -4787,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"
@@ -4976,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"
@@ -5368,18 +5724,20 @@ msgid "Attach a file"
msgstr "Attacher un fichier"
#: lib/noticeform.php:212
-#, fuzzy
msgid "Share my location"
msgstr "Partager ma localisation."
-#: lib/noticeform.php:214
-#, fuzzy
+#: lib/noticeform.php:215
msgid "Do not share my location"
-msgstr "Ne pas partager ma localisation."
+msgstr "Ne pas partager ma localisation"
-#: lib/noticeform.php:215
-msgid "Hide this info"
-msgstr "Masquer cette info"
+#: 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
@@ -5638,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"
@@ -5728,47 +6086,47 @@ msgstr "Message"
msgid "Moderate"
msgstr "Modérer"
-#: lib/util.php:884
+#: lib/util.php:875
msgid "a few seconds ago"
msgstr "il y a quelques secondes"
-#: lib/util.php:886
+#: lib/util.php:877
msgid "about a minute ago"
msgstr "il y a 1 minute"
-#: lib/util.php:888
+#: lib/util.php:879
#, php-format
msgid "about %d minutes ago"
msgstr "il y a %d minutes"
-#: lib/util.php:890
+#: lib/util.php:881
msgid "about an hour ago"
msgstr "il y a 1 heure"
-#: lib/util.php:892
+#: lib/util.php:883
#, php-format
msgid "about %d hours ago"
msgstr "il y a %d heures"
-#: lib/util.php:894
+#: lib/util.php:885
msgid "about a day ago"
msgstr "il y a 1 jour"
-#: lib/util.php:896
+#: lib/util.php:887
#, php-format
msgid "about %d days ago"
msgstr "il y a %d jours"
-#: lib/util.php:898
+#: lib/util.php:889
msgid "about a month ago"
msgstr "il y a 1 mois"
-#: lib/util.php:900
+#: lib/util.php:891
#, php-format
msgid "about %d months ago"
msgstr "il y a %d mois"
-#: lib/util.php:902
+#: lib/util.php:893
msgid "about a year ago"
msgstr "il y a environ 1 an"
diff --git a/locale/ga/LC_MESSAGES/statusnet.po b/locale/ga/LC_MESSAGES/statusnet.po
index 8b9658e48..9c98b889d 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-11 23:25+0000\n"
-"PO-Revision-Date: 2010-01-11 23:26:58+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 (r60950); 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,8 +35,8 @@ 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
@@ -45,15 +45,20 @@ msgstr "Non existe a etiqueta."
#: 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!"
@@ -128,7 +133,7 @@ msgstr "Actualizacións dende %1$s e amigos en %2$s!"
#: 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/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
@@ -148,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."
@@ -179,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 ""
@@ -333,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."
@@ -345,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.)."
@@ -394,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 actions/joingroup.php:128
+#: 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."
@@ -403,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."
@@ -423,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."
@@ -455,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 ""
@@ -614,29 +718,6 @@ msgstr "Subir"
msgid "Crop"
msgstr ""
-#: 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/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 ""
@@ -708,7 +789,7 @@ msgstr "Erro ao gardar información de bloqueo."
#: actions/grouplogo.php:99 actions/groupmembers.php:83
#: actions/grouprss.php:98 actions/groupunblock.php:86
#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86
-#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263
+#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:260
#, fuzzy
msgid "No such group."
msgstr "Non existe a etiqueta."
@@ -781,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
@@ -982,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"
@@ -1003,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"
@@ -1078,7 +1244,8 @@ 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"
@@ -1719,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)"
@@ -1764,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"
@@ -1833,7 +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:135
+#: actions/joingroup.php:131
#, fuzzy, php-format
msgid "%1$s joined group %2$s"
msgstr "%s / Favoritos dende %s"
@@ -1843,17 +2010,12 @@ 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
+#: actions/leavegroup.php:127
#, fuzzy, php-format
msgid "%1$s left group %2$s"
msgstr "%s / Favoritos dende %s"
@@ -1880,17 +2042,6 @@ msgstr "Inicio de sesión"
msgid "Login to site"
msgstr ""
-#: actions/login.php:230 actions/profilesettings.php:106
-#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94
-#: lib/groupeditform.php:152 lib/userprofile.php:131
-msgid "Nickname"
-msgstr "Alcume"
-
-#: actions/login.php:233 actions/register.php:429
-#: lib/accountsettingsaction.php:116
-msgid "Password"
-msgstr "Contrasinal"
-
#: actions/login.php:236 actions/register.php:478
msgid "Remember me"
msgstr "Lembrarme"
@@ -1944,6 +2095,28 @@ msgstr "O usuario bloqueoute."
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 ""
@@ -1956,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!"
@@ -1969,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 ""
@@ -2055,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"
@@ -2073,8 +2291,8 @@ msgstr "Conectar"
msgid "Only "
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033
-#: lib/api.php:1061 lib/api.php:1171
+#: 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."
@@ -2087,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
@@ -2424,7 +2643,7 @@ msgid "Full name"
msgstr "Nome completo"
#: actions/profilesettings.php:115 actions/register.php:453
-#: lib/groupeditform.php:161
+#: lib/applicationeditform.php:230 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Páxina persoal"
@@ -3040,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 "
@@ -3150,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"
@@ -4082,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"
@@ -4096,11 +4385,6 @@ msgstr "Persoal"
msgid "Author(s)"
msgstr ""
-#: actions/version.php:198 lib/groupeditform.php:172
-#, fuzzy
-msgid "Description"
-msgstr "Subscricións"
-
#: classes/File.php:144
#, php-format
msgid ""
@@ -4118,6 +4402,21 @@ msgstr ""
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"
@@ -4136,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 "
@@ -4166,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"
@@ -4252,11 +4551,6 @@ msgstr ""
#: lib/action.php:435
#, fuzzy
-msgid "Account"
-msgstr "Sobre"
-
-#: lib/action.php:435
-#, fuzzy
msgid "Change your email, avatar, password, profile"
msgstr "Cambiar contrasinal"
@@ -4423,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."
@@ -4468,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 ""
@@ -4489,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."
@@ -4540,14 +4895,13 @@ 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"
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
+#: 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."
@@ -4560,150 +4914,148 @@ msgstr "Chío marcado coma favorito."
msgid "You are already a member of that group"
msgstr "Xa estas suscrito a estes usuarios:"
-#: lib/command.php:234
+#: lib/command.php:231
#, fuzzy, php-format
msgid "Could not join user %s to group %s"
msgstr "Non podes seguir a este usuario: o Usuario non se atopa."
-#: lib/command.php:239
+#: lib/command.php:236
#, fuzzy, php-format
msgid "%s joined group %s"
msgstr "%s / Favoritos dende %s"
-#: lib/command.php:284
+#: 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:289
+#: lib/command.php:280
#, fuzzy, php-format
msgid "%s left group %s"
msgstr "%s / Favoritos dende %s"
-#: lib/command.php:318
-#, fuzzy, php-format
+#: lib/command.php:309
+#, php-format
msgid "Fullname: %s"
msgstr "Nome completo: %s"
-#: lib/command.php:321 lib/mail.php:254
+#: lib/command.php:312 lib/mail.php:254
#, php-format
msgid "Location: %s"
msgstr "Ubicación: %s"
-#: lib/command.php:324 lib/mail.php:256
+#: 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 %d characters, you sent %d"
msgstr "Mensaxe demasiado longa - o máximo é 140 caracteres, ti enviaches %d "
-#: lib/command.php:376
-#, fuzzy, php-format
+#: 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:422
+#: lib/command.php:413
#, fuzzy
msgid "Cannot repeat your own notice"
msgstr "Non se pode activar a notificación."
-#: lib/command.php:427
+#: lib/command.php:418
#, fuzzy
msgid "Already repeated that notice"
msgstr "Eliminar chío"
-#: lib/command.php:435
+#: lib/command.php:426
#, fuzzy, php-format
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 %d characters, you sent %d"
msgstr "Mensaxe demasiado longa - o máximo é 140 caracteres, ti enviaches %d "
-#: lib/command.php:500
-#, fuzzy, php-format
+#: 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
+#: 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
+#: 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
+#: lib/command.php:641
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:661
+#: lib/command.php:652
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:677
+#: lib/command.php:668
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Non estás suscrito a ese perfil"
-#: lib/command.php:679
+#: 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:"
@@ -4712,12 +5064,12 @@ msgstr[2] ""
msgstr[3] ""
msgstr[4] ""
-#: lib/command.php:699
+#: lib/command.php:690
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Outro usuario non se puido suscribir a ti."
-#: lib/command.php:701
+#: 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."
@@ -4726,12 +5078,12 @@ msgstr[2] ""
msgstr[3] ""
msgstr[4] ""
-#: lib/command.php:721
+#: 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:723
+#: 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"
@@ -4740,7 +5092,7 @@ msgstr[2] ""
msgstr[3] ""
msgstr[4] ""
-#: lib/command.php:737
+#: lib/command.php:728
#, fuzzy
msgid ""
"Commands:\n"
@@ -4808,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 ""
@@ -4837,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 ""
@@ -5031,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"
@@ -5408,13 +5774,15 @@ msgstr ""
msgid "Share my location"
msgstr "Non se puideron gardar as etiquetas."
-#: lib/noticeform.php:214
+#: lib/noticeform.php:215
#, fuzzy
msgid "Do not share my location"
msgstr "Non se puideron gardar as etiquetas."
-#: lib/noticeform.php:215
-msgid "Hide this info"
+#: lib/noticeform.php:216
+msgid ""
+"Sorry, retrieving your geo location is taking longer than expected, please "
+"try again later"
msgstr ""
#: lib/noticelist.php:428
@@ -5700,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."
@@ -5801,47 +6169,47 @@ msgstr "Nova mensaxe"
msgid "Moderate"
msgstr ""
-#: lib/util.php:884
+#: lib/util.php:875
msgid "a few seconds ago"
msgstr "fai uns segundos"
-#: lib/util.php:886
+#: lib/util.php:877
msgid "about a minute ago"
msgstr "fai un minuto"
-#: lib/util.php:888
+#: lib/util.php:879
#, php-format
msgid "about %d minutes ago"
msgstr "fai %d minutos"
-#: lib/util.php:890
+#: lib/util.php:881
msgid "about an hour ago"
msgstr "fai unha hora"
-#: lib/util.php:892
+#: lib/util.php:883
#, php-format
msgid "about %d hours ago"
msgstr "fai %d horas"
-#: lib/util.php:894
+#: lib/util.php:885
msgid "about a day ago"
msgstr "fai un día"
-#: lib/util.php:896
+#: lib/util.php:887
#, php-format
msgid "about %d days ago"
msgstr "fai %d días"
-#: lib/util.php:898
+#: lib/util.php:889
msgid "about a month ago"
msgstr "fai un mes"
-#: lib/util.php:900
+#: lib/util.php:891
#, php-format
msgid "about %d months ago"
msgstr "fai %d meses"
-#: lib/util.php:902
+#: lib/util.php:893
msgid "about a year ago"
msgstr "fai un ano"
diff --git a/locale/he/LC_MESSAGES/statusnet.po b/locale/he/LC_MESSAGES/statusnet.po
index 6d8f61d8e..0d4564da3 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-11 23:25+0000\n"
-"PO-Revision-Date: 2010-01-11 23:27:03+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 (r60950); 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,8 +33,8 @@ 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
@@ -43,15 +43,20 @@ msgstr "×ין הודעה כזו."
#: 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!"
@@ -126,7 +131,7 @@ msgstr ""
#: 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/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
@@ -146,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 ""
@@ -177,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 ""
@@ -325,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."
@@ -337,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 ×ותיות)"
@@ -387,7 +395,7 @@ msgstr "כבר נכנסת למערכת!"
msgid "You have been blocked from that group by the admin."
msgstr ""
-#: actions/apigroupjoin.php:138 actions/joingroup.php:128
+#: actions/apigroupjoin.php:138 actions/joingroup.php:124
#, fuzzy, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "נכשלה ההפניה לשרת: %s"
@@ -397,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"
@@ -417,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 ""
@@ -449,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 ""
@@ -608,29 +711,6 @@ msgstr "ההעלה"
msgid "Crop"
msgstr ""
-#: 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/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 ""
@@ -700,7 +780,7 @@ msgstr ""
#: actions/grouplogo.php:99 actions/groupmembers.php:83
#: actions/grouprss.php:98 actions/groupunblock.php:86
#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86
-#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263
+#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:260
#, fuzzy
msgid "No such group."
msgstr "×ין הודעה כזו."
@@ -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
@@ -969,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 "שמור"
@@ -991,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"
@@ -1061,7 +1220,8 @@ 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 "בטל"
@@ -1697,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 ""
@@ -1738,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 "שלח"
@@ -1782,7 +1942,7 @@ msgstr ""
msgid "You must be logged in to join a group."
msgstr ""
-#: actions/joingroup.php:135
+#: actions/joingroup.php:131
#, php-format
msgid "%1$s joined group %2$s"
msgstr ""
@@ -1791,16 +1951,12 @@ 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
+#: actions/leavegroup.php:127
#, fuzzy, php-format
msgid "%1$s left group %2$s"
msgstr "הסטטוס של %1$s ב-%2$s "
@@ -1827,17 +1983,6 @@ msgstr "היכנס"
msgid "Login to site"
msgstr ""
-#: actions/login.php:230 actions/profilesettings.php:106
-#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94
-#: lib/groupeditform.php:152 lib/userprofile.php:131
-msgid "Nickname"
-msgstr "כינוי"
-
-#: actions/login.php:233 actions/register.php:429
-#: lib/accountsettingsaction.php:116
-msgid "Password"
-msgstr "סיסמה"
-
#: actions/login.php:236 actions/register.php:478
msgid "Remember me"
msgstr "זכור ×ותי"
@@ -1888,6 +2033,27 @@ msgstr "למשתמש ×ין פרופיל."
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 ""
@@ -1900,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 "×ין תוכן!"
@@ -1913,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 ""
@@ -1996,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 "להודעה ×ין פרופיל"
@@ -2014,8 +2223,8 @@ msgstr "התחבר"
msgid "Only "
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033
-#: lib/api.php:1061 lib/api.php:1171
+#: 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 ""
@@ -2029,7 +2238,7 @@ msgstr ""
#: actions/othersettings.php:60
#, fuzzy
-msgid "Other Settings"
+msgid "Other settings"
msgstr "הגדרות"
#: actions/othersettings.php:71
@@ -2362,7 +2571,7 @@ msgid "Full name"
msgstr "×©× ×ž×œ×"
#: actions/profilesettings.php:115 actions/register.php:453
-#: lib/groupeditform.php:161
+#: lib/applicationeditform.php:230 lib/groupeditform.php:161
msgid "Homepage"
msgstr "×תר בית"
@@ -2937,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 ""
@@ -3045,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"
@@ -3944,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"
@@ -3958,11 +4236,6 @@ msgstr "×ישי"
msgid "Author(s)"
msgstr ""
-#: actions/version.php:198 lib/groupeditform.php:172
-#, fuzzy
-msgid "Description"
-msgstr "הרשמות"
-
#: classes/File.php:144
#, php-format
msgid ""
@@ -3980,6 +4253,21 @@ msgstr ""
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"
@@ -3997,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 ""
@@ -4108,11 +4396,6 @@ 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,7 +4707,7 @@ msgid "Sorry, this command is not yet implemented."
msgstr ""
#: lib/command.php:88
-#, fuzzy, php-format
+#, php-format
msgid "Could not find a user with nickname %s"
msgstr "עידכון המשתמש נכשל."
@@ -4383,13 +4728,13 @@ 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"
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"
msgstr "למשתמש ×ין פרופיל."
@@ -4403,176 +4748,176 @@ msgstr ""
msgid "You are already a member of that group"
msgstr "כבר נכנסת למערכת!"
-#: lib/command.php:234
+#: lib/command.php:231
#, fuzzy, php-format
msgid "Could not join user %s to group %s"
msgstr "נכשלה ההפניה לשרת: %s"
-#: lib/command.php:239
+#: lib/command.php:236
#, fuzzy, php-format
msgid "%s joined group %s"
msgstr "הסטטוס של %1$s ב-%2$s "
-#: lib/command.php:284
+#: lib/command.php:275
#, fuzzy, php-format
msgid "Could not remove user %s to group %s"
msgstr "נכשלה יצירת OpenID מתוך: %s"
-#: lib/command.php:289
+#: lib/command.php:280
#, fuzzy, php-format
msgid "%s left group %s"
msgstr "הסטטוס של %1$s ב-%2$s "
-#: lib/command.php:318
+#: lib/command.php:309
#, fuzzy, php-format
msgid "Fullname: %s"
msgstr "×©× ×ž×œ×"
-#: lib/command.php:321 lib/mail.php:254
+#: lib/command.php:312 lib/mail.php:254
#, php-format
msgid "Location: %s"
msgstr ""
-#: lib/command.php:324 lib/mail.php:256
+#: 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 %d characters, you sent %d"
msgstr ""
-#: lib/command.php:376
+#: lib/command.php:367
#, php-format
msgid "Direct message to %s sent"
msgstr ""
-#: lib/command.php:378
+#: lib/command.php:369
msgid "Error sending direct message."
msgstr ""
-#: lib/command.php:422
+#: lib/command.php:413
#, fuzzy
msgid "Cannot repeat your own notice"
msgstr "×œ× × ×™×ª×Ÿ ×œ×”×™×¨×©× ×œ×œ× ×”×¡×›×ž×” לרשיון"
-#: lib/command.php:427
+#: lib/command.php:418
#, fuzzy
msgid "Already repeated that notice"
msgstr "כבר נכנסת למערכת!"
-#: lib/command.php:435
+#: lib/command.php:426
#, fuzzy, php-format
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 %d characters, you sent %d"
msgstr ""
-#: lib/command.php:500
+#: lib/command.php:491
#, fuzzy, php-format
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
+#: 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
+#: 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
+#: lib/command.php:641
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:661
+#: lib/command.php:652
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:677
+#: lib/command.php:668
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "×œ× ×©×œ×—× ×• ×לינו ×ת הפרופיל ×”×–×”"
-#: lib/command.php:679
+#: 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:699
+#: lib/command.php:690
#, fuzzy
msgid "No one is subscribed to you."
msgstr "הרשמה מרוחקת"
-#: lib/command.php:701
+#: 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:721
+#: lib/command.php:712
#, fuzzy
msgid "You are not a member of any groups."
msgstr "×œ× ×©×œ×—× ×• ×לינו ×ת הפרופיל ×”×–×”"
-#: lib/command.php:723
+#: 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:737
+#: lib/command.php:728
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4613,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 ""
@@ -4642,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 ""
@@ -4833,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"
@@ -5151,13 +5510,15 @@ msgstr ""
msgid "Share my location"
msgstr "שמירת הפרופיל נכשלה."
-#: lib/noticeform.php:214
+#: lib/noticeform.php:215
#, fuzzy
msgid "Do not share my location"
msgstr "שמירת הפרופיל נכשלה."
-#: lib/noticeform.php:215
-msgid "Hide this info"
+#: 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,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 "מחיקת המנוי ×œ× ×”×¦×œ×™×—×”."
@@ -5533,47 +5894,47 @@ msgstr "הודעה חדשה"
msgid "Moderate"
msgstr ""
-#: lib/util.php:884
+#: lib/util.php:875
msgid "a few seconds ago"
msgstr "לפני מספר שניות"
-#: lib/util.php:886
+#: lib/util.php:877
msgid "about a minute ago"
msgstr "לפני כדקה"
-#: lib/util.php:888
+#: lib/util.php:879
#, php-format
msgid "about %d minutes ago"
msgstr "לפני כ-%d דקות"
-#: lib/util.php:890
+#: lib/util.php:881
msgid "about an hour ago"
msgstr "לפני כשעה"
-#: lib/util.php:892
+#: lib/util.php:883
#, php-format
msgid "about %d hours ago"
msgstr "לפני כ-%d שעות"
-#: lib/util.php:894
+#: lib/util.php:885
msgid "about a day ago"
msgstr "לפני כיו×"
-#: lib/util.php:896
+#: lib/util.php:887
#, php-format
msgid "about %d days ago"
msgstr "לפני ×›-%d ימי×"
-#: lib/util.php:898
+#: lib/util.php:889
msgid "about a month ago"
msgstr "לפני כחודש"
-#: lib/util.php:900
+#: lib/util.php:891
#, php-format
msgid "about %d months ago"
msgstr "לפני ×›-%d חודשי×"
-#: lib/util.php:902
+#: lib/util.php:893
msgid "about a year ago"
msgstr "לפני כשנה"
diff --git a/locale/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po
index 01be59de2..0a2f05cb3 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-11 23:25+0000\n"
-"PO-Revision-Date: 2010-01-11 23:27:07+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 (r60950); 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,8 +35,8 @@ 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
@@ -45,15 +45,20 @@ msgstr "Strona njeeksistuje"
#: 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!"
@@ -127,7 +132,7 @@ msgstr ""
#: 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/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
@@ -146,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."
@@ -175,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 ""
@@ -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)."
@@ -376,7 +384,7 @@ msgstr "Sy hižo ÄÅ‚on teje skupiny."
msgid "You have been blocked from that group by the admin."
msgstr ""
-#: actions/apigroupjoin.php:138 actions/joingroup.php:128
+#: actions/apigroupjoin.php:138 actions/joingroup.php:124
#, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "Njebě móžno wužiwarja %1$s skupinje %2%s přidać."
@@ -385,7 +393,7 @@ msgstr "Njebě móžno wužiwarja %1$s skupinje %2%s přidać."
msgid "You are not a member of this group."
msgstr "Njejsy ÄÅ‚on tuteje skupiny."
-#: 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 "Njebě móžno wužiwarja %1$s ze skupiny %2$s wotstronić."
@@ -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."
@@ -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 ""
@@ -589,29 +688,6 @@ msgstr "Nahrać"
msgid "Crop"
msgstr ""
-#: 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/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 ""
@@ -676,7 +752,7 @@ msgstr ""
#: actions/grouplogo.php:99 actions/groupmembers.php:83
#: actions/grouprss.php:98 actions/groupunblock.php:86
#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86
-#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263
+#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:260
msgid "No such group."
msgstr "Skupina njeeksistuje."
@@ -745,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
@@ -928,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ć"
@@ -949,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"
@@ -1015,7 +1162,8 @@ 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ć"
@@ -1611,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)"
@@ -1654,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ć"
@@ -1698,7 +1846,7 @@ msgstr ""
msgid "You must be logged in to join a group."
msgstr ""
-#: actions/joingroup.php:135
+#: actions/joingroup.php:131
#, php-format
msgid "%1$s joined group %2$s"
msgstr ""
@@ -1707,15 +1855,11 @@ 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
+#: actions/leavegroup.php:127
#, php-format
msgid "%1$s left group %2$s"
msgstr ""
@@ -1741,17 +1885,6 @@ msgstr "Přizjewić"
msgid "Login to site"
msgstr "Při sydle přizjewić"
-#: actions/login.php:230 actions/profilesettings.php:106
-#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94
-#: lib/groupeditform.php:152 lib/userprofile.php:131
-msgid "Nickname"
-msgstr "Přimjeno"
-
-#: actions/login.php:233 actions/register.php:429
-#: lib/accountsettingsaction.php:116
-msgid "Password"
-msgstr "Hesło"
-
#: actions/login.php:236 actions/register.php:478
msgid "Remember me"
msgstr "Składować"
@@ -1800,6 +1933,26 @@ msgstr "Njeje móžno %1$S k administratorej w skupinje %2$s Äinić."
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"
@@ -1812,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!"
@@ -1825,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 ""
@@ -1904,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"
@@ -1921,8 +2116,8 @@ msgstr ""
msgid "Only "
msgstr "Jenož "
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033
-#: lib/api.php:1061 lib/api.php:1171
+#: 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."
@@ -1935,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
@@ -1967,28 +2162,24 @@ msgid "URL shortening service is too long (max 50 chars)."
msgstr ""
#: actions/otp.php:69
-#, fuzzy
msgid "No user ID specified."
-msgstr "Žana skupina podata."
+msgstr "Žadyn wužiwarski ID podaty."
#: actions/otp.php:83
-#, fuzzy
msgid "No login token specified."
-msgstr "Žana zdźělenka podata."
+msgstr "Žane přizjewjenske znamješko podate."
#: actions/otp.php:90
msgid "No login token requested."
msgstr ""
#: actions/otp.php:95
-#, fuzzy
msgid "Invalid login token specified."
-msgstr "Žana zdźělenka podata."
+msgstr "Njepłaćiwe přizjewjenske znamješko podate."
#: actions/otp.php:104
-#, fuzzy
msgid "Login token expired."
-msgstr "Při sydle přizjewić"
+msgstr "Přizjewjenske znamješko spadnjene."
#: actions/outbox.php:61
#, php-format
@@ -2251,7 +2442,7 @@ msgid "Full name"
msgstr "Dospołne mjeno"
#: actions/profilesettings.php:115 actions/register.php:453
-#: lib/groupeditform.php:161
+#: lib/applicationeditform.php:230 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Startowa strona"
@@ -2806,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 ""
@@ -2911,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"
@@ -3766,10 +4027,6 @@ msgstr ""
msgid "Plugins"
msgstr ""
-#: actions/version.php:195
-msgid "Name"
-msgstr "Mjeno"
-
#: actions/version.php:196 lib/action.php:741
msgid "Version"
msgstr "Wersija"
@@ -3778,10 +4035,6 @@ msgstr "Wersija"
msgid "Author(s)"
msgstr "Awtorojo"
-#: actions/version.php:198 lib/groupeditform.php:172
-msgid "Description"
-msgstr "Wopisanje"
-
#: classes/File.php:144
#, php-format
msgid ""
@@ -3799,10 +4052,22 @@ msgstr ""
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
-#, fuzzy, php-format
+#, php-format
msgid "Could not create login token for %s"
-msgstr "Njebě móžno, přizjewjenske znamješko za %s wutworić."
+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."
@@ -3816,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 ""
@@ -3900,9 +4165,9 @@ msgid "Other options"
msgstr "Druhe opcije"
#: lib/action.php:144
-#, fuzzy, php-format
+#, php-format
msgid "%1$s - %2$s"
-msgstr "%1$s (%2$s)"
+msgstr "%1$s - %2$s"
#: lib/action.php:159
msgid "Untitled page"
@@ -3921,10 +4186,6 @@ 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 ""
@@ -4073,10 +4334,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 ""
@@ -4109,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 ""
@@ -4129,11 +4447,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 "Změnjenje hesła je so njeporadźiło"
-#: lib/authenticationplugin.php:197
+#: lib/authenticationplugin.php:229
msgid "Password changing is not allowed"
msgstr "Změnjenje hesła njeje dowolene"
@@ -4175,165 +4493,160 @@ msgid ""
"Notices: %3$s"
msgstr ""
-#: lib/command.php:152 lib/command.php:399 lib/command.php:460
-#, fuzzy
+#: 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."
+msgstr "Zdźělenka z tym ID njeeksistuje"
-#: lib/command.php:168 lib/command.php:415 lib/command.php:476
-#: lib/command.php:532
-#, fuzzy
+#: 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ć."
+msgstr "Wužiwar nima poslednju powěsć"
#: lib/command.php:190
msgid "Notice marked as fave."
msgstr ""
#: lib/command.php:217
-#, fuzzy
msgid "You are already a member of that group"
-msgstr "Sy hižo ÄÅ‚on teje skupiny."
+msgstr "Sy hižo ÄÅ‚on teje skupiny"
-#: lib/command.php:234
-#, fuzzy, php-format
+#: lib/command.php:231
+#, php-format
msgid "Could not join user %s to group %s"
-msgstr "Njebě móžno wužiwarja %1$s skupinje %2%s přidać."
+msgstr "Njebě móžno wužiwarja %s skupinje %s přidać"
-#: lib/command.php:239
-#, fuzzy, php-format
+#: lib/command.php:236
+#, php-format
msgid "%s joined group %s"
-msgstr "Wužiwarske skupiny"
+msgstr "%s je so k skupinje %s přizamknył"
-#: lib/command.php:284
-#, fuzzy, php-format
+#: lib/command.php:275
+#, php-format
msgid "Could not remove user %s to group %s"
-msgstr "Njebě móžno wužiwarja %1$s do skupiny $2$s přesunyć."
+msgstr "Njebě móžno wužiwarja %s do skupiny %s přesunyć"
-#: lib/command.php:289
-#, fuzzy, php-format
+#: lib/command.php:280
+#, php-format
msgid "%s left group %s"
-msgstr "Wužiwarske skupiny"
+msgstr "%s je skupinu %s wopušćił"
-#: lib/command.php:318
-#, fuzzy, php-format
+#: lib/command.php:309
+#, php-format
msgid "Fullname: %s"
msgstr "Dospołne mjeno: %s"
-#: lib/command.php:321 lib/mail.php:254
+#: lib/command.php:312 lib/mail.php:254
#, php-format
msgid "Location: %s"
msgstr "Městno: %s"
-#: lib/command.php:324 lib/mail.php:256
+#: 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 %d characters, you sent %d"
msgstr ""
-#: lib/command.php:376
-#, fuzzy, php-format
+#: lib/command.php:367
+#, php-format
msgid "Direct message to %s sent"
-msgstr "Direktna powěsć do %s pósłana."
+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:422
-#, fuzzy
+#: lib/command.php:413
msgid "Cannot repeat your own notice"
-msgstr "Njemóžno twoju zdźělenku wospjetować."
+msgstr "Njemóžeš swójsku powěsć wospjetować"
-#: lib/command.php:427
-#, fuzzy
+#: lib/command.php:418
msgid "Already repeated that notice"
-msgstr "Tuta zdźělenka bu hižo wospjetowana."
+msgstr "Tuta zdźělenka bu hižo wospjetowana"
-#: lib/command.php:435
-#, fuzzy, php-format
+#: lib/command.php:426
+#, php-format
msgid "Notice from %s repeated"
-msgstr "Powěsć wot %s wospjetowana."
+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 %d characters, you sent %d"
msgstr ""
-#: lib/command.php:500
-#, fuzzy, php-format
+#: lib/command.php:491
+#, php-format
msgid "Reply to %s sent"
-msgstr "Wotmołwa na %s pósłana."
+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
+#: 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
+#: 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
+#: lib/command.php:641
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:661
+#: lib/command.php:652
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:677
+#: lib/command.php:668
msgid "You are not subscribed to anyone."
msgstr ""
-#: lib/command.php:679
+#: 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ł:"
@@ -4341,11 +4654,11 @@ msgstr[1] "Sy tutej wosobje abonował:"
msgstr[2] "Sy tute wosoby abonował:"
msgstr[3] "Sy tute wosoby abonował:"
-#: lib/command.php:699
+#: lib/command.php:690
msgid "No one is subscribed to you."
msgstr ""
-#: lib/command.php:701
+#: 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:"
@@ -4353,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:721
+#: lib/command.php:712
msgid "You are not a member of any groups."
msgstr ""
-#: lib/command.php:723
+#: 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:"
@@ -4365,7 +4678,7 @@ msgstr[1] "Sy ÄÅ‚on tuteju skupinow:"
msgstr[2] "Sy ÄÅ‚on tutych skupinow:"
msgstr[3] "Sy ÄÅ‚on tutych skupinow:"
-#: lib/command.php:737
+#: lib/command.php:728
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4406,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 ""
@@ -4434,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"
@@ -4616,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 ""
@@ -4918,17 +5244,17 @@ msgid "Attach a file"
msgstr "Dataju připowěsnyć"
#: lib/noticeform.php:212
-#, fuzzy
msgid "Share my location"
-msgstr "Městno dźělić."
+msgstr "Městno dźělić"
-#: lib/noticeform.php:214
-#, fuzzy
+#: lib/noticeform.php:215
msgid "Do not share my location"
-msgstr "Městno njedźělić."
+msgstr "Njedźěl moje městno"
-#: lib/noticeform.php:215
-msgid "Hide this info"
+#: lib/noticeform.php:216
+msgid ""
+"Sorry, retrieving your geo location is taking longer than expected, please "
+"try again later"
msgstr ""
#: lib/noticelist.php:428
@@ -5046,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"
@@ -5189,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ć."
@@ -5279,47 +5604,47 @@ msgstr "Powěsć"
msgid "Moderate"
msgstr ""
-#: lib/util.php:884
+#: lib/util.php:875
msgid "a few seconds ago"
msgstr "před něšto sekundami"
-#: lib/util.php:886
+#: lib/util.php:877
msgid "about a minute ago"
msgstr "před něhdźe jednej mjeńšinu"
-#: lib/util.php:888
+#: lib/util.php:879
#, php-format
msgid "about %d minutes ago"
msgstr "před %d mjeńšinami"
-#: lib/util.php:890
+#: lib/util.php:881
msgid "about an hour ago"
msgstr "před něhdźe jednej hodźinu"
-#: lib/util.php:892
+#: lib/util.php:883
#, php-format
msgid "about %d hours ago"
msgstr "před něhdźe %d hodźinami"
-#: lib/util.php:894
+#: lib/util.php:885
msgid "about a day ago"
msgstr "před něhdźe jednym dnjom"
-#: lib/util.php:896
+#: lib/util.php:887
#, php-format
msgid "about %d days ago"
msgstr "před něhdźe %d dnjemi"
-#: lib/util.php:898
+#: lib/util.php:889
msgid "about a month ago"
msgstr "před něhdźe jednym měsacom"
-#: lib/util.php:900
+#: lib/util.php:891
#, php-format
msgid "about %d months ago"
msgstr "před něhdźe %d měsacami"
-#: lib/util.php:902
+#: lib/util.php:893
msgid "about a year ago"
msgstr "před něhdźe jednym lětom"
diff --git a/locale/ia/LC_MESSAGES/statusnet.po b/locale/ia/LC_MESSAGES/statusnet.po
index a845bae26..6e32e9680 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-11 23:25+0000\n"
-"PO-Revision-Date: 2010-01-11 23:27:11+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 (r60950); 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,8 +33,8 @@ 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
@@ -43,15 +43,20 @@ msgstr "Pagina non existe"
#: 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!"
@@ -133,7 +138,7 @@ msgstr "Actualisationes de %1$s e su amicos in %2$s!"
#: 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/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
@@ -152,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."
@@ -183,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 ""
@@ -329,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."
@@ -341,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)."
@@ -389,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 actions/joingroup.php:128
+#: 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."
@@ -398,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."
@@ -418,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."
@@ -447,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 ""
@@ -605,29 +708,6 @@ msgstr "Cargar"
msgid "Crop"
msgstr "Taliar"
-#: 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/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"
@@ -695,7 +775,7 @@ msgstr "Falleva de salveguardar le information del blocada."
#: actions/grouplogo.php:99 actions/groupmembers.php:83
#: actions/grouprss.php:98 actions/groupunblock.php:86
#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86
-#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263
+#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:260
msgid "No such group."
msgstr "Gruppo non existe."
@@ -764,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
@@ -952,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"
@@ -973,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"
@@ -1043,7 +1204,8 @@ 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"
@@ -1681,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 ""
@@ -1727,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"
@@ -1797,7 +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:135
+#: actions/joingroup.php:131
#, fuzzy, php-format
msgid "%1$s joined group %2$s"
msgstr "%s se faceva membro del gruppo %s"
@@ -1806,15 +1968,11 @@ 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
+#: actions/leavegroup.php:127
#, fuzzy, php-format
msgid "%1$s left group %2$s"
msgstr "%s quitava le gruppo %s"
@@ -1841,17 +1999,6 @@ msgstr "Aperir session"
msgid "Login to site"
msgstr "Identificar te a iste sito"
-#: actions/login.php:230 actions/profilesettings.php:106
-#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94
-#: lib/groupeditform.php:152 lib/userprofile.php:131
-msgid "Nickname"
-msgstr "Pseudonymo"
-
-#: actions/login.php:233 actions/register.php:429
-#: lib/accountsettingsaction.php:116
-msgid "Password"
-msgstr "Contrasigno"
-
#: actions/login.php:236 actions/register.php:478
msgid "Remember me"
msgstr "Memorar me"
@@ -1906,6 +2053,29 @@ msgstr "Non pote facer %s administrator del gruppo %s"
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"
@@ -1918,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!"
@@ -1931,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 ""
@@ -2021,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"
@@ -2038,8 +2252,8 @@ msgstr "typo de contento "
msgid "Only "
msgstr "Solmente "
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033
-#: lib/api.php:1061 lib/api.php:1171
+#: 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."
@@ -2052,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
@@ -2375,7 +2590,7 @@ msgid "Full name"
msgstr "Nomine complete"
#: actions/profilesettings.php:115 actions/register.php:453
-#: lib/groupeditform.php:161
+#: lib/applicationeditform.php:230 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Pagina personal"
@@ -2983,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."
@@ -3096,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"
@@ -3988,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"
@@ -4002,10 +4285,6 @@ msgstr "Conversation"
msgid "Author(s)"
msgstr ""
-#: actions/version.php:198 lib/groupeditform.php:172
-msgid "Description"
-msgstr ""
-
#: classes/File.php:144
#, php-format
msgid ""
@@ -4023,6 +4302,21 @@ msgstr ""
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"
@@ -4040,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 ""
@@ -4145,10 +4439,6 @@ 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 ""
@@ -4297,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 ""
@@ -4334,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 ""
@@ -4354,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"
@@ -4402,13 +4751,13 @@ 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"
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"
msgstr "Le usator non ha un profilo."
@@ -4418,175 +4767,172 @@ msgid "Notice marked as fave."
msgstr ""
#: lib/command.php:217
-#, fuzzy
msgid "You are already a member of that group"
-msgstr "Tu es ja membro de iste gruppo."
+msgstr "Tu es ja membro de iste gruppo"
-#: lib/command.php:234
-#, fuzzy, php-format
+#: lib/command.php:231
+#, php-format
msgid "Could not join user %s to group %s"
-msgstr "Non poteva inscriber le usator %s in le gruppo %s."
+msgstr "Non poteva facer le usator %s membro del gruppo %s"
-#: lib/command.php:239
-#, fuzzy, php-format
+#: lib/command.php:236
+#, php-format
msgid "%s joined group %s"
msgstr "%s se faceva membro del gruppo %s"
-#: lib/command.php:284
-#, fuzzy, php-format
+#: 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:289
-#, fuzzy, php-format
+#: lib/command.php:280
+#, php-format
msgid "%s left group %s"
msgstr "%s quitava le gruppo %s"
-#: lib/command.php:318
+#: lib/command.php:309
#, fuzzy, php-format
msgid "Fullname: %s"
msgstr "Nomine complete"
-#: lib/command.php:321 lib/mail.php:254
+#: lib/command.php:312 lib/mail.php:254
#, php-format
msgid "Location: %s"
msgstr ""
-#: lib/command.php:324 lib/mail.php:256
+#: 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 %d characters, you sent %d"
msgstr ""
-#: lib/command.php:376
-#, fuzzy, php-format
+#: 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:422
-#, fuzzy
+#: lib/command.php:413
msgid "Cannot repeat your own notice"
-msgstr "Non pote repeter tu proprie nota."
+msgstr "Non pote repeter tu proprie nota"
-#: lib/command.php:427
-#, fuzzy
+#: lib/command.php:418
msgid "Already repeated that notice"
-msgstr "Iste nota ha ja essite repetite."
+msgstr "Iste nota ha ja essite repetite"
-#: lib/command.php:435
+#: lib/command.php:426
#, fuzzy, php-format
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 %d characters, you sent %d"
msgstr ""
-#: lib/command.php:500
+#: lib/command.php:491
#, fuzzy, php-format
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
+#: 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
+#: 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
+#: lib/command.php:641
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:661
+#: lib/command.php:652
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:677
+#: lib/command.php:668
msgid "You are not subscribed to anyone."
msgstr ""
-#: lib/command.php:679
+#: 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:699
+#: lib/command.php:690
msgid "No one is subscribed to you."
msgstr ""
-#: lib/command.php:701
+#: 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:721
+#: lib/command.php:712
msgid "You are not a member of any groups."
msgstr ""
-#: lib/command.php:723
+#: 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:737
+#: lib/command.php:728
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4627,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 ""
@@ -4655,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 ""
@@ -4837,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 ""
@@ -5144,13 +5504,15 @@ msgstr ""
msgid "Share my location"
msgstr "Non poteva salveguardar le preferentias de loco."
-#: lib/noticeform.php:214
+#: lib/noticeform.php:215
#, fuzzy
msgid "Do not share my location"
msgstr "Non poteva salveguardar le preferentias de loco."
-#: lib/noticeform.php:215
-msgid "Hide this info"
+#: lib/noticeform.php:216
+msgid ""
+"Sorry, retrieving your geo location is taking longer than expected, please "
+"try again later"
msgstr ""
#: lib/noticelist.php:428
@@ -5413,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 ""
@@ -5503,47 +5865,47 @@ msgstr ""
msgid "Moderate"
msgstr ""
-#: lib/util.php:884
+#: lib/util.php:875
msgid "a few seconds ago"
msgstr ""
-#: lib/util.php:886
+#: lib/util.php:877
msgid "about a minute ago"
msgstr ""
-#: lib/util.php:888
+#: lib/util.php:879
#, php-format
msgid "about %d minutes ago"
msgstr ""
-#: lib/util.php:890
+#: lib/util.php:881
msgid "about an hour ago"
msgstr ""
-#: lib/util.php:892
+#: lib/util.php:883
#, php-format
msgid "about %d hours ago"
msgstr ""
-#: lib/util.php:894
+#: lib/util.php:885
msgid "about a day ago"
msgstr ""
-#: lib/util.php:896
+#: lib/util.php:887
#, php-format
msgid "about %d days ago"
msgstr ""
-#: lib/util.php:898
+#: lib/util.php:889
msgid "about a month ago"
msgstr ""
-#: lib/util.php:900
+#: lib/util.php:891
#, php-format
msgid "about %d months ago"
msgstr ""
-#: lib/util.php:902
+#: lib/util.php:893
msgid "about a year ago"
msgstr ""
diff --git a/locale/is/LC_MESSAGES/statusnet.po b/locale/is/LC_MESSAGES/statusnet.po
index b524a7f8f..6ef030c3f 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-11 23:25+0000\n"
-"PO-Revision-Date: 2010-01-11 23:27:15+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 (r60950); 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,8 +36,8 @@ 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
@@ -46,15 +46,20 @@ msgstr "Ekkert þannig merki."
#: 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!"
@@ -128,7 +133,7 @@ msgstr "Færslur frá %1$s og vinum á %2$s!"
#: 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/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
@@ -148,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."
@@ -179,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 ""
@@ -327,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."
@@ -339,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)."
@@ -389,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 actions/joingroup.php:128
+#: 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"
@@ -399,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"
@@ -419,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."
@@ -450,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 ""
@@ -605,29 +708,6 @@ msgstr "Hlaða upp"
msgid "Crop"
msgstr "Skera af"
-#: 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/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 ""
@@ -695,7 +775,7 @@ msgstr "Mistókst að vista upplýsingar um notendalokun"
#: actions/grouplogo.php:99 actions/groupmembers.php:83
#: actions/grouprss.php:98 actions/groupunblock.php:86
#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86
-#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263
+#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:260
msgid "No such group."
msgstr "Enginn þannig hópur."
@@ -765,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
@@ -958,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"
@@ -979,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"
@@ -1049,7 +1211,8 @@ 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ð"
@@ -1674,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)"
@@ -1720,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"
@@ -1790,7 +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:135
+#: actions/joingroup.php:131
#, fuzzy, php-format
msgid "%1$s joined group %2$s"
msgstr "%s bætti sér í hópinn %s"
@@ -1799,15 +1962,11 @@ 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
+#: actions/leavegroup.php:127
#, fuzzy, php-format
msgid "%1$s left group %2$s"
msgstr "%s gekk úr hópnum %s"
@@ -1834,17 +1993,6 @@ msgstr "Innskráning"
msgid "Login to site"
msgstr "Skrá þig inn á síðuna"
-#: actions/login.php:230 actions/profilesettings.php:106
-#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94
-#: lib/groupeditform.php:152 lib/userprofile.php:131
-msgid "Nickname"
-msgstr "Stuttnefni"
-
-#: actions/login.php:233 actions/register.php:429
-#: lib/accountsettingsaction.php:116
-msgid "Password"
-msgstr "Lykilorð"
-
#: actions/login.php:236 actions/register.php:478
msgid "Remember me"
msgstr "Muna eftir mér"
@@ -1900,6 +2048,29 @@ msgstr "Gat ekki fjarlægt notandann %s úr hópnum %s"
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"
@@ -1912,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!"
@@ -1925,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 ""
@@ -2010,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"
@@ -2027,8 +2243,8 @@ msgstr ""
msgid "Only "
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033
-#: lib/api.php:1061 lib/api.php:1171
+#: 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ð."
@@ -2041,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
@@ -2374,7 +2591,7 @@ msgid "Full name"
msgstr "Fullt nafn"
#: actions/profilesettings.php:115 actions/register.php:453
-#: lib/groupeditform.php:161
+#: lib/applicationeditform.php:230 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Heimasíða"
@@ -2973,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."
@@ -3078,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 ""
@@ -3983,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"
@@ -3997,10 +4283,6 @@ msgstr "Persónulegt"
msgid "Author(s)"
msgstr ""
-#: actions/version.php:198 lib/groupeditform.php:172
-msgid "Description"
-msgstr "Lýsing"
-
#: classes/File.php:144
#, php-format
msgid ""
@@ -4018,6 +4300,21 @@ msgstr ""
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"
@@ -4036,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 ""
@@ -4143,10 +4440,6 @@ 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 ""
"Breyttu tölvupóstinum þínum, einkennismyndinni þinni, lykilorðinu þínu, "
@@ -4305,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."
@@ -4348,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 ""
@@ -4368,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"
@@ -4416,14 +4771,13 @@ 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"
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
+#: 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"
@@ -4432,182 +4786,179 @@ msgid "Notice marked as fave."
msgstr "Babl gert að uppáhaldi."
#: lib/command.php:217
-#, fuzzy
msgid "You are already a member of that group"
msgstr "Þú ert nú þegar meðlimur í þessum hópi"
-#: lib/command.php:234
-#, fuzzy, php-format
+#: 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:239
-#, fuzzy, php-format
+#: lib/command.php:236
+#, php-format
msgid "%s joined group %s"
msgstr "%s bætti sér í hópinn %s"
-#: lib/command.php:284
-#, fuzzy, php-format
+#: 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:289
-#, fuzzy, php-format
+#: lib/command.php:280
+#, php-format
msgid "%s left group %s"
msgstr "%s gekk úr hópnum %s"
-#: lib/command.php:318
-#, fuzzy, php-format
+#: lib/command.php:309
+#, php-format
msgid "Fullname: %s"
msgstr "Fullt nafn: %s"
-#: lib/command.php:321 lib/mail.php:254
+#: lib/command.php:312 lib/mail.php:254
#, php-format
msgid "Location: %s"
msgstr "Staðsetning: %s"
-#: lib/command.php:324 lib/mail.php:256
+#: 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 %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
+#: 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:422
+#: lib/command.php:413
#, fuzzy
msgid "Cannot repeat your own notice"
msgstr "Get ekki kveikt á tilkynningum."
-#: lib/command.php:427
+#: lib/command.php:418
#, fuzzy
msgid "Already repeated that notice"
msgstr "Eyða þessu babli"
-#: lib/command.php:435
+#: lib/command.php:426
#, fuzzy, php-format
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 %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"
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
+#: 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
+#: 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
+#: lib/command.php:641
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:661
+#: lib/command.php:652
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:677
+#: lib/command.php:668
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Þú ert ekki áskrifandi."
-#: lib/command.php:679
+#: 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:699
+#: 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:701
+#: 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:721
+#: 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:723
+#: 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:737
+#: lib/command.php:728
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4648,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"
@@ -4678,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 ""
@@ -4864,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"
@@ -5182,13 +5547,15 @@ msgstr ""
msgid "Share my location"
msgstr "Gat ekki vistað merki."
-#: lib/noticeform.php:214
+#: lib/noticeform.php:215
#, fuzzy
msgid "Do not share my location"
msgstr "Gat ekki vistað merki."
-#: lib/noticeform.php:215
-msgid "Hide this info"
+#: lib/noticeform.php:216
+msgid ""
+"Sorry, retrieving your geo location is taking longer than expected, please "
+"try again later"
msgstr ""
#: lib/noticelist.php:428
@@ -5461,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."
@@ -5555,47 +5922,47 @@ msgstr "Skilaboð"
msgid "Moderate"
msgstr ""
-#: lib/util.php:884
+#: lib/util.php:875
msgid "a few seconds ago"
msgstr "fyrir nokkrum sekúndum"
-#: lib/util.php:886
+#: lib/util.php:877
msgid "about a minute ago"
msgstr "fyrir um einni mínútu síðan"
-#: lib/util.php:888
+#: lib/util.php:879
#, php-format
msgid "about %d minutes ago"
msgstr "fyrir um %d mínútum síðan"
-#: lib/util.php:890
+#: lib/util.php:881
msgid "about an hour ago"
msgstr "fyrir um einum klukkutíma síðan"
-#: lib/util.php:892
+#: lib/util.php:883
#, php-format
msgid "about %d hours ago"
msgstr "fyrir um %d klukkutímum síðan"
-#: lib/util.php:894
+#: lib/util.php:885
msgid "about a day ago"
msgstr "fyrir um einum degi síðan"
-#: lib/util.php:896
+#: lib/util.php:887
#, php-format
msgid "about %d days ago"
msgstr "fyrir um %d dögum síðan"
-#: lib/util.php:898
+#: lib/util.php:889
msgid "about a month ago"
msgstr "fyrir um einum mánuði síðan"
-#: lib/util.php:900
+#: lib/util.php:891
#, php-format
msgid "about %d months ago"
msgstr "fyrir um %d mánuðum síðan"
-#: lib/util.php:902
+#: lib/util.php:893
msgid "about a year ago"
msgstr "fyrir um einu ári síðan"
diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po
index 9f4e3e734..032a363f0 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-11 23:25+0000\n"
-"PO-Revision-Date: 2010-01-11 23:27:19+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 (r60950); 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,8 +34,8 @@ 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
@@ -44,15 +44,20 @@ msgstr "Pagina inesistente."
#: 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"
@@ -113,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!"
@@ -135,7 +140,7 @@ msgstr "Messaggi da %1$s e amici su %2$s!"
#: 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/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
@@ -154,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."
@@ -185,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 ""
@@ -330,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."
@@ -342,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)."
@@ -390,7 +398,7 @@ msgstr "Fai già parte di quel gruppo."
msgid "You have been blocked from that group by the admin."
msgstr "L'amministratore ti ha bloccato l'accesso a quel gruppo."
-#: actions/apigroupjoin.php:138 actions/joingroup.php:128
+#: 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 %1$s al gruppo %2$s."
@@ -399,7 +407,7 @@ msgstr "Impossibile iscrivere l'utente %1$s al gruppo %2$s."
msgid "You are not a member of this group."
msgstr "Non fai parte di questo gruppo."
-#: 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 "Impossibile rimuovere l'utente %1$s dal gruppo %2$s."
@@ -419,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."
@@ -448,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 ""
@@ -604,30 +709,6 @@ msgstr "Carica"
msgid "Crop"
msgstr "Ritaglia"
-#: 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/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"
@@ -695,7 +776,7 @@ msgstr "Salvataggio delle informazioni per il blocco non riuscito."
#: actions/grouplogo.php:99 actions/groupmembers.php:83
#: actions/grouprss.php:98 actions/groupunblock.php:86
#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86
-#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263
+#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:260
msgid "No such group."
msgstr "Nessuna gruppo."
@@ -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
@@ -952,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"
@@ -973,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"
@@ -1042,7 +1206,8 @@ 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"
@@ -1679,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)"
@@ -1724,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"
@@ -1794,7 +1959,7 @@ msgstr ""
msgid "You must be logged in to join a group."
msgstr "Devi eseguire l'accesso per iscriverti a un gruppo."
-#: actions/joingroup.php:135
+#: actions/joingroup.php:131
#, php-format
msgid "%1$s joined group %2$s"
msgstr "%1$s fa ora parte del gruppo %2$s"
@@ -1803,15 +1968,11 @@ msgstr "%1$s fa ora parte del gruppo %2$s"
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
+#: actions/leavegroup.php:127
#, php-format
msgid "%1$s left group %2$s"
msgstr "%1$s ha lasciato il gruppo %2$s"
@@ -1837,17 +1998,6 @@ msgstr "Accedi"
msgid "Login to site"
msgstr "Accedi al sito"
-#: actions/login.php:230 actions/profilesettings.php:106
-#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94
-#: lib/groupeditform.php:152 lib/userprofile.php:131
-msgid "Nickname"
-msgstr "Soprannome"
-
-#: actions/login.php:233 actions/register.php:429
-#: lib/accountsettingsaction.php:116
-msgid "Password"
-msgstr "Password"
-
#: actions/login.php:236 actions/register.php:478
msgid "Remember me"
msgstr "Ricordami"
@@ -1901,6 +2051,29 @@ msgstr "Impossibile rendere %1$s un amministratore del gruppo %2$s"
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"
@@ -1913,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!"
@@ -1926,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."
@@ -2013,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"
@@ -2030,8 +2248,8 @@ msgstr "tipo di contenuto "
msgid "Only "
msgstr "Solo "
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033
-#: lib/api.php:1061 lib/api.php:1171
+#: 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."
@@ -2044,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
@@ -2078,27 +2297,27 @@ msgstr "Il servizio di riduzione degli URL è troppo lungo (max 50 caratteri)."
#: actions/otp.php:69
#, fuzzy
msgid "No user ID specified."
-msgstr "Nessun gruppo specificato."
+msgstr "Nessun ID utente specificato."
#: actions/otp.php:83
#, fuzzy
msgid "No login token specified."
-msgstr "Nessun messaggio specificato."
+msgstr "Nessun token di accesso specificato."
#: actions/otp.php:90
#, fuzzy
msgid "No login token requested."
-msgstr "Nessun ID di profilo nella richiesta."
+msgstr "Nessun token di accesso richiesto."
#: actions/otp.php:95
#, fuzzy
msgid "Invalid login token specified."
-msgstr "Token non valido o scaduto."
+msgstr "Token di accesso specificato non valido."
#: actions/otp.php:104
#, fuzzy
msgid "Login token expired."
-msgstr "Accedi al sito"
+msgstr "Token di accesso scaduto."
#: actions/outbox.php:61
#, php-format
@@ -2370,7 +2589,7 @@ msgid "Full name"
msgstr "Nome"
#: actions/profilesettings.php:115 actions/register.php:453
-#: lib/groupeditform.php:161
+#: lib/applicationeditform.php:230 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Pagina web"
@@ -2977,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."
@@ -3089,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"
@@ -3256,7 +3549,7 @@ msgstr "Devi avere un'email di contatto valida."
#: actions/siteadminpanel.php:172
#, fuzzy, php-format
msgid "Unknown language \"%s\"."
-msgstr "Lingua \"%s\" sconosciuta"
+msgstr "Lingua \"%s\" sconosciuta."
#: actions/siteadminpanel.php:179
msgid "Invalid snapshot report URL."
@@ -4016,10 +4309,6 @@ msgstr ""
msgid "Plugins"
msgstr "Plugin"
-#: actions/version.php:195
-msgid "Name"
-msgstr "Nome"
-
#: actions/version.php:196 lib/action.php:741
msgid "Version"
msgstr "Versione"
@@ -4028,10 +4317,6 @@ msgstr "Versione"
msgid "Author(s)"
msgstr "Autori"
-#: actions/version.php:198 lib/groupeditform.php:172
-msgid "Description"
-msgstr "Descrizione"
-
#: classes/File.php:144
#, php-format
msgid ""
@@ -4053,10 +4338,25 @@ 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
-#, fuzzy, php-format
+#, php-format
msgid "Could not create login token for %s"
-msgstr "Impossibile creare il token di accesso per %s."
+msgstr "Impossibile creare il token di accesso per %s"
#: classes/Message.php:45
msgid "You are banned from sending direct messages."
@@ -4070,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."
@@ -4098,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!"
@@ -4160,7 +4460,7 @@ msgstr "Altre opzioni"
#: lib/action.php:144
#, fuzzy, php-format
msgid "%1$s - %2$s"
-msgstr "%1$s (%2$s)"
+msgstr "%1$s - %2$s"
#: lib/action.php:159
msgid "Untitled page"
@@ -4179,10 +4479,6 @@ 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"
@@ -4336,10 +4632,6 @@ 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."
@@ -4372,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"
@@ -4392,11 +4750,11 @@ 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
+#: lib/authenticationplugin.php:214 lib/authenticationplugin.php:219
msgid "Password changing failed"
msgstr "Modifica della password non riuscita"
-#: lib/authenticationplugin.php:197
+#: lib/authenticationplugin.php:229
msgid "Password changing is not allowed"
msgstr "La modifica della password non è permessa"
@@ -4417,18 +4775,18 @@ msgid "Sorry, this command is not yet implemented."
msgstr "Questo comando non è ancora implementato."
#: lib/command.php:88
-#, fuzzy, php-format
+#, php-format
msgid "Could not find a user with nickname %s"
-msgstr "Impossibile trovare un utente col soprannome %s."
+msgstr "Impossibile trovare un utente col soprannome %s"
#: lib/command.php:92
msgid "It does not make a lot of sense to nudge yourself!"
msgstr "Non ha molto senso se cerchi di richiamarti!"
#: lib/command.php:99
-#, fuzzy, php-format
+#, php-format
msgid "Nudge sent to %s"
-msgstr "Richiamo inviato a %s."
+msgstr "Richiamo inviato a %s"
#: lib/command.php:126
#, php-format
@@ -4441,14 +4799,12 @@ msgstr ""
"Abbonati: %2$s\n"
"Messaggi: %3$s"
-#: lib/command.php:152 lib/command.php:399 lib/command.php:460
-#, fuzzy
+#: 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."
+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
+#: 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."
@@ -4457,180 +4813,174 @@ msgid "Notice marked as fave."
msgstr "Messaggio indicato come preferito."
#: lib/command.php:217
-#, fuzzy
msgid "You are already a member of that group"
-msgstr "Fai già parte di quel gruppo."
+msgstr "Fai già parte di quel gruppo"
-#: lib/command.php:234
-#, fuzzy, php-format
+#: 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:239
-#, fuzzy, php-format
+#: lib/command.php:236
+#, php-format
msgid "%s joined group %s"
-msgstr "%1$s fa ora parte del gruppo %2$s"
+msgstr "%s fa ora parte del gruppo %s"
-#: lib/command.php:284
-#, fuzzy, php-format
+#: 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:289
-#, fuzzy, php-format
+#: lib/command.php:280
+#, php-format
msgid "%s left group %s"
msgstr "%1$s ha lasciato il gruppo %2$s"
-#: lib/command.php:318
-#, fuzzy, php-format
+#: lib/command.php:309
+#, php-format
msgid "Fullname: %s"
msgstr "Nome completo: %s"
-#: lib/command.php:321 lib/mail.php:254
+#: lib/command.php:312 lib/mail.php:254
#, php-format
msgid "Location: %s"
msgstr "Posizione: %s"
-#: lib/command.php:324 lib/mail.php:256
+#: 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
+#: lib/command.php:349
+#, php-format
msgid "Message too long - maximum is %d characters, you sent %d"
-msgstr "Messaggio troppo lungo: massimo %1$d caratteri, inviati %2$d."
+msgstr "Messaggio troppo lungo: massimo %d caratteri, inviati %d"
-#: lib/command.php:376
-#, fuzzy, php-format
+#: 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:422
-#, fuzzy
+#: lib/command.php:413
msgid "Cannot repeat your own notice"
-msgstr "Non puoi ripetere un tuo messaggio."
+msgstr "Impossibile ripetere un proprio messaggio"
-#: lib/command.php:427
-#, fuzzy
+#: lib/command.php:418
msgid "Already repeated that notice"
-msgstr "Hai già ripetuto quel messaggio."
+msgstr "Hai già ripetuto quel messaggio"
-#: lib/command.php:435
-#, fuzzy, php-format
+#: lib/command.php:426
+#, php-format
msgid "Notice from %s repeated"
-msgstr "Messaggio da %s ripetuto."
+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
+#: lib/command.php:482
+#, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
-msgstr "Messaggio troppo lungo: massimo %1$d caratteri, inviati %2$d."
+msgstr "Messaggio troppo lungo: massimo %d caratteri, inviati %d"
-#: lib/command.php:500
-#, fuzzy, php-format
+#: lib/command.php:491
+#, php-format
msgid "Reply to %s sent"
-msgstr "Risposta a %s inviata."
+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
+#: 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
+#: 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
+#: lib/command.php:641
msgid "Login command is disabled"
-msgstr "Il comando di accesso è disabilitato."
+msgstr "Il comando di accesso è disabilitato"
-#: lib/command.php:661
-#, fuzzy, php-format
+#: 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."
+"minuti: %s"
-#: lib/command.php:677
+#: lib/command.php:668
msgid "You are not subscribed to anyone."
msgstr "Il tuo abbonamento è stato annullato."
-#: lib/command.php:679
+#: 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:699
+#: lib/command.php:690
msgid "No one is subscribed to you."
msgstr "Nessuno è abbonato ai tuoi messaggi."
-#: lib/command.php:701
+#: 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:721
+#: lib/command.php:712
msgid "You are not a member of any groups."
msgstr "Non fai parte di alcun gruppo."
-#: lib/command.php:723
+#: 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:737
+#: lib/command.php:728
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4710,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."
@@ -4740,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"
@@ -4925,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"
@@ -5320,14 +5684,16 @@ msgstr "Allega un file"
msgid "Share my location"
msgstr "Condividi la mia posizione"
-#: lib/noticeform.php:214
+#: lib/noticeform.php:215
#, fuzzy
msgid "Do not share my location"
msgstr "Non condividere la mia posizione"
-#: lib/noticeform.php:215
-msgid "Hide this info"
-msgstr "Nascondi info"
+#: lib/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
@@ -5586,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."
@@ -5676,47 +6042,47 @@ msgstr "Messaggio"
msgid "Moderate"
msgstr "Modera"
-#: lib/util.php:884
+#: lib/util.php:875
msgid "a few seconds ago"
msgstr "pochi secondi fa"
-#: lib/util.php:886
+#: lib/util.php:877
msgid "about a minute ago"
msgstr "circa un minuto fa"
-#: lib/util.php:888
+#: lib/util.php:879
#, php-format
msgid "about %d minutes ago"
msgstr "circa %d minuti fa"
-#: lib/util.php:890
+#: lib/util.php:881
msgid "about an hour ago"
msgstr "circa un'ora fa"
-#: lib/util.php:892
+#: lib/util.php:883
#, php-format
msgid "about %d hours ago"
msgstr "circa %d ore fa"
-#: lib/util.php:894
+#: lib/util.php:885
msgid "about a day ago"
msgstr "circa un giorno fa"
-#: lib/util.php:896
+#: lib/util.php:887
#, php-format
msgid "about %d days ago"
msgstr "circa %d giorni fa"
-#: lib/util.php:898
+#: lib/util.php:889
msgid "about a month ago"
msgstr "circa un mese fa"
-#: lib/util.php:900
+#: lib/util.php:891
#, php-format
msgid "about %d months ago"
msgstr "circa %d mesi fa"
-#: lib/util.php:902
+#: lib/util.php:893
msgid "about a year ago"
msgstr "circa un anno fa"
diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po
index 367e59916..e3eb8b28f 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-11 23:25+0000\n"
-"PO-Revision-Date: 2010-01-11 23:27:23+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 (r60950); 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,8 +36,8 @@ 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
@@ -46,15 +46,20 @@ msgstr "ãã®ã‚ˆã†ãªãƒšãƒ¼ã‚¸ã¯ã‚ã‚Šã¾ã›ã‚“。"
#: 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!"
@@ -134,7 +139,7 @@ msgstr "%2$s ã« %1$s ã¨å‹äººã‹ã‚‰ã®æ›´æ–°ãŒã‚ã‚Šã¾ã™ï¼"
#: 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/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
@@ -153,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 ãŒå¿…è¦ã§ã™ã€‚"
@@ -184,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 ""
@@ -265,18 +271,16 @@ msgid "No status found with that ID."
msgstr "ãã®ï¼©ï¼¤ã®ã‚¹ãƒ†ãƒ¼ã‚¿ã‚¹ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。"
#: actions/apifavoritecreate.php:119
-#, fuzzy
msgid "This status is already a favorite."
-msgstr "ã“ã®ã‚¹ãƒ†ãƒ¼ã‚¿ã‚¹ã¯ã™ã§ã«ãŠæ°—ã«å…¥ã‚Šã§ã™!"
+msgstr "ã“ã®ã‚¹ãƒ†ãƒ¼ã‚¿ã‚¹ã¯ã™ã§ã«ãŠæ°—ã«å…¥ã‚Šã§ã™ã€‚"
#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176
msgid "Could not create favorite."
msgstr "ãŠæ°—ã«å…¥ã‚Šã‚’作æˆã§ãã¾ã›ã‚“。"
#: actions/apifavoritedestroy.php:122
-#, fuzzy
msgid "That status is not a favorite."
-msgstr "ãã®ã‚¹ãƒ†ãƒ¼ã‚¿ã‚¹ã¯ãŠæ°—ã«å…¥ã‚Šã§ã¯ã‚ã‚Šã¾ã›ã‚“!"
+msgstr "ãã®ã‚¹ãƒ†ãƒ¼ã‚¿ã‚¹ã¯ãŠæ°—ã«å…¥ã‚Šã§ã¯ã‚ã‚Šã¾ã›ã‚“。"
#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
msgid "Could not delete favorite."
@@ -297,9 +301,8 @@ msgid "Could not unfollow user: User not found."
msgstr "利用者ã®ãƒ•ã‚©ãƒ­ãƒ¼ã‚’åœæ­¢ã§ãã¾ã›ã‚“ã§ã—ãŸ: 利用者ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。"
#: actions/apifriendshipsdestroy.php:120
-#, fuzzy
msgid "You cannot unfollow yourself."
-msgstr "自分自身をフォローåœæ­¢ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“ï¼"
+msgstr "自分自身をフォローåœæ­¢ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。"
#: actions/apifriendshipsexists.php:94
msgid "Two user ids or screen_names must be supplied."
@@ -333,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."
@@ -345,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字)"
@@ -393,19 +398,19 @@ msgstr "ã™ã§ã«ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã®ãƒ¡ãƒ³ãƒãƒ¼ã§ã™ã€‚"
msgid "You have been blocked from that group by the admin."
msgstr "管ç†è€…ã«ã‚ˆã£ã¦ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã‹ã‚‰ãƒ–ロックã•ã‚Œã¦ã„ã¾ã™ã€‚"
-#: actions/apigroupjoin.php:138 actions/joingroup.php:128
-#, 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 +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 アプリユーザã®å‰Šé™¤æ™‚DBエラー。"
+
+#: actions/apioauthauthorize.php:196
+msgid "DB error inserting OAuth app user."
+msgstr "OAuth アプリユーザã®è¿½åŠ æ™‚DBエラー。"
+
+#: 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 ãŒå¿…è¦ã§ã™ã€‚"
@@ -451,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 å­—ã¾ã§ã§ã™ã€‚"
@@ -471,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
@@ -605,29 +703,6 @@ msgstr "アップロード"
msgid "Crop"
msgstr "切りå–ã‚Š"
-#: 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/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 "ã‚ãªãŸã®ã‚¢ãƒã‚¿ãƒ¼ã¨ãªã‚‹ã‚¤ãƒ¡ãƒ¼ã‚¸ã‚’正方形ã§æŒ‡å®š"
@@ -696,7 +771,7 @@ msgstr "ブロック情報ã®ä¿å­˜ã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
#: actions/grouplogo.php:99 actions/groupmembers.php:83
#: actions/grouprss.php:98 actions/groupunblock.php:86
#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86
-#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263
+#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:260
msgid "No such group."
msgstr "ãã®ã‚ˆã†ãªã‚°ãƒ«ãƒ¼ãƒ—ã¯ã‚ã‚Šã¾ã›ã‚“。"
@@ -706,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."
@@ -765,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
@@ -953,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 "ä¿å­˜"
@@ -974,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 "ソース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"
@@ -985,7 +1131,6 @@ msgstr "グループを作るã«ã¯ãƒ­ã‚°ã‚¤ãƒ³ã—ã¦ã„ãªã‘ã‚Œã°ãªã‚Šã¾ã›
#: 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."
msgstr "グループを編集ã™ã‚‹ã«ã¯ç®¡ç†è€…ã§ã‚ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚"
@@ -1011,7 +1156,6 @@ msgid "Options saved."
msgstr "オプションãŒä¿å­˜ã•ã‚Œã¾ã—ãŸã€‚"
#: actions/emailsettings.php:60
-#, fuzzy
msgid "Email settings"
msgstr "メール設定"
@@ -1044,12 +1188,12 @@ 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
-#, fuzzy
msgid "Email address"
msgstr "メールアドレス"
@@ -1356,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"
@@ -1419,7 +1563,6 @@ msgstr ""
"%s。"
#: actions/grouplogo.php:178
-#, fuzzy
msgid "User without matching profile."
msgstr "åˆã£ã¦ã„るプロフィールã®ãªã„利用者"
@@ -1441,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."
@@ -1552,7 +1695,6 @@ msgid "Error removing the block."
msgstr "ブロックã®å‰Šé™¤ã‚¨ãƒ©ãƒ¼"
#: actions/imsettings.php:59
-#, fuzzy
msgid "IM settings"
msgstr "IM設定"
@@ -1583,7 +1725,6 @@ msgstr ""
"ãŸãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’確èªã—ã¦ãã ã•ã„。(%s ã‚’å‹äººãƒªã‚¹ãƒˆã«è¿½åŠ ã—ã¾ã—ãŸã‹ï¼Ÿ)"
#: actions/imsettings.php:124
-#, fuzzy
msgid "IM address"
msgstr "IMアドレス"
@@ -1683,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 ""
@@ -1729,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 "é€ã‚‹"
@@ -1799,27 +1940,23 @@ msgstr ""
msgid "You must be logged in to join a group."
msgstr "グループã«å…¥ã‚‹ãŸã‚ã«ã¯ãƒ­ã‚°ã‚¤ãƒ³ã—ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。"
-#: actions/joingroup.php:135
-#, 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
-#, 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:80 actions/otp.php:62 actions/register.php:137
msgid "Already logged in."
@@ -1842,17 +1979,6 @@ msgstr "ログイン"
msgid "Login to site"
msgstr "サイトã¸ãƒ­ã‚°ã‚¤ãƒ³"
-#: actions/login.php:230 actions/profilesettings.php:106
-#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94
-#: lib/groupeditform.php:152 lib/userprofile.php:131
-msgid "Nickname"
-msgstr "ニックãƒãƒ¼ãƒ "
-
-#: actions/login.php:233 actions/register.php:429
-#: lib/accountsettingsaction.php:116
-msgid "Password"
-msgstr "パスワード"
-
#: actions/login.php:236 actions/register.php:478
msgid "Remember me"
msgstr "ログイン状態をä¿æŒ"
@@ -1887,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
+#, php-format
msgid "Can't get membership record for %1$s in group %2$s."
-msgstr "%s ã®ä¼šå“¡è³‡æ ¼è¨˜éŒ²ã‚’グループ %s 中ã‹ã‚‰å–å¾—ã§ãã¾ã›ã‚“。"
+msgstr "%1$s ã®ä¼šå“¡è³‡æ ¼è¨˜éŒ²ã‚’グループ %2$s 中ã‹ã‚‰å–å¾—ã§ãã¾ã›ã‚“。"
#: actions/makeadmin.php:145
-#, fuzzy, php-format
+#, php-format
msgid "Can't make %1$s an admin for group %2$s."
-msgstr "%s をグループ %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 "æ–°ã—ã„グループ"
@@ -1917,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 "コンテンツãŒã‚ã‚Šã¾ã›ã‚“ï¼"
@@ -1930,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 ""
@@ -1941,7 +2087,7 @@ msgid "Message sent"
msgstr "メッセージをé€ã‚Šã¾ã—ãŸ"
#: actions/newmessage.php:185
-#, fuzzy, php-format
+#, php-format
msgid "Direct message to %s sent."
msgstr "ダイレクトメッセージを %s ã«é€ã‚Šã¾ã—ãŸ"
@@ -1970,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
@@ -2017,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 "ã¤ã¶ã‚„ãã«ã¯ãƒ—ロファイルã¯ã‚ã‚Šã¾ã›ã‚“。"
@@ -2034,8 +2224,8 @@ msgstr "内容種別 "
msgid "Only "
msgstr "ã ã‘ "
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033
-#: lib/api.php:1061 lib/api.php:1171
+#: 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 "サãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ãªã„データ形å¼ã€‚"
@@ -2048,7 +2238,7 @@ msgid "Notice Search"
msgstr "ã¤ã¶ã‚„ã検索"
#: actions/othersettings.php:60
-msgid "Other Settings"
+msgid "Other settings"
msgstr "ãã®ä»–ã®è¨­å®š"
#: actions/othersettings.php:71
@@ -2080,29 +2270,24 @@ msgid "URL shortening service is too long (max 50 chars)."
msgstr "URL 短縮サービスãŒé•·ã™ãŽã¾ã™ã€‚(最大50字)"
#: actions/otp.php:69
-#, fuzzy
msgid "No user ID specified."
-msgstr "グループ記述ãŒã‚ã‚Šã¾ã›ã‚“。"
+msgstr "利用者IDã®è¨˜è¿°ãŒã‚ã‚Šã¾ã›ã‚“。"
#: actions/otp.php:83
-#, fuzzy
msgid "No login token specified."
-msgstr "ã¤ã¶ã‚„ããŒã‚ã‚Šã¾ã›ã‚“。"
+msgstr "ログイントークンã®è¨˜è¿°ãŒã‚ã‚Šã¾ã›ã‚“。"
#: actions/otp.php:90
-#, fuzzy
msgid "No login token requested."
-msgstr "リクエスト内ã«ãƒ—ロファイルIDãŒã‚ã‚Šã¾ã›ã‚“。"
+msgstr "ログイントークンãŒè¦æ±‚ã•ã‚Œã¦ã„ã¾ã›ã‚“。"
#: actions/otp.php:95
-#, fuzzy
msgid "Invalid login token specified."
-msgstr "ä¸æ­£ã¾ãŸã¯æœŸé™åˆ‡ã‚Œã®ãƒˆãƒ¼ã‚¯ãƒ³"
+msgstr "ä¸æ­£ãªãƒ­ã‚°ã‚¤ãƒ³ãƒˆãƒ¼ã‚¯ãƒ³ãŒæŒ‡å®šã•ã‚Œã¦ã„ã¾ã™ã€‚"
#: actions/otp.php:104
-#, fuzzy
msgid "Login token expired."
-msgstr "サイトã¸ãƒ­ã‚°ã‚¤ãƒ³"
+msgstr "ログイントークンãŒæœŸé™åˆ‡ã‚Œã§ã™ãƒ»"
#: actions/outbox.php:61
#, php-format
@@ -2302,7 +2487,6 @@ msgid "When to use SSL"
msgstr "SSL 使用時"
#: actions/pathsadminpanel.php:308
-#, fuzzy
msgid "SSL server"
msgstr "SSLサーãƒ"
@@ -2333,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"
@@ -2372,7 +2557,7 @@ msgid "Full name"
msgstr "フルãƒãƒ¼ãƒ "
#: actions/profilesettings.php:115 actions/register.php:453
-#: lib/groupeditform.php:161
+#: lib/applicationeditform.php:230 lib/groupeditform.php:161
msgid "Homepage"
msgstr "ホームページ"
@@ -2465,7 +2650,6 @@ msgid "Couldn't update user for autosubscribe."
msgstr "自動フォローã®ãŸã‚ã®åˆ©ç”¨è€…ã‚’æ›´æ–°ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚"
#: actions/profilesettings.php:359
-#, fuzzy
msgid "Couldn't save location prefs."
msgstr "場所情報をä¿å­˜ã§ãã¾ã›ã‚“。"
@@ -2810,20 +2994,20 @@ 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:562
msgid ""
@@ -2939,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
@@ -2957,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
@@ -2978,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 "ãŠæ°—ã«å…¥ã‚Šã®ã¤ã¶ã‚„ãを検索ã§ãã¾ã›ã‚“。"
@@ -3091,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 "作æˆã•ã‚Œã¾ã—ãŸ"
@@ -3159,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
@@ -3184,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 ""
@@ -3197,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
@@ -3252,12 +3508,11 @@ msgid "Site name must have non-zero length."
msgstr "サイトåã¯é•·ã•0ã§ã¯ã„ã‘ã¾ã›ã‚“。"
#: actions/siteadminpanel.php:154
-#, fuzzy
msgid "You must have a valid contact email address."
msgstr "有効ãªé€£çµ¡ç”¨ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ãŒãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。"
#: actions/siteadminpanel.php:172
-#, fuzzy, php-format
+#, php-format
msgid "Unknown language \"%s\"."
msgstr "ä¸æ˜Žãªè¨€èªž \"%s\""
@@ -3443,7 +3698,6 @@ msgid "Save site settings"
msgstr "サイト設定ã®ä¿å­˜"
#: actions/smssettings.php:58
-#, fuzzy
msgid "SMS settings"
msgstr "SMS 設定"
@@ -3474,7 +3728,6 @@ msgid "Enter the code you received on your phone."
msgstr "ã‚ãªãŸãŒã‚ãªãŸã®é›»è©±ã§å—ã‘å–ã£ãŸã‚³ãƒ¼ãƒ‰ã‚’入れã¦ãã ã•ã„。"
#: actions/smssettings.php:138
-#, fuzzy
msgid "SMS phone number"
msgstr "SMS 電話番å·"
@@ -3566,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."
@@ -3607,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."
@@ -3736,12 +3989,12 @@ 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
@@ -3897,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
@@ -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,27 +4262,16 @@ 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:144
#, php-format
msgid ""
@@ -4051,8 +4294,20 @@ 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
-#, fuzzy, php-format
+#, php-format
msgid "Could not create login token for %s"
msgstr "%s 用ã®ãƒ­ã‚°ã‚¤ãƒ³ãƒ»ãƒˆãƒ¼ã‚¯ãƒ³ã‚’作æˆã§ãã¾ã›ã‚“ã§ã—ãŸ"
@@ -4068,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 "ãƒãƒƒã‚·ãƒ¥ã‚¿ã‚°è¿½åŠ  DB エラー: %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."
@@ -4095,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!"
@@ -4155,9 +4410,9 @@ msgid "Other options"
msgstr "ãã®ä»–ã®ã‚ªãƒ—ション"
#: lib/action.php:144
-#, fuzzy, php-format
+#, php-format
msgid "%1$s - %2$s"
-msgstr "%s ã¯ã‚°ãƒ«ãƒ¼ãƒ— %s ã«æ®‹ã‚Šã¾ã—ãŸã€‚"
+msgstr ""
#: lib/action.php:159
msgid "Untitled page"
@@ -4176,10 +4431,6 @@ 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 "メールアドレスã€ã‚¢ãƒã‚¿ãƒ¼ã€ãƒ‘スワードã€ãƒ—ロパティã®å¤‰æ›´"
@@ -4333,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."
@@ -4370,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 "添付"
@@ -4390,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 "パスワード変更ã¯è¨±å¯ã•ã‚Œã¦ã„ã¾ã›ã‚“"
@@ -4415,7 +4727,7 @@ msgid "Sorry, this command is not yet implemented."
msgstr "ã™ã¿ã¾ã›ã‚“ã€ã“ã®ã‚³ãƒžãƒ³ãƒ‰ã¯ã¾ã å®Ÿè£…ã•ã‚Œã¦ã„ã¾ã›ã‚“。"
#: lib/command.php:88
-#, fuzzy, php-format
+#, php-format
msgid "Could not find a user with nickname %s"
msgstr "ユーザを更新ã§ãã¾ã›ã‚“"
@@ -4424,7 +4736,7 @@ msgid "It does not make a lot of sense to nudge yourself!"
msgstr "ãã‚Œã¯è‡ªåˆ†è‡ªèº«ã¸ã®åˆå›³ã§å¤šãã¯æ„味ãŒã‚ã‚Šã¾ã›ã‚“!"
#: lib/command.php:99
-#, fuzzy, php-format
+#, php-format
msgid "Nudge sent to %s"
msgstr "%s ã¸åˆå›³ã‚’é€ã‚Šã¾ã—ãŸ"
@@ -4439,14 +4751,12 @@ msgstr ""
"フォローã•ã‚Œã¦ã„ã‚‹: %2$s\n"
"ã¤ã¶ã‚„ã: %3$s"
-#: lib/command.php:152 lib/command.php:399 lib/command.php:460
-#, fuzzy
+#: 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
+#: lib/command.php:168 lib/command.php:406 lib/command.php:467
+#: lib/command.php:523
msgid "User has no last notice"
msgstr "利用者ã¯ã¾ã ã¤ã¶ã‚„ã„ã¦ã„ã¾ã›ã‚“"
@@ -4455,175 +4765,169 @@ msgid "Notice marked as fave."
msgstr "ãŠæ°—ã«å…¥ã‚Šã«ã•ã‚Œã¦ã„ã‚‹ã¤ã¶ã‚„ã。"
#: lib/command.php:217
-#, fuzzy
msgid "You are already a member of that group"
-msgstr "ã™ã§ã«ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã®ãƒ¡ãƒ³ãƒãƒ¼ã§ã™ã€‚"
+msgstr "ã‚ãªãŸã¯æ—¢ã«ãã®ã‚°ãƒ«ãƒ¼ãƒ—ã«å‚加ã—ã¦ã„ã¾ã™ã€‚"
-#: lib/command.php:234
-#, fuzzy, php-format
+#: lib/command.php:231
+#, php-format
msgid "Could not join user %s to group %s"
-msgstr "利用者 %s ã¯ã‚°ãƒ«ãƒ¼ãƒ— %s ã«å‚加ã§ãã¾ã›ã‚“。"
+msgstr "利用者 %s ã¯ã‚°ãƒ«ãƒ¼ãƒ— %s ã«å‚加ã§ãã¾ã›ã‚“"
-#: lib/command.php:239
-#, fuzzy, php-format
+#: lib/command.php:236
+#, php-format
msgid "%s joined group %s"
msgstr "%s ã¯ã‚°ãƒ«ãƒ¼ãƒ— %s ã«å‚加ã—ã¾ã—ãŸ"
-#: lib/command.php:284
-#, fuzzy, php-format
+#: lib/command.php:275
+#, php-format
msgid "Could not remove user %s to group %s"
msgstr "利用者 %s をグループ %s ã‹ã‚‰å‰Šé™¤ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“"
-#: lib/command.php:289
-#, fuzzy, php-format
+#: lib/command.php:280
+#, php-format
msgid "%s left group %s"
msgstr "%s ã¯ã‚°ãƒ«ãƒ¼ãƒ— %s ã«æ®‹ã‚Šã¾ã—ãŸã€‚"
-#: lib/command.php:318
-#, fuzzy, php-format
+#: lib/command.php:309
+#, php-format
msgid "Fullname: %s"
msgstr "フルãƒãƒ¼ãƒ ï¼š %s"
-#: lib/command.php:321 lib/mail.php:254
+#: lib/command.php:312 lib/mail.php:254
#, php-format
msgid "Location: %s"
msgstr "場所: %s"
-#: lib/command.php:324 lib/mail.php:256
+#: 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
+#: 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
+#: 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:422
-#, fuzzy
+#: lib/command.php:413
msgid "Cannot repeat your own notice"
-msgstr "ã‚ãªãŸã®ã¤ã¶ã‚„ãã‚’ç¹°ã‚Šè¿”ã›ã¾ã›ã‚“。"
+msgstr "自分ã®ã¤ã¶ã‚„ãã‚’ç¹°ã‚Šè¿”ã™ã“ã¨ã¯ã§ãã¾ã›ã‚“"
-#: lib/command.php:427
-#, fuzzy
+#: lib/command.php:418
msgid "Already repeated that notice"
-msgstr "ã™ã§ã«ã¤ã¶ã‚„ãã‚’ç¹°ã‚Šè¿”ã—ã¦ã„ã¾ã™ã€‚"
+msgstr "ã™ã§ã«ã“ã®ã¤ã¶ã‚„ãã¯ç¹°ã‚Šè¿”ã•ã‚Œã¦ã„ã¾ã™"
-#: lib/command.php:435
-#, fuzzy, php-format
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: lib/command.php:641
msgid "Login command is disabled"
msgstr "ログインコマンドãŒç„¡åŠ¹ã«ãªã£ã¦ã„ã¾ã™ã€‚"
-#: lib/command.php:661
-#, fuzzy, php-format
+#: 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:677
+#: lib/command.php:668
msgid "You are not subscribed to anyone."
msgstr "ã‚ãªãŸã¯ã ã‚Œã«ã‚‚フォローã•ã‚Œã¦ã„ã¾ã›ã‚“。"
-#: lib/command.php:679
+#: lib/command.php:670
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "ã‚ãªãŸã¯ã“ã®äººã«ãƒ•ã‚©ãƒ­ãƒ¼ã•ã‚Œã¦ã„ã¾ã™:"
-#: lib/command.php:699
+#: lib/command.php:690
msgid "No one is subscribed to you."
msgstr "誰もフォローã—ã¦ã„ã¾ã›ã‚“。"
-#: lib/command.php:701
+#: lib/command.php:692
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "ã“ã®äººã¯ã‚ãªãŸã«ãƒ•ã‚©ãƒ­ãƒ¼ã•ã‚Œã¦ã„ã‚‹:"
-#: lib/command.php:721
+#: lib/command.php:712
msgid "You are not a member of any groups."
msgstr "ã‚ãªãŸã¯ã©ã®ã‚°ãƒ«ãƒ¼ãƒ—ã®ãƒ¡ãƒ³ãƒãƒ¼ã§ã‚‚ã‚ã‚Šã¾ã›ã‚“。"
-#: lib/command.php:723
+#: 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:737
+#: lib/command.php:728
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4664,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 "インストーラã¸ã€‚"
@@ -4694,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 "データベースエラー"
@@ -4878,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 "å‚加"
@@ -4963,11 +5280,9 @@ msgstr ""
"%8$s ã§ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã‹é€šçŸ¥ã‚ªãƒ—ションを変ãˆã¦ãã ã•ã„。\n"
#: lib/mail.php:258
-#, fuzzy, php-format
+#, php-format
msgid "Bio: %s"
-msgstr ""
-"自己紹介: %s\n"
-"\n"
+msgstr "自己紹介: %s"
#: lib/mail.php:286
#, php-format
@@ -5181,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."
@@ -5222,18 +5537,16 @@ msgid "File upload stopped by extension."
msgstr "エクステンションã«ã‚ˆã£ã¦ãƒ•ã‚¡ã‚¤ãƒ«ã‚¢ãƒƒãƒ—ロードを中止ã—ã¾ã—ãŸã€‚"
#: lib/mediafile.php:179 lib/mediafile.php:216
-#, fuzzy
msgid "File exceeds user's quota."
-msgstr "ファイルã¯ãƒ¦ãƒ¼ã‚¶ã®å‰²å½“ã¦ã‚’超ãˆã¦ã„ã¾ã™!"
+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
-#, fuzzy
msgid "Could not determine file's MIME type."
-msgstr "ファイルã®MIMEタイプを決定ã§ãã¾ã›ã‚“"
+msgstr "ファイルã®MIMEタイプを決定ã§ãã¾ã›ã‚“。"
#: lib/mediafile.php:270
#, php-format
@@ -5241,7 +5554,7 @@ msgid " Try using another %s format."
msgstr "別㮠%s フォーマットを試ã—ã¦ãã ã•ã„。"
#: lib/mediafile.php:275
-#, fuzzy, php-format
+#, php-format
msgid "%s is not a supported file type on this server."
msgstr "%s ã¯ã“ã®ã‚µãƒ¼ãƒã®ã‚µãƒãƒ¼ãƒˆã—ã¦ã„るファイルタイプã§ã¯ã‚ã‚Šã¾ã›ã‚“。"
@@ -5275,17 +5588,17 @@ msgid "Attach a file"
msgstr "ファイル添付"
#: lib/noticeform.php:212
-#, fuzzy
msgid "Share my location"
-msgstr "ã‚ãªãŸã®å ´æ‰€ã‚’共有"
+msgstr "ã‚ãªãŸã®å ´æ‰€ã‚’共有ã™ã‚‹"
-#: lib/noticeform.php:214
-#, fuzzy
+#: lib/noticeform.php:215
msgid "Do not share my location"
-msgstr "ã‚ãªãŸã®å ´æ‰€ã‚’共有"
+msgstr "ã‚ãªãŸã®å ´æ‰€ã‚’共有ã—ãªã„"
-#: lib/noticeform.php:215
-msgid "Hide this info"
+#: lib/noticeform.php:216
+msgid ""
+"Sorry, retrieving your geo location is taking longer than expected, please "
+"try again later"
msgstr ""
#: lib/noticelist.php:428
@@ -5407,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"
@@ -5550,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 "フォローを削除ã§ãã¾ã›ã‚“"
@@ -5641,47 +5953,47 @@ msgstr "メッセージ"
msgid "Moderate"
msgstr "å¸ä¼š"
-#: lib/util.php:884
+#: lib/util.php:875
msgid "a few seconds ago"
msgstr "数秒å‰"
-#: lib/util.php:886
+#: lib/util.php:877
msgid "about a minute ago"
msgstr "ç´„ 1 分å‰"
-#: lib/util.php:888
+#: lib/util.php:879
#, php-format
msgid "about %d minutes ago"
msgstr "ç´„ %d 分å‰"
-#: lib/util.php:890
+#: lib/util.php:881
msgid "about an hour ago"
msgstr "ç´„ 1 時間å‰"
-#: lib/util.php:892
+#: lib/util.php:883
#, php-format
msgid "about %d hours ago"
msgstr "ç´„ %d 時間å‰"
-#: lib/util.php:894
+#: lib/util.php:885
msgid "about a day ago"
msgstr "ç´„ 1 æ—¥å‰"
-#: lib/util.php:896
+#: lib/util.php:887
#, php-format
msgid "about %d days ago"
msgstr "ç´„ %d æ—¥å‰"
-#: lib/util.php:898
+#: lib/util.php:889
msgid "about a month ago"
msgstr "ç´„ 1 ヵ月å‰"
-#: lib/util.php:900
+#: lib/util.php:891
#, php-format
msgid "about %d months ago"
msgstr "ç´„ %d ヵ月å‰"
-#: lib/util.php:902
+#: lib/util.php:893
msgid "about a year ago"
msgstr "ç´„ 1 å¹´å‰"
@@ -5696,6 +6008,6 @@ msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr "%s ã¯æœ‰åŠ¹ãªè‰²ã§ã¯ã‚ã‚Šã¾ã›ã‚“! 3ã‹6ã®16進数を使ã£ã¦ãã ã•ã„。"
#: scripts/xmppdaemon.php:301
-#, fuzzy, php-format
+#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr "メッセージãŒé•·ã™ãŽã¾ã™ - 最大 %d å­—ã€ã‚ãªãŸãŒé€ã£ãŸã®ã¯ %d"
+msgstr "メッセージãŒé•·ã™ãŽã¾ã™ - 最大 %1$d å­—ã€ã‚ãªãŸãŒé€ã£ãŸã®ã¯ %2$d。"
diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po
index 0a2e4561e..9c5c45352 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-11 23:25+0000\n"
-"PO-Revision-Date: 2010-01-11 23:27:28+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 (r60950); 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,8 +33,8 @@ 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
@@ -43,15 +43,20 @@ msgstr "그러한 태그가 없습니다."
#: 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!"
@@ -126,7 +131,7 @@ msgstr "%1$s ë° %2$sì— ìžˆëŠ” ì¹œêµ¬ë“¤ì˜ ì—…ë°ì´íŠ¸!"
#: 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/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
@@ -146,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 "ì´ ë©”ì„œë“œëŠ” 등ë¡ì„ 요구합니다."
@@ -177,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 ""
@@ -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 "홈페ì´ì§€ 주소형ì‹ì´ 올바르지 않습니다."
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글ìž)"
@@ -391,7 +399,7 @@ msgstr "ë‹¹ì‹ ì€ ì´ë¯¸ ì´ ê·¸ë£¹ì˜ ë©¤ë²„ìž…ë‹ˆë‹¤."
msgid "You have been blocked from that group by the admin."
msgstr ""
-#: actions/apigroupjoin.php:138 actions/joingroup.php:128
+#: 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는 가입할 수 없습니다."
@@ -401,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 사용ìžë¥¼ 제거할 수 없습니다."
@@ -421,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 "ì´ ë©”ì„œë“œëŠ” ë“±ë¡ ë˜ëŠ” 삭제를 요구합니다."
@@ -453,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 ""
@@ -609,29 +712,6 @@ msgstr "올리기"
msgid "Crop"
msgstr "ìžë¥´ê¸°"
-#: 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/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 "ë‹¹ì‹ ì˜ ì•„ë°”íƒ€ê°€ ë  ì´ë¯¸ì§€ì˜ì—­ì„ 지정하세요."
@@ -699,7 +779,7 @@ msgstr "ì •ë³´ì°¨ë‹¨ì„ ì €ìž¥í•˜ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤."
#: actions/grouplogo.php:99 actions/groupmembers.php:83
#: actions/grouprss.php:98 actions/groupunblock.php:86
#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86
-#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263
+#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:260
msgid "No such group."
msgstr "그러한 ê·¸ë£¹ì´ ì—†ìŠµë‹ˆë‹¤."
@@ -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
@@ -971,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 "저장"
@@ -992,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"
@@ -1063,7 +1225,8 @@ 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 "취소"
@@ -1702,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)"
@@ -1745,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 "보내기"
@@ -1810,7 +1973,7 @@ msgstr ""
msgid "You must be logged in to join a group."
msgstr "ê·¸ë£¹ê°€ìž…ì„ ìœ„í•´ì„œëŠ” 로그ì¸ì´ 필요합니다."
-#: actions/joingroup.php:135
+#: actions/joingroup.php:131
#, fuzzy, php-format
msgid "%1$s joined group %2$s"
msgstr "%s 는 그룹 %sì— ê°€ìž…í–ˆìŠµë‹ˆë‹¤."
@@ -1819,15 +1982,11 @@ 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
+#: actions/leavegroup.php:127
#, fuzzy, php-format
msgid "%1$s left group %2$s"
msgstr "%s가 그룹%s를 떠났습니다."
@@ -1854,17 +2013,6 @@ msgstr "로그ì¸"
msgid "Login to site"
msgstr "사ì´íŠ¸ì— 로그ì¸í•˜ì„¸ìš”."
-#: actions/login.php:230 actions/profilesettings.php:106
-#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94
-#: lib/groupeditform.php:152 lib/userprofile.php:131
-msgid "Nickname"
-msgstr "별명"
-
-#: actions/login.php:233 actions/register.php:429
-#: lib/accountsettingsaction.php:116
-msgid "Password"
-msgstr "비밀 번호"
-
#: actions/login.php:236 actions/register.php:478
msgid "Remember me"
msgstr "ìžë™ 로그ì¸"
@@ -1917,6 +2065,29 @@ msgstr "관리ìžë§Œ ê·¸ë£¹ì„ íŽ¸ì§‘í•  수 있습니다."
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 "새로운 그룹"
@@ -1929,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 "ë‚´ìš©ì´ ì—†ìŠµë‹ˆë‹¤!"
@@ -1942,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 ""
@@ -2026,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 "í†µì§€ì— í”„ë¡œí•„ì´ ì—†ìŠµë‹ˆë‹¤."
@@ -2044,8 +2260,8 @@ msgstr "ì—°ê²°"
msgid "Only "
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033
-#: lib/api.php:1061 lib/api.php:1171
+#: 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 "지ì›í•˜ëŠ” 형ì‹ì˜ ë°ì´í„°ê°€ 아닙니다."
@@ -2058,7 +2274,8 @@ msgid "Notice Search"
msgstr "통지 검색"
#: actions/othersettings.php:60
-msgid "Other Settings"
+#, fuzzy
+msgid "Other settings"
msgstr "기타 설정"
#: actions/othersettings.php:71
@@ -2391,7 +2608,7 @@ msgid "Full name"
msgstr "실명"
#: actions/profilesettings.php:115 actions/register.php:453
-#: lib/groupeditform.php:161
+#: lib/applicationeditform.php:230 lib/groupeditform.php:161
msgid "Homepage"
msgstr "홈페ì´ì§€"
@@ -2988,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 "좋아하는 ê²Œì‹œê¸€ì„ ë³µêµ¬í•  수 없습니다."
@@ -3093,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"
@@ -4004,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"
@@ -4018,10 +4304,6 @@ msgstr "ê°œì¸ì ì¸"
msgid "Author(s)"
msgstr ""
-#: actions/version.php:198 lib/groupeditform.php:172
-msgid "Description"
-msgstr "설명"
-
#: classes/File.php:144
#, php-format
msgid ""
@@ -4039,6 +4321,21 @@ msgstr ""
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"
@@ -4057,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 "
@@ -4087,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까지 메시지"
@@ -4169,10 +4466,6 @@ 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 "ë‹¹ì‹ ì˜ ì´ë©”ì¼, 아바타, 비밀 번호, í”„ë¡œí•„ì„ ë³€ê²½í•˜ì„¸ìš”."
@@ -4330,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."
@@ -4374,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 ""
@@ -4395,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 "비밀번호 변경"
@@ -4443,14 +4798,13 @@ 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"
msgstr "해당 idì˜ í”„ë¡œí•„ì´ ì—†ìŠµë‹ˆë‹¤."
-#: lib/command.php:168 lib/command.php:415 lib/command.php:476
-#: lib/command.php:532
-#, fuzzy
+#: lib/command.php:168 lib/command.php:406 lib/command.php:467
+#: lib/command.php:523
msgid "User has no last notice"
msgstr "ì´ìš©ìžì˜ 지ì†ì ì¸ ê²Œì‹œê¸€ì´ ì—†ìŠµë‹ˆë‹¤."
@@ -4459,179 +4813,176 @@ msgid "Notice marked as fave."
msgstr "ê²Œì‹œê¸€ì´ ì¢‹ì•„í•˜ëŠ” 글로 지정ë˜ì—ˆìŠµë‹ˆë‹¤."
#: lib/command.php:217
-#, fuzzy
msgid "You are already a member of that group"
msgstr "ë‹¹ì‹ ì€ ì´ë¯¸ ì´ ê·¸ë£¹ì˜ ë©¤ë²„ìž…ë‹ˆë‹¤."
-#: lib/command.php:234
-#, fuzzy, php-format
+#: lib/command.php:231
+#, php-format
msgid "Could not join user %s to group %s"
msgstr "그룹 %sì— %s는 가입할 수 없습니다."
-#: lib/command.php:239
-#, fuzzy, php-format
+#: lib/command.php:236
+#, php-format
msgid "%s joined group %s"
msgstr "%s 는 그룹 %sì— ê°€ìž…í–ˆìŠµë‹ˆë‹¤."
-#: lib/command.php:284
-#, fuzzy, php-format
+#: lib/command.php:275
+#, php-format
msgid "Could not remove user %s to group %s"
msgstr "그룹 %sì—ì„œ %s 사용ìžë¥¼ 제거할 수 없습니다."
-#: lib/command.php:289
-#, fuzzy, php-format
+#: lib/command.php:280
+#, php-format
msgid "%s left group %s"
msgstr "%s가 그룹%s를 떠났습니다."
-#: lib/command.php:318
-#, fuzzy, php-format
+#: lib/command.php:309
+#, php-format
msgid "Fullname: %s"
msgstr "ì „ì²´ì´ë¦„: %s"
-#: lib/command.php:321 lib/mail.php:254
+#: lib/command.php:312 lib/mail.php:254
#, php-format
msgid "Location: %s"
msgstr "위치: %s"
-#: lib/command.php:324 lib/mail.php:256
+#: 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 %d characters, you sent %d"
msgstr "ë‹¹ì‹ ì´ ë³´ë‚¸ 메시지가 너무 길어요. 최대 140글ìžê¹Œì§€ìž…니다."
-#: lib/command.php:376
-#, fuzzy, php-format
+#: 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:422
+#: lib/command.php:413
#, fuzzy
msgid "Cannot repeat your own notice"
msgstr "ì•Œë¦¼ì„ ì¼¤ 수 없습니다."
-#: lib/command.php:427
+#: lib/command.php:418
#, fuzzy
msgid "Already repeated that notice"
msgstr "ì´ ê²Œì‹œê¸€ 삭제하기"
-#: lib/command.php:435
+#: lib/command.php:426
#, fuzzy, php-format
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 %d characters, you sent %d"
msgstr "ë‹¹ì‹ ì´ ë³´ë‚¸ 메시지가 너무 길어요. 최대 140글ìžê¹Œì§€ìž…니다."
-#: lib/command.php:500
+#: lib/command.php:491
#, fuzzy, php-format
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
+#: 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
+#: 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
+#: lib/command.php:641
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:661
+#: lib/command.php:652
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:677
+#: lib/command.php:668
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "ë‹¹ì‹ ì€ ì´ í”„ë¡œí•„ì— êµ¬ë…ë˜ì§€ 않고있습니다."
-#: lib/command.php:679
+#: lib/command.php:670
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "ë‹¹ì‹ ì€ ë‹¤ìŒ ì‚¬ìš©ìžë¥¼ ì´ë¯¸ 구ë…하고 있습니다."
-#: lib/command.php:699
+#: lib/command.php:690
#, fuzzy
msgid "No one is subscribed to you."
msgstr "다른 ì‚¬ëžŒì„ êµ¬ë… í•˜ì‹¤ 수 없습니다."
-#: lib/command.php:701
+#: lib/command.php:692
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "다른 ì‚¬ëžŒì„ êµ¬ë… í•˜ì‹¤ 수 없습니다."
-#: lib/command.php:721
+#: lib/command.php:712
#, fuzzy
msgid "You are not a member of any groups."
msgstr "ë‹¹ì‹ ì€ í•´ë‹¹ ê·¸ë£¹ì˜ ë©¤ë²„ê°€ 아닙니다."
-#: lib/command.php:723
+#: 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:737
+#: lib/command.php:728
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4672,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 "ì´ ì‚¬ì´íŠ¸ 로그ì¸"
@@ -4702,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 ""
@@ -4889,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 "가입"
@@ -5205,13 +5570,15 @@ msgstr ""
msgid "Share my location"
msgstr "태그를 저장할 수 없습니다."
-#: lib/noticeform.php:214
+#: lib/noticeform.php:215
#, fuzzy
msgid "Do not share my location"
msgstr "태그를 저장할 수 없습니다."
-#: lib/noticeform.php:215
-msgid "Hide this info"
+#: lib/noticeform.php:216
+msgid ""
+"Sorry, retrieving your geo location is taking longer than expected, please "
+"try again later"
msgstr ""
#: lib/noticelist.php:428
@@ -5488,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 "예약 구ë…ì„ ì‚­ì œ í•  수 없습니다."
@@ -5584,47 +5951,47 @@ msgstr "메시지"
msgid "Moderate"
msgstr ""
-#: lib/util.php:884
+#: lib/util.php:875
msgid "a few seconds ago"
msgstr "몇 초 전"
-#: lib/util.php:886
+#: lib/util.php:877
msgid "about a minute ago"
msgstr "1분 전"
-#: lib/util.php:888
+#: lib/util.php:879
#, php-format
msgid "about %d minutes ago"
msgstr "%d분 전"
-#: lib/util.php:890
+#: lib/util.php:881
msgid "about an hour ago"
msgstr "1시간 전"
-#: lib/util.php:892
+#: lib/util.php:883
#, php-format
msgid "about %d hours ago"
msgstr "%d시간 전"
-#: lib/util.php:894
+#: lib/util.php:885
msgid "about a day ago"
msgstr "하루 전"
-#: lib/util.php:896
+#: lib/util.php:887
#, php-format
msgid "about %d days ago"
msgstr "%dì¼ ì „"
-#: lib/util.php:898
+#: lib/util.php:889
msgid "about a month ago"
msgstr "1달 전"
-#: lib/util.php:900
+#: lib/util.php:891
#, php-format
msgid "about %d months ago"
msgstr "%d달 전"
-#: lib/util.php:902
+#: lib/util.php:893
msgid "about a year ago"
msgstr "1ë…„ ì „"
diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po
index 48495e59f..30b717056 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-11 23:25+0000\n"
-"PO-Revision-Date: 2010-01-11 23:27:31+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 (r60950); 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,8 +34,8 @@ 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
@@ -44,15 +44,20 @@ msgstr "Ðема таква Ñтраница"
#: 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"
@@ -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!"
@@ -135,7 +140,7 @@ msgstr "Подновувања од %1$s и пријатели на %2$s!"
#: 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/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
@@ -154,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."
@@ -185,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 ""
@@ -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 знаци)."
@@ -391,7 +399,7 @@ msgstr "Веќе членувате во таа група."
msgid "You have been blocked from that group by the admin."
msgstr "Блокирани Ñте од таа група од админиÑтраторот."
-#: actions/apigroupjoin.php:138 actions/joingroup.php:128
+#: actions/apigroupjoin.php:138 actions/joingroup.php:124
#, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "Ðе можам да го зачленам кориÑникот %1$s во групата 2$s."
@@ -400,7 +408,7 @@ msgstr "Ðе можам да го зачленам кориÑникот %1$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
#, php-format
msgid "Could not remove user %1$s from group %2$s."
msgstr "Ðе можев да го отÑтранам кориÑникот %1$s од групата %2$s."
@@ -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."
@@ -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 ""
@@ -607,29 +708,6 @@ msgstr "Подигни"
msgid "Crop"
msgstr "ОтÑечи"
-#: 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/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 "Одберете квадратна површина од Ñликата за аватар"
@@ -698,7 +776,7 @@ msgstr "Ðе можев да ги Ñнимам инофрмациите за бÐ
#: actions/grouplogo.php:99 actions/groupmembers.php:83
#: actions/grouprss.php:98 actions/groupunblock.php:86
#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86
-#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263
+#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:260
msgid "No such group."
msgstr "Ðема таква група."
@@ -767,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
@@ -955,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 "Зачувај"
@@ -976,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"
@@ -1044,7 +1193,8 @@ 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 "Откажи"
@@ -1684,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)"
@@ -1730,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 "ИÑпрати"
@@ -1800,7 +1950,7 @@ msgstr ""
msgid "You must be logged in to join a group."
msgstr "Мора да Ñте најавени за да можете да Ñе зачлените во група."
-#: actions/joingroup.php:135
+#: actions/joingroup.php:131
#, php-format
msgid "%1$s joined group %2$s"
msgstr "%1$s Ñе зачлени во групата %2$s"
@@ -1809,15 +1959,11 @@ msgstr "%1$s Ñе зачлени во групата %2$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
+#: actions/leavegroup.php:127
#, php-format
msgid "%1$s left group %2$s"
msgstr "%1$s ја напушти групата %2$s"
@@ -1843,17 +1989,6 @@ msgstr "Ðајава"
msgid "Login to site"
msgstr "Ðајавете Ñе"
-#: actions/login.php:230 actions/profilesettings.php:106
-#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94
-#: lib/groupeditform.php:152 lib/userprofile.php:131
-msgid "Nickname"
-msgstr "Прекар"
-
-#: actions/login.php:233 actions/register.php:429
-#: lib/accountsettingsaction.php:116
-msgid "Password"
-msgstr "Лозинка"
-
#: actions/login.php:236 actions/register.php:478
msgid "Remember me"
msgstr "Запамети ме"
@@ -1907,6 +2042,26 @@ msgstr "Ðе можам да го направам кориÑникот %1$s аÐ
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 "Ðова група"
@@ -1919,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 "Ðема Ñодржина!"
@@ -1932,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 ""
@@ -2022,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 "Забелешката нема профил"
@@ -2039,8 +2237,8 @@ msgstr "тип на Ñодржини "
msgid "Only "
msgstr "Само "
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033
-#: lib/api.php:1061 lib/api.php:1171
+#: 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 "Ова не е поддржан формат на податотека."
@@ -2053,7 +2251,7 @@ msgid "Notice Search"
msgstr "Пребарување на забелешки"
#: actions/othersettings.php:60
-msgid "Other Settings"
+msgid "Other settings"
msgstr "Други нагодувања"
#: actions/othersettings.php:71
@@ -2085,29 +2283,24 @@ msgid "URL shortening service is too long (max 50 chars)."
msgstr "УÑлугата за Ñкратување на URL-адреÑи е предолга (највеќе до 50 знаци)."
#: actions/otp.php:69
-#, fuzzy
msgid "No user ID specified."
-msgstr "Ðема назначено група."
+msgstr "Ðема назначено кориÑнички ID."
#: actions/otp.php:83
-#, fuzzy
msgid "No login token specified."
-msgstr "Ðема назначено забелешка."
+msgstr "Ðема назначено најавен жетон."
#: actions/otp.php:90
-#, fuzzy
msgid "No login token requested."
-msgstr "Во барањето нема id на профилот."
+msgstr "Ðе е побаран најавен жетон."
#: actions/otp.php:95
-#, fuzzy
msgid "Invalid login token specified."
-msgstr "Ðеважечки или иÑтечен жетон."
+msgstr "Ðазначен е неважечки најавен жетон."
#: actions/otp.php:104
-#, fuzzy
msgid "Login token expired."
-msgstr "Ðајавете Ñе"
+msgstr "Ðајавниот жетон е иÑтечен."
#: actions/outbox.php:61
#, php-format
@@ -2117,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
@@ -2379,7 +2572,7 @@ msgid "Full name"
msgstr "Цело име"
#: actions/profilesettings.php:115 actions/register.php:453
-#: lib/groupeditform.php:161
+#: lib/applicationeditform.php:230 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Домашна Ñтраница"
@@ -2991,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 "Ðе можев да ги вратам омилените забелешки."
@@ -3104,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 "Создадено"
@@ -3510,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."
@@ -3534,7 +3799,7 @@ msgstr "Ова е погрешен потврден број."
#: actions/smssettings.php:405
msgid "That is not your phone number."
-msgstr "Тоа не е вашиот телефонÑки број."
+msgstr "Тоа не е Вашиот телефонÑки број."
#: actions/smssettings.php:465
msgid "Mobile carrier"
@@ -4036,10 +4301,6 @@ msgstr ""
msgid "Plugins"
msgstr "Приклучоци"
-#: actions/version.php:195
-msgid "Name"
-msgstr "Име"
-
#: actions/version.php:196 lib/action.php:741
msgid "Version"
msgstr "Верзија"
@@ -4048,10 +4309,6 @@ msgstr "Верзија"
msgid "Author(s)"
msgstr "Ðвтор(и)"
-#: actions/version.php:198 lib/groupeditform.php:172
-msgid "Description"
-msgstr "ОпиÑ"
-
#: classes/File.php:144
#, php-format
msgid ""
@@ -4072,10 +4329,22 @@ msgstr ""
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
-#, fuzzy, php-format
+#, php-format
msgid "Could not create login token for %s"
-msgstr "Ðе можам да Ñоздадам најавен жетон за %s."
+msgstr "Ðе можам да Ñоздадам најавен жетон за"
#: classes/Message.php:45
msgid "You are banned from sending direct messages."
@@ -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!"
@@ -4177,9 +4446,9 @@ msgid "Other options"
msgstr "Други нагодувања"
#: lib/action.php:144
-#, fuzzy, php-format
+#, php-format
msgid "%1$s - %2$s"
-msgstr "%1$s (%2$s)"
+msgstr "%1$s - %2$s"
#: lib/action.php:159
msgid "Untitled page"
@@ -4198,10 +4467,6 @@ 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 "Промена на е-пошта, аватар, лозинка, профил"
@@ -4355,10 +4620,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 "Ðе можете да ја менувате оваа веб-Ñтраница."
@@ -4391,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 "Прилози"
@@ -4411,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 "Менувањето на лозинка не е дозволено"
@@ -4436,18 +4759,18 @@ msgid "Sorry, this command is not yet implemented."
msgstr "Жалиме, оваа наредба Ñè уште не е имплементирана."
#: lib/command.php:88
-#, fuzzy, php-format
+#, php-format
msgid "Could not find a user with nickname %s"
-msgstr "Ðе можев да пронајдам кориÑник Ñо прекар %s."
+msgstr "Ðе можев да пронајдам кориÑник Ñо прекар %s"
#: lib/command.php:92
msgid "It does not make a lot of sense to nudge yourself!"
msgstr "Ðема баш логика да Ñе подбуцнувате Ñами ÑебеÑи."
#: lib/command.php:99
-#, fuzzy, php-format
+#, php-format
msgid "Nudge sent to %s"
-msgstr "ИÑпратено подбуцнување на %s."
+msgstr "ИÑпратено подбуцнување на %s"
#: lib/command.php:126
#, php-format
@@ -4460,14 +4783,12 @@ msgstr ""
"Претплатници: %2$s\n"
"Забелешки: %3$s"
-#: lib/command.php:152 lib/command.php:399 lib/command.php:460
-#, fuzzy
+#: lib/command.php:152 lib/command.php:390 lib/command.php:451
msgid "Notice with that id does not exist"
-msgstr "Ðе поÑтои забелешка Ñо таков id."
+msgstr "Ðе поÑтои забелешка Ñо таков id"
-#: lib/command.php:168 lib/command.php:415 lib/command.php:476
-#: lib/command.php:532
-#, fuzzy
+#: lib/command.php:168 lib/command.php:406 lib/command.php:467
+#: lib/command.php:523
msgid "User has no last notice"
msgstr "КориÑникот нема поÑледна забелешка"
@@ -4476,181 +4797,175 @@ msgid "Notice marked as fave."
msgstr "Забелешката е обележана како омилена."
#: lib/command.php:217
-#, fuzzy
msgid "You are already a member of that group"
-msgstr "Веќе членувате во таа група."
+msgstr "Веќе членувате во таа група"
-#: lib/command.php:234
-#, fuzzy, php-format
+#: lib/command.php:231
+#, php-format
msgid "Could not join user %s to group %s"
-msgstr "Ðе можам да го зачленам кориÑникот %1$s во групата 2$s."
+msgstr "Ðе можев да го зачленам кориÑникот %s во групата %s"
-#: lib/command.php:239
-#, fuzzy, php-format
+#: lib/command.php:236
+#, php-format
msgid "%s joined group %s"
-msgstr "%1$s Ñе зачлени во групата %2$s"
+msgstr "%s Ñе зачлени во групата %s"
-#: lib/command.php:284
-#, fuzzy, php-format
+#: lib/command.php:275
+#, php-format
msgid "Could not remove user %s to group %s"
-msgstr "Ðе можев да го отÑтранам кориÑникот %1$s од групата %2$s."
+msgstr "Ðе можев да го отÑтранам кориÑникот %s од групата %s"
-#: lib/command.php:289
-#, fuzzy, php-format
+#: lib/command.php:280
+#, php-format
msgid "%s left group %s"
-msgstr "%1$s ја напушти групата %2$s"
+msgstr "%s ја напушти групата %s"
-#: lib/command.php:318
-#, fuzzy, php-format
+#: lib/command.php:309
+#, php-format
msgid "Fullname: %s"
msgstr "Име и презиме: %s"
-#: lib/command.php:321 lib/mail.php:254
+#: lib/command.php:312 lib/mail.php:254
#, php-format
msgid "Location: %s"
msgstr "Локација: %s"
-#: lib/command.php:324 lib/mail.php:256
+#: 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
+#: lib/command.php:349
+#, php-format
msgid "Message too long - maximum is %d characters, you sent %d"
msgstr ""
-"Пораката е предолга - дозволени Ñе највеќе %1$d знаци, а вие иÑпративте %2$d."
+"Пораката е предолга - дозволени Ñе највеќе %d знаци, а вие иÑпративте %d"
-#: lib/command.php:376
-#, fuzzy, php-format
+#: lib/command.php:367
+#, php-format
msgid "Direct message to %s sent"
-msgstr "Директната порака до %s е иÑпратена."
+msgstr "Директната порака до %s е иÑпратена"
-#: lib/command.php:378
+#: lib/command.php:369
msgid "Error sending direct message."
msgstr "Грашка при иÑпаќањето на директната порака."
-#: lib/command.php:422
-#, fuzzy
+#: lib/command.php:413
msgid "Cannot repeat your own notice"
-msgstr "Ðе можете да ја повторувате ÑопÑтвената забелешка."
+msgstr "Ðе можете да повторувате ÑопÑтвени забалешки"
-#: lib/command.php:427
-#, fuzzy
+#: lib/command.php:418
msgid "Already repeated that notice"
-msgstr "Забелешката е веќе повторена."
+msgstr "Оваа забелешка е веќе повторена"
-#: lib/command.php:435
-#, fuzzy, php-format
+#: lib/command.php:426
+#, php-format
msgid "Notice from %s repeated"
-msgstr "Забелешката од %s е повторена."
+msgstr "Забелешката од %s е повторена"
-#: lib/command.php:437
+#: lib/command.php:428
msgid "Error repeating notice."
msgstr "Грешка при повторувањето на белешката."
-#: lib/command.php:491
-#, fuzzy, php-format
+#: lib/command.php:482
+#, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr ""
-"Забелешката е предолга - треба да нема повеќе од %1$d знаци, а Вие "
-"иÑпративте %2$d."
+"Забелешката е предолга - треба да нема повеќе од %d знаци, а Вие иÑпративте %"
+"d"
-#: lib/command.php:500
-#, fuzzy, php-format
+#: lib/command.php:491
+#, php-format
msgid "Reply to %s sent"
-msgstr "Одговорот на %s е иÑпратен."
+msgstr "Одговорот на %s е иÑпратен"
-#: lib/command.php:502
+#: lib/command.php:493
msgid "Error saving notice."
msgstr "Грешка при зачувувањето на белешката."
-#: lib/command.php:556
-#, fuzzy
+#: lib/command.php:547
msgid "Specify the name of the user to subscribe to"
-msgstr "Ðазначете го името на кориÑникот на којшто Ñакате да Ñе претплатите."
+msgstr "Ðазначете го името на кориÑникот на којшто Ñакате да Ñе претплатите"
-#: lib/command.php:563
+#: lib/command.php:554
#, php-format
msgid "Subscribed to %s"
msgstr "Претплатено на %s"
-#: lib/command.php:584
-#, fuzzy
+#: 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
+#: lib/command.php:641
msgid "Login command is disabled"
-msgstr "Ðаредбата за најава е оневозможена."
+msgstr "Ðаредбата за најава е оневозможена"
-#: lib/command.php:661
-#, fuzzy, php-format
+#: lib/command.php:652
+#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
-msgstr "Оваа врÑка може да Ñе употреби Ñамо еднаш, и трае Ñамо 2 минути: %s."
+msgstr "Оваа врÑка може да Ñе употреби Ñамо еднаш, и трае Ñамо 2 минути: %s"
-#: lib/command.php:677
+#: lib/command.php:668
msgid "You are not subscribed to anyone."
msgstr "Ðе Ñте претплатени никому."
-#: lib/command.php:679
+#: 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:699
+#: lib/command.php:690
msgid "No one is subscribed to you."
msgstr "Ðикој не е претплатен на ВаÑ."
-#: lib/command.php:701
+#: 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:721
+#: lib/command.php:712
msgid "You are not a member of any groups."
msgstr "Ðе членувате во ниедна група."
-#: lib/command.php:723
+#: 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:737
+#: lib/command.php:728
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4728,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 "Оди на инÑталаторот."
@@ -4756,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 "Грешка во базата на податоци"
@@ -4942,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 "Придружи Ñе"
@@ -5338,18 +5666,20 @@ msgid "Attach a file"
msgstr "Прикажи податотека"
#: lib/noticeform.php:212
-#, fuzzy
msgid "Share my location"
msgstr "Споделете ја мојата локација."
-#: lib/noticeform.php:214
-#, fuzzy
+#: lib/noticeform.php:215
msgid "Do not share my location"
-msgstr "Ðе ја Ñподелувај мојата локација."
+msgstr "Ðе ја прикажувај мојата локација"
-#: lib/noticeform.php:215
-msgid "Hide this info"
-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
@@ -5608,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 "Претплата не може да Ñе избрише."
@@ -5699,47 +6029,47 @@ msgstr "Порака"
msgid "Moderate"
msgstr "Модерирај"
-#: lib/util.php:884
+#: lib/util.php:875
msgid "a few seconds ago"
msgstr "пред неколку Ñекунди"
-#: lib/util.php:886
+#: lib/util.php:877
msgid "about a minute ago"
msgstr "пред една минута"
-#: lib/util.php:888
+#: lib/util.php:879
#, php-format
msgid "about %d minutes ago"
msgstr "пред %d минути"
-#: lib/util.php:890
+#: lib/util.php:881
msgid "about an hour ago"
msgstr "пред еден чаÑ"
-#: lib/util.php:892
+#: lib/util.php:883
#, php-format
msgid "about %d hours ago"
msgstr "пред %d чаÑа"
-#: lib/util.php:894
+#: lib/util.php:885
msgid "about a day ago"
msgstr "пред еден ден"
-#: lib/util.php:896
+#: lib/util.php:887
#, php-format
msgid "about %d days ago"
msgstr "пред %d денови"
-#: lib/util.php:898
+#: lib/util.php:889
msgid "about a month ago"
msgstr "пред еден меÑец"
-#: lib/util.php:900
+#: lib/util.php:891
#, php-format
msgid "about %d months ago"
msgstr "пред %d меÑеца"
-#: lib/util.php:902
+#: lib/util.php:893
msgid "about a year ago"
msgstr "пред една година"
diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po
index 5ff0bfa91..a0e92f8fd 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-11 23:25+0000\n"
-"PO-Revision-Date: 2010-01-11 23:27:35+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 (r60950); 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,8 +33,8 @@ 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
@@ -43,15 +43,20 @@ msgstr "Ingen slik side"
#: 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!"
@@ -132,7 +137,7 @@ msgstr "Oppdateringer fra %1$s og venner på %2$s!"
#: 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/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
@@ -152,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."
@@ -183,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 ""
@@ -332,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."
@@ -344,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)."
@@ -393,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 actions/joingroup.php:128
+#: 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."
@@ -403,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."
@@ -423,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 ""
@@ -454,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 ""
@@ -611,29 +712,6 @@ msgstr "Last opp"
msgid "Crop"
msgstr ""
-#: 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/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 ""
@@ -701,7 +779,7 @@ msgstr ""
#: actions/grouplogo.php:99 actions/groupmembers.php:83
#: actions/grouprss.php:98 actions/groupunblock.php:86
#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86
-#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263
+#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:260
#, fuzzy
msgid "No such group."
msgstr "Klarte ikke å lagre profil."
@@ -771,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
@@ -965,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"
@@ -986,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"
@@ -1058,7 +1216,8 @@ 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"
@@ -1673,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 ""
@@ -1714,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"
@@ -1779,7 +1938,7 @@ msgstr ""
msgid "You must be logged in to join a group."
msgstr ""
-#: actions/joingroup.php:135
+#: actions/joingroup.php:131
#, php-format
msgid "%1$s joined group %2$s"
msgstr ""
@@ -1788,15 +1947,11 @@ 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
+#: actions/leavegroup.php:127
#, fuzzy, php-format
msgid "%1$s left group %2$s"
msgstr "%1$s sin status på %2$s"
@@ -1823,17 +1978,6 @@ msgstr "Logg inn"
msgid "Login to site"
msgstr ""
-#: actions/login.php:230 actions/profilesettings.php:106
-#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94
-#: lib/groupeditform.php:152 lib/userprofile.php:131
-msgid "Nickname"
-msgstr "Nick"
-
-#: actions/login.php:233 actions/register.php:429
-#: lib/accountsettingsaction.php:116
-msgid "Password"
-msgstr "Passord"
-
#: actions/login.php:236 actions/register.php:478
msgid "Remember me"
msgstr "Husk meg"
@@ -1883,6 +2027,27 @@ msgstr "Gjør brukeren til en administrator for gruppen"
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 ""
@@ -1895,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 ""
@@ -1908,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 ""
@@ -1987,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 ""
@@ -2004,8 +2212,8 @@ msgstr ""
msgid "Only "
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033
-#: lib/api.php:1061 lib/api.php:1171
+#: 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 ""
@@ -2019,7 +2227,7 @@ msgstr ""
#: actions/othersettings.php:60
#, fuzzy
-msgid "Other Settings"
+msgid "Other settings"
msgstr "Innstillinger for IM"
#: actions/othersettings.php:71
@@ -2343,7 +2551,7 @@ msgid "Full name"
msgstr "Fullt navn"
#: actions/profilesettings.php:115 actions/register.php:453
-#: lib/groupeditform.php:161
+#: lib/applicationeditform.php:230 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Hjemmesiden"
@@ -2933,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 ""
@@ -3040,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"
@@ -3924,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"
@@ -3938,11 +4214,6 @@ msgstr "Personlig"
msgid "Author(s)"
msgstr ""
-#: actions/version.php:198 lib/groupeditform.php:172
-#, fuzzy
-msgid "Description"
-msgstr "Alle abonnementer"
-
#: classes/File.php:144
#, php-format
msgid ""
@@ -3960,6 +4231,21 @@ msgstr ""
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"
@@ -3977,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 ""
@@ -4085,11 +4371,6 @@ 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 ""
@@ -4243,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 ""
@@ -4279,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 ""
@@ -4300,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"
@@ -4348,12 +4691,12 @@ 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
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"
msgstr "Brukeren har ingen profil."
@@ -4363,178 +4706,177 @@ msgid "Notice marked as fave."
msgstr ""
#: lib/command.php:217
-#, fuzzy
msgid "You are already a member of that group"
msgstr "Du er allerede medlem av den gruppen."
-#: lib/command.php:234
+#: lib/command.php:231
#, fuzzy, php-format
msgid "Could not join user %s to group %s"
msgstr "Klarte ikke å oppdatere bruker."
-#: lib/command.php:239
+#: lib/command.php:236
#, fuzzy, php-format
msgid "%s joined group %s"
msgstr "%1$s sin status på %2$s"
-#: lib/command.php:284
+#: lib/command.php:275
#, fuzzy, php-format
msgid "Could not remove user %s to group %s"
msgstr "Klarte ikke å oppdatere bruker."
-#: lib/command.php:289
+#: lib/command.php:280
#, fuzzy, php-format
msgid "%s left group %s"
msgstr "%1$s sin status på %2$s"
-#: lib/command.php:318
+#: lib/command.php:309
#, fuzzy, php-format
msgid "Fullname: %s"
msgstr "Fullt navn"
-#: lib/command.php:321 lib/mail.php:254
+#: lib/command.php:312 lib/mail.php:254
#, php-format
msgid "Location: %s"
msgstr ""
-#: lib/command.php:324 lib/mail.php:256
+#: 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 %d characters, you sent %d"
msgstr ""
-#: lib/command.php:376
+#: lib/command.php:367
#, fuzzy, php-format
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:422
+#: lib/command.php:413
#, fuzzy
msgid "Cannot repeat your own notice"
msgstr "Kan ikke slette notisen."
-#: lib/command.php:427
+#: lib/command.php:418
#, fuzzy
msgid "Already repeated that notice"
msgstr "Kan ikke slette notisen."
-#: lib/command.php:435
+#: lib/command.php:426
#, fuzzy, php-format
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 %d characters, you sent %d"
msgstr ""
-#: lib/command.php:500
+#: lib/command.php:491
#, fuzzy, php-format
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
+#: 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
+#: 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
+#: lib/command.php:641
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:661
+#: lib/command.php:652
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:677
+#: lib/command.php:668
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Ikke autorisert."
-#: lib/command.php:679
+#: 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:699
+#: lib/command.php:690
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Svar til %s"
-#: lib/command.php:701
+#: 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:721
+#: lib/command.php:712
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Du er allerede logget inn!"
-#: lib/command.php:723
+#: 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:737
+#: lib/command.php:728
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4575,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 ""
@@ -4604,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 ""
@@ -4793,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"
@@ -5112,13 +5468,15 @@ msgstr ""
msgid "Share my location"
msgstr "Klarte ikke å lagre profil."
-#: lib/noticeform.php:214
+#: lib/noticeform.php:215
#, fuzzy
msgid "Do not share my location"
msgstr "Klarte ikke å lagre profil."
-#: lib/noticeform.php:215
-msgid "Hide this info"
+#: 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,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 ""
@@ -5486,47 +5844,47 @@ msgstr ""
msgid "Moderate"
msgstr ""
-#: lib/util.php:884
+#: lib/util.php:875
msgid "a few seconds ago"
msgstr "noen få sekunder siden"
-#: lib/util.php:886
+#: lib/util.php:877
msgid "about a minute ago"
msgstr "omtrent ett minutt siden"
-#: lib/util.php:888
+#: lib/util.php:879
#, php-format
msgid "about %d minutes ago"
msgstr "omtrent %d minutter siden"
-#: lib/util.php:890
+#: lib/util.php:881
msgid "about an hour ago"
msgstr "omtrent én time siden"
-#: lib/util.php:892
+#: lib/util.php:883
#, php-format
msgid "about %d hours ago"
msgstr "omtrent %d timer siden"
-#: lib/util.php:894
+#: lib/util.php:885
msgid "about a day ago"
msgstr "omtrent én dag siden"
-#: lib/util.php:896
+#: lib/util.php:887
#, php-format
msgid "about %d days ago"
msgstr "omtrent %d dager siden"
-#: lib/util.php:898
+#: lib/util.php:889
msgid "about a month ago"
msgstr "omtrent én måned siden"
-#: lib/util.php:900
+#: lib/util.php:891
#, php-format
msgid "about %d months ago"
msgstr "omtrent %d måneder siden"
-#: lib/util.php:902
+#: lib/util.php:893
msgid "about a year ago"
msgstr "omtrent ett år siden"
diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po
index 36906bde7..ff28d0c75 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-11 23:25+0000\n"
-"PO-Revision-Date: 2010-01-11 23:27:46+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 (r60950); 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,8 +35,8 @@ 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
@@ -45,15 +45,20 @@ msgstr "Deze pagina bestaat niet"
#: 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"
@@ -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!"
@@ -136,7 +141,7 @@ msgstr "Updates van %1$s en vrienden op %2$s."
#: 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/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
@@ -155,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."
@@ -186,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 ""
@@ -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)."
@@ -397,7 +405,7 @@ msgstr "U bent al lid van die groep."
msgid "You have been blocked from that group by the admin."
msgstr "Een beheerder heeft ingesteld dat u geen lid mag worden van die groep."
-#: actions/apigroupjoin.php:138 actions/joingroup.php:128
+#: 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 %1$s toe te voegen aan de groep %2$s."
@@ -406,7 +414,7 @@ msgstr "Het was niet mogelijk gebruiker %1$s toe te voegen aan de groep %2$s."
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
+#: 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 %1$s uit de group %2$s te verwijderen."
@@ -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."
@@ -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 ""
@@ -612,31 +719,6 @@ msgstr "Uploaden"
msgid "Crop"
msgstr "Uitsnijden"
-#: 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/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 ""
@@ -705,7 +787,7 @@ msgstr "Het was niet mogelijk om de blokkadeinformatie op te slaan."
#: actions/grouplogo.php:99 actions/groupmembers.php:83
#: actions/grouprss.php:98 actions/groupunblock.php:86
#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86
-#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263
+#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:260
msgid "No such group."
msgstr "De opgegeven groep bestaat niet."
@@ -774,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
@@ -857,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."
@@ -963,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"
@@ -984,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"
@@ -1026,7 +1179,7 @@ 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
@@ -1052,7 +1205,8 @@ 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"
@@ -1080,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"
@@ -1696,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)"
@@ -1744,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"
@@ -1814,7 +1968,7 @@ 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:135
+#: actions/joingroup.php:131
#, php-format
msgid "%1$s joined group %2$s"
msgstr "%1$s is lid geworden van de groep %2$s"
@@ -1823,15 +1977,11 @@ msgstr "%1$s is lid geworden van de groep %2$s"
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
+#: actions/leavegroup.php:127
#, php-format
msgid "%1$s left group %2$s"
msgstr "%1$s heeft de groep %2$s verlaten"
@@ -1859,17 +2009,6 @@ msgstr "Aanmelden"
msgid "Login to site"
msgstr "Aanmelden"
-#: actions/login.php:230 actions/profilesettings.php:106
-#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94
-#: lib/groupeditform.php:152 lib/userprofile.php:131
-msgid "Nickname"
-msgstr "Gebruikersnaam"
-
-#: actions/login.php:233 actions/register.php:429
-#: lib/accountsettingsaction.php:116
-msgid "Password"
-msgstr "Wachtwoord"
-
#: actions/login.php:236 actions/register.php:478
msgid "Remember me"
msgstr "Aanmeldgegevens onthouden"
@@ -1922,6 +2061,26 @@ msgstr "Het is niet mogelijk %1$s beheerder te maken van de groep %2$s."
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"
@@ -1934,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!"
@@ -1947,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."
@@ -2035,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"
@@ -2052,8 +2259,8 @@ msgstr "inhoudstype "
msgid "Only "
msgstr "Alleen "
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033
-#: lib/api.php:1061 lib/api.php:1171
+#: 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."
@@ -2066,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
@@ -2098,29 +2305,24 @@ 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
-#, fuzzy
msgid "No user ID specified."
-msgstr "Er is geen groep aangegeven."
+msgstr "Er is geen ID opgegeven."
#: actions/otp.php:83
-#, fuzzy
msgid "No login token specified."
-msgstr "Er is geen mededeling opgegeven."
+msgstr "Er is geen token opgegeven."
#: actions/otp.php:90
-#, fuzzy
msgid "No login token requested."
-msgstr "Het profiel-ID was niet aanwezig in het verzoek."
+msgstr "Er is niet om een aanmeldtoken gevraagd."
#: actions/otp.php:95
-#, fuzzy
msgid "Invalid login token specified."
-msgstr "Het token is ongeldig of verlopen."
+msgstr "Het opgegeven token is ongeldig."
#: actions/otp.php:104
-#, fuzzy
msgid "Login token expired."
-msgstr "Aanmelden"
+msgstr "Het aanmeldtoken is verlopen."
#: actions/outbox.php:61
#, php-format
@@ -2390,7 +2592,7 @@ msgid "Full name"
msgstr "Volledige naam"
#: actions/profilesettings.php:115 actions/register.php:453
-#: lib/groupeditform.php:161
+#: lib/applicationeditform.php:230 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Thuispagina"
@@ -3006,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."
@@ -3120,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"
@@ -4056,10 +4330,6 @@ msgstr ""
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"
@@ -4068,10 +4338,6 @@ msgstr "Versie"
msgid "Author(s)"
msgstr "Auteur(s)"
-#: actions/version.php:198 lib/groupeditform.php:172
-msgid "Description"
-msgstr "Beschrijving"
-
#: classes/File.php:144
#, php-format
msgid ""
@@ -4093,10 +4359,22 @@ 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
-#, fuzzy, php-format
+#, php-format
msgid "Could not create login token for %s"
-msgstr "Het was niet mogelijk een aanmeldtoken aan te maken voor %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."
@@ -4110,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."
@@ -4142,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!"
@@ -4204,9 +4482,9 @@ msgid "Other options"
msgstr "Overige instellingen"
#: lib/action.php:144
-#, fuzzy, php-format
+#, php-format
msgid "%1$s - %2$s"
-msgstr "%1$s (%2$s)"
+msgstr "%1$s - %2$s"
#: lib/action.php:159
msgid "Untitled page"
@@ -4225,10 +4503,6 @@ 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"
@@ -4382,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."
@@ -4418,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"
@@ -4438,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"
@@ -4463,18 +4795,18 @@ msgid "Sorry, this command is not yet implemented."
msgstr "Dit commando is nog niet geïmplementeerd."
#: lib/command.php:88
-#, fuzzy, php-format
+#, php-format
msgid "Could not find a user with nickname %s"
-msgstr "De gebruiker %s is niet aangetroffen."
+msgstr "De gebruiker %s is niet aangetroffen"
#: lib/command.php:92
msgid "It does not make a lot of sense to nudge yourself!"
msgstr "Het heeft niet zoveel zin om uzelf te porren..."
#: lib/command.php:99
-#, fuzzy, php-format
+#, php-format
msgid "Nudge sent to %s"
-msgstr "De por naar %s is verzonden."
+msgstr "De por naar %s is verzonden"
#: lib/command.php:126
#, php-format
@@ -4487,201 +4819,193 @@ msgstr ""
"Abonnees: %2$s\n"
"Mededelingen: %3$s"
-#: lib/command.php:152 lib/command.php:399 lib/command.php:460
-#, fuzzy
+#: 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."
+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
+#: 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."
+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:217
-#, fuzzy
msgid "You are already a member of that group"
-msgstr "U bent al lid van die groep."
+msgstr "U bent al lid van deze groep"
-#: lib/command.php:234
-#, fuzzy, php-format
+#: lib/command.php:231
+#, php-format
msgid "Could not join user %s to group %s"
-msgstr "Het was niet mogelijk gebruiker %1$s toe te voegen aan de groep %2$s."
+msgstr "Het was niet mogelijk om de gebruiker %s toe te voegen aan de groep %s"
-#: lib/command.php:239
-#, fuzzy, php-format
+#: lib/command.php:236
+#, php-format
msgid "%s joined group %s"
-msgstr "%1$s is lid geworden van de groep %2$s"
+msgstr "%s is lid geworden van de groep %s"
-#: lib/command.php:284
-#, fuzzy, php-format
+#: lib/command.php:275
+#, php-format
msgid "Could not remove user %s to group %s"
-msgstr "De gebruiker %1$s kon niet uit de groep %2$s verwijderd worden."
+msgstr "De gebruiker %s kon niet uit de groep %s verwijderd worden"
-#: lib/command.php:289
-#, fuzzy, php-format
+#: lib/command.php:280
+#, php-format
msgid "%s left group %s"
-msgstr "%1$s heeft de groep %2$s verlaten"
+msgstr "%s heeft de groep %s verlaten"
-#: lib/command.php:318
-#, fuzzy, php-format
+#: lib/command.php:309
+#, php-format
msgid "Fullname: %s"
msgstr "Volledige naam: %s"
-#: lib/command.php:321 lib/mail.php:254
+#: lib/command.php:312 lib/mail.php:254
#, php-format
msgid "Location: %s"
msgstr "Locatie: %s"
-#: lib/command.php:324 lib/mail.php:256
+#: 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
+#: 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 %1$d tekens. De lengte van uw "
-"bericht was %2$d."
+"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
+#: lib/command.php:367
+#, php-format
msgid "Direct message to %s sent"
-msgstr "Het directe bericht aan %s is verzonden."
+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:422
-#, fuzzy
+#: lib/command.php:413
msgid "Cannot repeat your own notice"
-msgstr "U kunt uw eigen mededeling niet herhalen."
+msgstr "U kunt uw eigen mededelingen niet herhalen."
-#: lib/command.php:427
-#, fuzzy
+#: lib/command.php:418
msgid "Already repeated that notice"
msgstr "U hebt die mededeling al herhaald."
-#: lib/command.php:435
-#, fuzzy, php-format
+#: lib/command.php:426
+#, php-format
msgid "Notice from %s repeated"
-msgstr "De mededeling van %s is herhaald."
+msgstr "De mededeling van %s is herhaald"
-#: lib/command.php:437
+#: 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
+#: 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 %1$d tekens. Uw mededeling "
-"bevatte %2$d tekens."
+"De mededeling is te lang. De maximale lengte is %d tekens. Uw mededeling "
+"bevatte %d tekens"
-#: lib/command.php:500
-#, fuzzy, php-format
+#: lib/command.php:491
+#, php-format
msgid "Reply to %s sent"
-msgstr "Het antwoord aan %s is verzonden."
+msgstr "Het antwoord aan %s is verzonden"
-#: lib/command.php:502
+#: 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
+#: 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."
+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
+#: 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."
+"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
+#: lib/command.php:641
msgid "Login command is disabled"
-msgstr "Het aanmeldcommando is uitgeschakeld."
+msgstr "Het aanmeldcommando is uitgeschakeld"
-#: lib/command.php:661
-#, fuzzy, php-format
+#: 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."
+"geldig: %s"
-#: lib/command.php:677
+#: lib/command.php:668
msgid "You are not subscribed to anyone."
msgstr "U bent op geen enkele gebruiker geabonneerd."
-#: lib/command.php:679
+#: 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:699
+#: lib/command.php:690
msgid "No one is subscribed to you."
msgstr "Niemand heeft een abonnenment op u."
-#: lib/command.php:701
+#: 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:721
+#: lib/command.php:712
msgid "You are not a member of any groups."
msgstr "U bent lid van geen enkele groep."
-#: lib/command.php:723
+#: 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:737
+#: lib/command.php:728
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4761,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."
@@ -4790,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"
@@ -4976,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"
@@ -5371,18 +5708,20 @@ msgid "Attach a file"
msgstr "Bestand toevoegen"
#: lib/noticeform.php:212
-#, fuzzy
msgid "Share my location"
-msgstr "Mijn locatie bekend maken."
+msgstr "Mijn locatie bekend maken"
-#: lib/noticeform.php:214
-#, fuzzy
+#: lib/noticeform.php:215
msgid "Do not share my location"
-msgstr "Mijn locatie niet bekend maken."
+msgstr "Mijn locatie niet bekend maken"
-#: lib/noticeform.php:215
-msgid "Hide this info"
-msgstr "Deze informatie verbergen"
+#: 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
@@ -5642,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."
@@ -5732,47 +6071,47 @@ msgstr "Bericht"
msgid "Moderate"
msgstr "Modereren"
-#: lib/util.php:884
+#: lib/util.php:875
msgid "a few seconds ago"
msgstr "een paar seconden geleden"
-#: lib/util.php:886
+#: lib/util.php:877
msgid "about a minute ago"
msgstr "ongeveer een minuut geleden"
-#: lib/util.php:888
+#: lib/util.php:879
#, php-format
msgid "about %d minutes ago"
msgstr "ongeveer %d minuten geleden"
-#: lib/util.php:890
+#: lib/util.php:881
msgid "about an hour ago"
msgstr "ongeveer een uur geleden"
-#: lib/util.php:892
+#: lib/util.php:883
#, php-format
msgid "about %d hours ago"
msgstr "ongeveer %d uur geleden"
-#: lib/util.php:894
+#: lib/util.php:885
msgid "about a day ago"
msgstr "ongeveer een dag geleden"
-#: lib/util.php:896
+#: lib/util.php:887
#, php-format
msgid "about %d days ago"
msgstr "ongeveer %d dagen geleden"
-#: lib/util.php:898
+#: lib/util.php:889
msgid "about a month ago"
msgstr "ongeveer een maand geleden"
-#: lib/util.php:900
+#: lib/util.php:891
#, php-format
msgid "about %d months ago"
msgstr "ongeveer %d maanden geleden"
-#: lib/util.php:902
+#: lib/util.php:893
msgid "about a year ago"
msgstr "ongeveer een jaar geleden"
diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po
index 383493bbf..6ea81a38e 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-11 23:25+0000\n"
-"PO-Revision-Date: 2010-01-11 23:27:39+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 (r60950); 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,8 +33,8 @@ 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
@@ -43,15 +43,20 @@ msgstr "Dette emneord finst ikkje."
#: 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!"
@@ -126,7 +131,7 @@ msgstr "Oppdateringar frå %1$s og vener på %2$s!"
#: 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/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
@@ -146,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."
@@ -177,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 ""
@@ -327,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."
@@ -339,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)."
@@ -389,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 actions/joingroup.php:128
+#: 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"
@@ -399,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 "
@@ -419,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."
@@ -451,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 ""
@@ -607,29 +710,6 @@ msgstr "Last opp"
msgid "Crop"
msgstr "Skaler"
-#: 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/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."
@@ -697,7 +777,7 @@ msgstr "Lagring av informasjon feila."
#: actions/grouplogo.php:99 actions/groupmembers.php:83
#: actions/grouprss.php:98 actions/groupunblock.php:86
#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86
-#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263
+#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:260
msgid "No such group."
msgstr "Denne gruppa finst ikkje."
@@ -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
@@ -970,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"
@@ -991,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"
@@ -1062,7 +1224,8 @@ 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"
@@ -1701,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)"
@@ -1747,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"
@@ -1812,7 +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:135
+#: actions/joingroup.php:131
#, fuzzy, php-format
msgid "%1$s joined group %2$s"
msgstr "%s blei medlem av gruppe %s"
@@ -1821,15 +1984,11 @@ 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
+#: actions/leavegroup.php:127
#, fuzzy, php-format
msgid "%1$s left group %2$s"
msgstr "%s forlot %s gruppa"
@@ -1856,17 +2015,6 @@ msgstr "Logg inn"
msgid "Login to site"
msgstr "Logg inn "
-#: actions/login.php:230 actions/profilesettings.php:106
-#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94
-#: lib/groupeditform.php:152 lib/userprofile.php:131
-msgid "Nickname"
-msgstr "Kallenamn"
-
-#: actions/login.php:233 actions/register.php:429
-#: lib/accountsettingsaction.php:116
-msgid "Password"
-msgstr "Passord"
-
#: actions/login.php:236 actions/register.php:478
msgid "Remember me"
msgstr "Hugs meg"
@@ -1920,6 +2068,29 @@ msgstr "Du må være administrator for å redigere gruppa"
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"
@@ -1932,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."
@@ -1945,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 ""
@@ -2031,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"
@@ -2049,8 +2265,8 @@ msgstr "Kopla til"
msgid "Only "
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033
-#: lib/api.php:1061 lib/api.php:1171
+#: 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."
@@ -2063,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
@@ -2397,7 +2614,7 @@ msgid "Full name"
msgstr "Fullt namn"
#: actions/profilesettings.php:115 actions/register.php:453
-#: lib/groupeditform.php:161
+#: lib/applicationeditform.php:230 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Heimeside"
@@ -3001,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."
@@ -3106,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"
@@ -4023,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"
@@ -4037,10 +4323,6 @@ msgstr "Personleg"
msgid "Author(s)"
msgstr ""
-#: actions/version.php:198 lib/groupeditform.php:172
-msgid "Description"
-msgstr "Beskriving"
-
#: classes/File.php:144
#, php-format
msgid ""
@@ -4058,6 +4340,21 @@ msgstr ""
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"
@@ -4076,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 "
@@ -4104,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"
@@ -4186,10 +4483,6 @@ 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"
@@ -4347,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."
@@ -4391,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 ""
@@ -4412,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"
@@ -4460,14 +4815,13 @@ 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"
msgstr "Fann ingen profil med den IDen."
-#: lib/command.php:168 lib/command.php:415 lib/command.php:476
-#: lib/command.php:532
-#, fuzzy
+#: 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"
@@ -4476,182 +4830,179 @@ msgid "Notice marked as fave."
msgstr "Notis markert som favoritt."
#: lib/command.php:217
-#, fuzzy
msgid "You are already a member of that group"
msgstr "Du er allereie medlem av den gruppa"
-#: lib/command.php:234
-#, fuzzy, php-format
+#: 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:239
-#, fuzzy, php-format
+#: lib/command.php:236
+#, php-format
msgid "%s joined group %s"
msgstr "%s blei medlem av gruppe %s"
-#: lib/command.php:284
-#, fuzzy, php-format
+#: 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:289
-#, fuzzy, php-format
+#: lib/command.php:280
+#, php-format
msgid "%s left group %s"
msgstr "%s forlot %s gruppa"
-#: lib/command.php:318
-#, fuzzy, php-format
+#: lib/command.php:309
+#, php-format
msgid "Fullname: %s"
msgstr "Fullt namn: %s"
-#: lib/command.php:321 lib/mail.php:254
+#: lib/command.php:312 lib/mail.php:254
#, php-format
msgid "Location: %s"
msgstr "Stad: %s"
-#: lib/command.php:324 lib/mail.php:256
+#: 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 %d characters, you sent %d"
msgstr "Melding for lang - maksimum 140 teikn, du skreiv %d"
-#: lib/command.php:376
-#, fuzzy, php-format
+#: 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:422
+#: lib/command.php:413
#, fuzzy
msgid "Cannot repeat your own notice"
msgstr "Kan ikkje slå på notifikasjon."
-#: lib/command.php:427
+#: lib/command.php:418
#, fuzzy
msgid "Already repeated that notice"
msgstr "Slett denne notisen"
-#: lib/command.php:435
+#: lib/command.php:426
#, fuzzy, php-format
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 %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"
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
+#: 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
+#: 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
+#: lib/command.php:641
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:661
+#: lib/command.php:652
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:677
+#: lib/command.php:668
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Du tingar ikkje oppdateringar til den profilen."
-#: lib/command.php:679
+#: 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:699
+#: lib/command.php:690
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Kan ikkje tinga andre til deg."
-#: lib/command.php:701
+#: 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:721
+#: 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:723
+#: 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:737
+#: lib/command.php:728
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4692,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"
@@ -4722,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 ""
@@ -4909,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"
@@ -5232,13 +5597,15 @@ msgstr ""
msgid "Share my location"
msgstr "Kan ikkje lagra merkelapp."
-#: lib/noticeform.php:214
+#: lib/noticeform.php:215
#, fuzzy
msgid "Do not share my location"
msgstr "Kan ikkje lagra merkelapp."
-#: lib/noticeform.php:215
-msgid "Hide this info"
+#: lib/noticeform.php:216
+msgid ""
+"Sorry, retrieving your geo location is taking longer than expected, please "
+"try again later"
msgstr ""
#: lib/noticelist.php:428
@@ -5515,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."
@@ -5611,47 +5978,47 @@ msgstr "Melding"
msgid "Moderate"
msgstr ""
-#: lib/util.php:884
+#: lib/util.php:875
msgid "a few seconds ago"
msgstr "eit par sekund sidan"
-#: lib/util.php:886
+#: lib/util.php:877
msgid "about a minute ago"
msgstr "omtrent eitt minutt sidan"
-#: lib/util.php:888
+#: lib/util.php:879
#, php-format
msgid "about %d minutes ago"
msgstr "~%d minutt sidan"
-#: lib/util.php:890
+#: lib/util.php:881
msgid "about an hour ago"
msgstr "omtrent ein time sidan"
-#: lib/util.php:892
+#: lib/util.php:883
#, php-format
msgid "about %d hours ago"
msgstr "~%d timar sidan"
-#: lib/util.php:894
+#: lib/util.php:885
msgid "about a day ago"
msgstr "omtrent ein dag sidan"
-#: lib/util.php:896
+#: lib/util.php:887
#, php-format
msgid "about %d days ago"
msgstr "~%d dagar sidan"
-#: lib/util.php:898
+#: lib/util.php:889
msgid "about a month ago"
msgstr "omtrent ein månad sidan"
-#: lib/util.php:900
+#: lib/util.php:891
#, php-format
msgid "about %d months ago"
msgstr "~%d månadar sidan"
-#: lib/util.php:902
+#: lib/util.php:893
msgid "about a year ago"
msgstr "omtrent eitt år sidan"
diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po
index d06e4a119..17f334cb4 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-11 23:25+0000\n"
-"PO-Revision-Date: 2010-01-11 23:27:54+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 <piotrdrag@gmail.com>\n"
"Language-Team: Polish <pl@li.org>\n"
"MIME-Version: 1.0\n"
@@ -19,7 +19,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
"|| n%100>=20) ? 1 : 2);\n"
-"X-Generator: MediaWiki 1.16alpha (r60950); 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,8 +38,8 @@ 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
@@ -48,15 +48,20 @@ msgstr "Nie ma takiej strony"
#: 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"
@@ -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!"
@@ -139,7 +144,7 @@ msgstr "Aktualizacje z %1$s i przyjaciół na %2$s."
#: 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/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
@@ -158,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."
@@ -188,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 ""
@@ -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)."
@@ -394,7 +402,7 @@ msgstr "Jesteś już członkiem tej grupy."
msgid "You have been blocked from that group by the admin."
msgstr "Zostałeś zablokowany w tej grupie przez administratora."
-#: actions/apigroupjoin.php:138 actions/joingroup.php:128
+#: 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 %1$s do grupy %2$s."
@@ -403,7 +411,7 @@ msgstr "Nie można dołączyć użytkownika %1$s do grupy %2$s."
msgid "You are not a member of this group."
msgstr "Nie jesteś członkiem tej grupy."
-#: 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 "Nie można usunąć użytkownika %1$s z grupy %2$s."
@@ -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."
@@ -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."
@@ -606,29 +706,6 @@ msgstr "Wyślij"
msgid "Crop"
msgstr "Przytnij"
-#: 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/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"
@@ -696,7 +773,7 @@ msgstr "Zapisanie informacji o blokadzie nie powiodło się."
#: actions/grouplogo.php:99 actions/groupmembers.php:83
#: actions/grouprss.php:98 actions/groupunblock.php:86
#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86
-#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263
+#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:260
msgid "No such group."
msgstr "Nie ma takiej grupy."
@@ -765,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
@@ -951,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"
@@ -972,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"
@@ -1041,7 +1189,8 @@ 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"
@@ -1670,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)"
@@ -1716,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"
@@ -1786,7 +1935,7 @@ msgstr ""
msgid "You must be logged in to join a group."
msgstr "Musisz być zalogowany, aby dołączyć do grupy."
-#: actions/joingroup.php:135
+#: actions/joingroup.php:131
#, php-format
msgid "%1$s joined group %2$s"
msgstr "Użytkownik %1$s dołączył do grupy %2$s"
@@ -1795,15 +1944,11 @@ msgstr "Użytkownik %1$s dołączył do grupy %2$s"
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
+#: actions/leavegroup.php:127
#, php-format
msgid "%1$s left group %2$s"
msgstr "Użytkownik %1$s opuścił grupę %2$s"
@@ -1829,17 +1974,6 @@ msgstr "Zaloguj siÄ™"
msgid "Login to site"
msgstr "Zaloguj siÄ™ na stronie"
-#: actions/login.php:230 actions/profilesettings.php:106
-#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94
-#: lib/groupeditform.php:152 lib/userprofile.php:131
-msgid "Nickname"
-msgstr "Pseudonim"
-
-#: actions/login.php:233 actions/register.php:429
-#: lib/accountsettingsaction.php:116
-msgid "Password"
-msgstr "Hasło"
-
#: actions/login.php:236 actions/register.php:478
msgid "Remember me"
msgstr "Zapamiętaj mnie"
@@ -1894,6 +2028,26 @@ msgstr "Nie można uczynić %1$s administratorem grupy %2$s."
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"
@@ -1906,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."
@@ -1919,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."
@@ -2007,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"
@@ -2024,8 +2220,8 @@ msgstr "typ zawartości "
msgid "Only "
msgstr "Tylko "
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033
-#: lib/api.php:1061 lib/api.php:1171
+#: 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."
@@ -2038,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
@@ -2070,29 +2266,24 @@ 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
-#, fuzzy
msgid "No user ID specified."
-msgstr "Nie podano grupy."
+msgstr "Nie podano identyfikatora użytkownika."
#: actions/otp.php:83
-#, fuzzy
msgid "No login token specified."
-msgstr "Nie podano wpisu."
+msgstr "Nie podano tokenu logowania."
#: actions/otp.php:90
-#, fuzzy
msgid "No login token requested."
-msgstr "Brak identyfikatora profilu w żądaniu."
+msgstr "Nie zażądano tokenu logowania."
#: actions/otp.php:95
-#, fuzzy
msgid "Invalid login token specified."
-msgstr "Nieprawidłowy lub wygasły token."
+msgstr "Podano nieprawidłowy token logowania."
#: actions/otp.php:104
-#, fuzzy
msgid "Login token expired."
-msgstr "Zaloguj siÄ™ na stronie"
+msgstr "Token logowania wygasł."
#: actions/outbox.php:61
#, php-format
@@ -2360,7 +2551,7 @@ msgid "Full name"
msgstr "ImiÄ™ i nazwisko"
#: actions/profilesettings.php:115 actions/register.php:453
-#: lib/groupeditform.php:161
+#: lib/applicationeditform.php:230 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Strona domowa"
@@ -2968,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."
@@ -3081,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"
@@ -4009,10 +4272,6 @@ msgstr ""
msgid "Plugins"
msgstr "Wtyczki"
-#: actions/version.php:195
-msgid "Name"
-msgstr "Nazwa"
-
#: actions/version.php:196 lib/action.php:741
msgid "Version"
msgstr "Wersja"
@@ -4021,10 +4280,6 @@ msgstr "Wersja"
msgid "Author(s)"
msgstr "Autorzy"
-#: actions/version.php:198 lib/groupeditform.php:172
-msgid "Description"
-msgstr "Opis"
-
#: classes/File.php:144
#, php-format
msgid ""
@@ -4047,10 +4302,22 @@ 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
-#, fuzzy, php-format
+#, php-format
msgid "Could not create login token for %s"
-msgstr "Nie można utworzyć tokenów loginów dla %s."
+msgstr "Nie można utworzyć tokenów loginów dla %s"
#: classes/Message.php:45
msgid "You are banned from sending direct messages."
@@ -4064,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."
@@ -4092,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."
@@ -4152,9 +4419,9 @@ msgid "Other options"
msgstr "Inne opcje"
#: lib/action.php:144
-#, fuzzy, php-format
+#, php-format
msgid "%1$s - %2$s"
-msgstr "%1$s (%2$s)"
+msgstr "%1$s - %2$s"
#: lib/action.php:159
msgid "Untitled page"
@@ -4173,10 +4440,6 @@ 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"
@@ -4330,10 +4593,6 @@ 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."
@@ -4366,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"
@@ -4386,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"
@@ -4411,7 +4732,7 @@ msgid "Sorry, this command is not yet implemented."
msgstr "Te polecenie nie zostało jeszcze zaimplementowane."
#: lib/command.php:88
-#, fuzzy, php-format
+#, php-format
msgid "Could not find a user with nickname %s"
msgstr "Nie można odnaleźć użytkownika z pseudonimem %s."
@@ -4420,7 +4741,7 @@ 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
+#, php-format
msgid "Nudge sent to %s"
msgstr "Wysłano szturchnięcie do użytkownika %s."
@@ -4435,14 +4756,12 @@ msgstr ""
"Subskrybenci: %2$s\n"
"Wpisy: %3$s"
-#: lib/command.php:152 lib/command.php:399 lib/command.php:460
-#, fuzzy
+#: 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
+#: 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."
@@ -4451,183 +4770,177 @@ msgid "Notice marked as fave."
msgstr "Zaznaczono wpis jako ulubiony."
#: lib/command.php:217
-#, fuzzy
msgid "You are already a member of that group"
msgstr "Jesteś już członkiem tej grupy."
-#: lib/command.php:234
-#, fuzzy, php-format
+#: 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:239
-#, fuzzy, php-format
+#: 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:284
-#, fuzzy, php-format
+#: 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:289
-#, fuzzy, php-format
+#: lib/command.php:280
+#, php-format
msgid "%s left group %s"
msgstr "Użytkownik %1$s opuścił grupę %2$s"
-#: lib/command.php:318
-#, fuzzy, php-format
+#: lib/command.php:309
+#, php-format
msgid "Fullname: %s"
msgstr "ImiÄ™ i nazwisko: %s"
-#: lib/command.php:321 lib/mail.php:254
+#: lib/command.php:312 lib/mail.php:254
#, php-format
msgid "Location: %s"
msgstr "Położenie: %s"
-#: lib/command.php:324 lib/mail.php:256
+#: 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
+#: 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
+#: 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:422
-#, fuzzy
+#: lib/command.php:413
msgid "Cannot repeat your own notice"
-msgstr "Nie można powtórzyć własnego wpisu."
+msgstr "Nie można powtórzyć własnego wpisu"
-#: lib/command.php:427
-#, fuzzy
+#: lib/command.php:418
msgid "Already repeated that notice"
-msgstr "Już powtórzono ten wpis."
+msgstr "Już powtórzono ten wpis"
-#: lib/command.php:435
-#, fuzzy, php-format
+#: lib/command.php:426
+#, php-format
msgid "Notice from %s repeated"
-msgstr "Powtórzono wpis od użytkownika %s."
+msgstr "Powtórzono wpis od użytkownika %s"
-#: lib/command.php:437
+#: lib/command.php:428
msgid "Error repeating notice."
msgstr "BÅ‚Ä…d podczas powtarzania wpisu."
-#: lib/command.php:491
-#, fuzzy, php-format
+#: 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:500
-#, fuzzy, php-format
+#: lib/command.php:491
+#, 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
+#: 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
+#: 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
+#: lib/command.php:641
msgid "Login command is disabled"
-msgstr "Polecenie logowania jest wyłączone."
+msgstr "Polecenie logowania jest wyłączone"
-#: lib/command.php:661
-#, fuzzy, php-format
+#: lib/command.php:652
+#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
"Tego odnośnika można użyć tylko raz i będzie prawidłowy tylko przez dwie "
"minuty: %s."
-#: lib/command.php:677
+#: lib/command.php:668
msgid "You are not subscribed to anyone."
msgstr "Nie subskrybujesz nikogo."
-#: lib/command.php:679
+#: 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:699
+#: lib/command.php:690
msgid "No one is subscribed to you."
msgstr "Nikt ciÄ™ nie subskrybuje."
-#: lib/command.php:701
+#: 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:721
+#: lib/command.php:712
msgid "You are not a member of any groups."
msgstr "Nie jesteś członkiem żadnej grupy."
-#: lib/command.php:723
+#: 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:737
+#: lib/command.php:728
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4707,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."
@@ -4735,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"
@@ -4921,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"
@@ -5311,18 +5637,20 @@ msgid "Attach a file"
msgstr "Załącz plik"
#: lib/noticeform.php:212
-#, fuzzy
msgid "Share my location"
-msgstr "Ujawnij położenie."
+msgstr "Ujawnij położenie"
-#: lib/noticeform.php:214
-#, fuzzy
+#: lib/noticeform.php:215
msgid "Do not share my location"
-msgstr "Nie ujawniaj położenia."
+msgstr "Nie ujawniaj położenia"
-#: lib/noticeform.php:215
-msgid "Hide this info"
-msgstr "Ukryj tÄ™ informacjÄ™"
+#: 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
@@ -5581,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."
@@ -5671,47 +5999,47 @@ msgstr "Wiadomość"
msgid "Moderate"
msgstr "Moderuj"
-#: lib/util.php:884
+#: lib/util.php:875
msgid "a few seconds ago"
msgstr "kilka sekund temu"
-#: lib/util.php:886
+#: lib/util.php:877
msgid "about a minute ago"
msgstr "około minutę temu"
-#: lib/util.php:888
+#: lib/util.php:879
#, php-format
msgid "about %d minutes ago"
msgstr "około %d minut temu"
-#: lib/util.php:890
+#: lib/util.php:881
msgid "about an hour ago"
msgstr "około godzinę temu"
-#: lib/util.php:892
+#: lib/util.php:883
#, php-format
msgid "about %d hours ago"
msgstr "około %d godzin temu"
-#: lib/util.php:894
+#: lib/util.php:885
msgid "about a day ago"
msgstr "blisko dzień temu"
-#: lib/util.php:896
+#: lib/util.php:887
#, php-format
msgid "about %d days ago"
msgstr "około %d dni temu"
-#: lib/util.php:898
+#: lib/util.php:889
msgid "about a month ago"
msgstr "około miesiąc temu"
-#: lib/util.php:900
+#: lib/util.php:891
#, php-format
msgid "about %d months ago"
msgstr "około %d miesięcy temu"
-#: lib/util.php:902
+#: lib/util.php:893
msgid "about a year ago"
msgstr "około rok temu"
diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po
index 0c8f086ba..a7e2b9e33 100644
--- a/locale/pt/LC_MESSAGES/statusnet.po
+++ b/locale/pt/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-11 23:25+0000\n"
-"PO-Revision-Date: 2010-01-11 23:27:59+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 (r60950); 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,8 +34,8 @@ 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
@@ -44,15 +44,20 @@ msgstr "Página não encontrada."
#: 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"
@@ -111,7 +116,7 @@ msgstr ""
msgid "You and friends"
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!"
@@ -133,7 +138,7 @@ msgstr "Actualizações de %1$s e amigos no %2$s!"
#: 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/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
@@ -152,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."
@@ -182,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 ""
@@ -327,7 +333,8 @@ msgstr "Utilizador já é usado. Tente outro."
msgid "Not a valid nickname."
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."
@@ -339,7 +346,8 @@ msgstr "Página de ínicio 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)."
@@ -387,7 +395,7 @@ msgstr "Já é membro desse grupo."
msgid "You have been blocked from that group by the admin."
msgstr "Foi bloqueado desse grupo pelo gestor."
-#: actions/apigroupjoin.php:138 actions/joingroup.php:128
+#: 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 %1$s ao grupo %2$s."
@@ -396,7 +404,7 @@ msgstr "Não foi possível adicionar %1$s ao grupo %2$s."
msgid "You are not a member of this group."
msgstr "Não é membro deste grupo."
-#: 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 "Não foi possível remover %1$s do grupo %2$s."
@@ -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."
@@ -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."
@@ -599,29 +703,6 @@ msgstr "Carregar"
msgid "Crop"
msgstr "Cortar"
-#: 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/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/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"
@@ -689,7 +770,7 @@ msgstr "Não foi possível gravar informação do bloqueio."
#: actions/grouplogo.php:99 actions/groupmembers.php:83
#: actions/grouprss.php:98 actions/groupunblock.php:86
#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86
-#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263
+#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:260
msgid "No such group."
msgstr "Grupo não foi encontrado."
@@ -758,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
@@ -946,7 +1028,8 @@ 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"
@@ -967,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"
@@ -1035,7 +1199,8 @@ msgstr ""
"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"
@@ -1674,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)"
@@ -1719,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"
@@ -1788,7 +1953,7 @@ 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:135
+#: actions/joingroup.php:131
#, php-format
msgid "%1$s joined group %2$s"
msgstr "%1$s juntou-se ao grupo %2$s"
@@ -1797,15 +1962,11 @@ msgstr "%1$s juntou-se ao grupo %2$s"
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
+#: actions/leavegroup.php:127
#, php-format
msgid "%1$s left group %2$s"
msgstr "%1$s deixou o grupo %2$s"
@@ -1831,17 +1992,6 @@ msgstr "Entrar"
msgid "Login to site"
msgstr "Iniciar sessão no site"
-#: 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/login.php:233 actions/register.php:429
-#: lib/accountsettingsaction.php:116
-msgid "Password"
-msgstr "Senha"
-
#: actions/login.php:236 actions/register.php:478
msgid "Remember me"
msgstr "Lembrar-me neste computador"
@@ -1896,6 +2046,29 @@ msgstr "Não é possível tornar %1$s administrador do grupo %2$s."
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"
@@ -1908,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!"
@@ -1921,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."
@@ -2008,6 +2181,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 "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"
msgstr "Nota não tem perfil"
@@ -2025,8 +2243,8 @@ msgstr "tipo de conteúdo "
msgid "Only "
msgstr "Apenas "
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033
-#: lib/api.php:1061 lib/api.php:1171
+#: 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."
@@ -2039,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
@@ -2363,7 +2582,7 @@ msgid "Full name"
msgstr "Nome completo"
#: actions/profilesettings.php:115 actions/register.php:453
-#: lib/groupeditform.php:161
+#: lib/applicationeditform.php:230 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Página pessoal"
@@ -2973,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."
@@ -3086,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"
@@ -4011,10 +4304,6 @@ msgstr ""
msgid "Plugins"
msgstr "Plugins"
-#: actions/version.php:195
-msgid "Name"
-msgstr "Nome"
-
#: actions/version.php:196 lib/action.php:741
msgid "Version"
msgstr "Versão"
@@ -4023,10 +4312,6 @@ msgstr "Versão"
msgid "Author(s)"
msgstr "Autores"
-#: actions/version.php:198 lib/groupeditform.php:172
-msgid "Description"
-msgstr "Descrição"
-
#: classes/File.php:144
#, php-format
msgid ""
@@ -4047,10 +4332,25 @@ msgstr ""
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
-#, fuzzy, php-format
+#, php-format
msgid "Could not create login token for %s"
-msgstr "Não foi possível criar a chave de entrada para %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."
@@ -4064,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 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."
@@ -4092,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!"
@@ -4173,10 +4473,6 @@ 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, senha, perfil"
@@ -4330,10 +4626,6 @@ 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 sessão."
-
#: lib/adminpanelaction.php:96
msgid "You cannot make changes to this site."
msgstr "Não pode fazer alterações a este site."
@@ -4366,6 +4658,72 @@ msgstr "Configuração do estilo"
msgid "Paths configuration"
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"
msgstr "Anexos"
@@ -4386,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"
@@ -4411,18 +4769,18 @@ msgid "Sorry, this command is not yet implemented."
msgstr "Desculpe, este comando ainda não foi implementado."
#: lib/command.php:88
-#, fuzzy, php-format
+#, php-format
msgid "Could not find a user with nickname %s"
-msgstr "Não foi encontrado um utilizador com a alcunha %s."
+msgstr "Não foi encontrado um utilizador com a alcunha %s"
#: lib/command.php:92
msgid "It does not make a lot of sense to nudge yourself!"
msgstr "Não faz muito sentido tocar-nos a nós mesmos!"
#: lib/command.php:99
-#, fuzzy, php-format
+#, php-format
msgid "Nudge sent to %s"
-msgstr "Toque enviado para %s."
+msgstr "Cotovelada enviada a %s"
#: lib/command.php:126
#, php-format
@@ -4435,196 +4793,188 @@ msgstr ""
"Subscritores: %2$s\n"
"Notas: %3$s"
-#: lib/command.php:152 lib/command.php:399 lib/command.php:460
-#, fuzzy
+#: 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."
+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
+#: 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."
+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:217
-#, fuzzy
msgid "You are already a member of that group"
-msgstr "Já é membro desse grupo."
+msgstr "Já é membro desse grupo"
-#: lib/command.php:234
-#, fuzzy, php-format
+#: lib/command.php:231
+#, php-format
msgid "Could not join user %s to group %s"
-msgstr "Não foi possível adicionar %1$s ao grupo %2$s."
+msgstr "Não foi possível juntar o utilizador %s ao grupo %s"
-#: lib/command.php:239
-#, fuzzy, php-format
+#: lib/command.php:236
+#, php-format
msgid "%s joined group %s"
-msgstr "%1$s juntou-se ao grupo %2$s"
+msgstr "%s juntou-se ao grupo %s"
-#: lib/command.php:284
-#, fuzzy, php-format
+#: lib/command.php:275
+#, php-format
msgid "Could not remove user %s to group %s"
-msgstr "Não foi possível remover o utilizador %1$s do grupo %2$s."
+msgstr "Não foi possível remover o utilizador %s do grupo %s"
-#: lib/command.php:289
-#, fuzzy, php-format
+#: lib/command.php:280
+#, php-format
msgid "%s left group %s"
-msgstr "%1$s deixou o grupo %2$s"
+msgstr "%s deixou o grupo %s"
-#: lib/command.php:318
-#, fuzzy, php-format
+#: lib/command.php:309
+#, php-format
msgid "Fullname: %s"
msgstr "Nome completo: %s"
-#: lib/command.php:321 lib/mail.php:254
+#: lib/command.php:312 lib/mail.php:254
#, php-format
msgid "Location: %s"
msgstr "Localidade: %s"
-#: lib/command.php:324 lib/mail.php:256
+#: lib/command.php:315 lib/mail.php:256
#, php-format
msgid "Homepage: %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
+#: lib/command.php:349
+#, php-format
msgid "Message too long - maximum is %d characters, you sent %d"
-msgstr "Mensagem demasiado extensa - máx. %1$d caracteres, enviou %2$d."
+msgstr "Mensagem demasiado extensa - máx. %d caracteres, enviou %d"
-#: lib/command.php:376
-#, fuzzy, php-format
+#: lib/command.php:367
+#, php-format
msgid "Direct message to %s sent"
-msgstr "Mensagem directa para %s foi enviada."
+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:422
-#, fuzzy
+#: lib/command.php:413
msgid "Cannot repeat your own notice"
-msgstr "Não pode repetir a sua própria nota."
+msgstr "Não pode repetir a sua própria nota"
-#: lib/command.php:427
-#, fuzzy
+#: lib/command.php:418
msgid "Already repeated that notice"
-msgstr "Já repetiu essa nota."
+msgstr "Já repetiu essa nota"
-#: lib/command.php:435
-#, fuzzy, php-format
+#: lib/command.php:426
+#, php-format
msgid "Notice from %s repeated"
-msgstr "Nota de %s repetida."
+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
+#: lib/command.php:482
+#, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
-msgstr "Nota demasiado extensa - máx. %1$d caracteres, enviou %2$d."
+msgstr "Nota demasiado extensa - máx. %d caracteres, enviou %d"
-#: lib/command.php:500
-#, fuzzy, php-format
+#: lib/command.php:491
+#, php-format
msgid "Reply to %s sent"
-msgstr "Resposta a %s enviada."
+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
+#: lib/command.php:547
msgid "Specify the name of the user to subscribe to"
-msgstr "Introduza o nome do utilizador para subscrever."
+msgstr "Introduza o nome do utilizador para subscrever"
-#: lib/command.php:563
+#: lib/command.php:554
#, php-format
msgid "Subscribed to %s"
msgstr "Subscreveu %s"
-#: lib/command.php:584
-#, fuzzy
+#: lib/command.php:575
msgid "Specify the name of the user to unsubscribe from"
-msgstr "Introduza o nome do utilizador para deixar de subscrever."
+msgstr "Introduza o nome do utilizador para deixar de subscrever"
-#: lib/command.php:591
+#: 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
+#: lib/command.php:641
msgid "Login command is disabled"
-msgstr "Comando para iniciar sessão foi desactivado."
+msgstr "Comando para iniciar sessão foi desactivado"
-#: lib/command.php:661
-#, fuzzy, php-format
+#: 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."
+"s"
-#: lib/command.php:677
+#: lib/command.php:668
msgid "You are not subscribed to anyone."
msgstr "Não subscreveu ninguém."
-#: lib/command.php:679
+#: lib/command.php:670
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Subscreveu esta pessoa:"
msgstr[1] "Subscreveu estas pessoas:"
-#: lib/command.php:699
+#: lib/command.php:690
msgid "No one is subscribed to you."
msgstr "Ninguém subscreve as suas notas."
-#: lib/command.php:701
+#: 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:721
+#: lib/command.php:712
msgid "You are not a member of any groups."
msgstr "Não está em nenhum grupo."
-#: lib/command.php:723
+#: 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:737
+#: lib/command.php:728
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4702,19 +5052,19 @@ 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 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."
@@ -4730,6 +5080,15 @@ msgstr "Actualizações por mensagem instantânea (MI)"
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"
@@ -4915,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"
@@ -5307,18 +5671,19 @@ msgid "Attach a file"
msgstr "Anexar um ficheiro"
#: lib/noticeform.php:212
-#, fuzzy
msgid "Share my location"
msgstr "Partilhar a minha localização."
-#: lib/noticeform.php:214
+#: lib/noticeform.php:215
#, fuzzy
msgid "Do not share my location"
msgstr "Não partilhar a minha localização."
-#: lib/noticeform.php:215
-msgid "Hide this info"
-msgstr "Ocultar esta informação"
+#: lib/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
@@ -5577,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."
@@ -5667,47 +6032,47 @@ msgstr "Mensagem"
msgid "Moderate"
msgstr "Moderar"
-#: lib/util.php:884
+#: lib/util.php:875
msgid "a few seconds ago"
msgstr "há alguns segundos"
-#: lib/util.php:886
+#: lib/util.php:877
msgid "about a minute ago"
msgstr "há cerca de um minuto"
-#: lib/util.php:888
+#: lib/util.php:879
#, php-format
msgid "about %d minutes ago"
msgstr "há cerca de %d minutos"
-#: lib/util.php:890
+#: lib/util.php:881
msgid "about an hour ago"
msgstr "há cerca de uma hora"
-#: lib/util.php:892
+#: lib/util.php:883
#, php-format
msgid "about %d hours ago"
msgstr "há cerca de %d horas"
-#: lib/util.php:894
+#: lib/util.php:885
msgid "about a day ago"
msgstr "há cerca de um dia"
-#: lib/util.php:896
+#: lib/util.php:887
#, php-format
msgid "about %d days ago"
msgstr "há cerca de %d dias"
-#: lib/util.php:898
+#: lib/util.php:889
msgid "about a month ago"
msgstr "há cerca de um mês"
-#: lib/util.php:900
+#: lib/util.php:891
#, php-format
msgid "about %d months ago"
msgstr "há cerca de %d meses"
-#: lib/util.php:902
+#: lib/util.php:893
msgid "about a year ago"
msgstr "há cerca de um ano"
diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po
index c608b3ba5..c3162d470 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-11 23:25+0000\n"
-"PO-Revision-Date: 2010-01-11 23:28:03+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 (r60950); 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,8 +35,8 @@ 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
@@ -45,15 +45,20 @@ msgstr "Esta página não existe."
#: 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!"
@@ -136,7 +141,7 @@ msgstr "Atualizações de %1$s e amigos no %2$s!"
#: 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/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
@@ -155,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."
@@ -186,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 ""
@@ -269,7 +275,6 @@ msgid "No status found with that ID."
msgstr "Não foi encontrado nenhum status com esse ID."
#: actions/apifavoritecreate.php:119
-#, fuzzy
msgid "This status is already a favorite."
msgstr "Esta mensagem já é favorita!"
@@ -278,7 +283,6 @@ msgid "Could not create favorite."
msgstr "Não foi possível criar a favorita."
#: actions/apifavoritedestroy.php:122
-#, fuzzy
msgid "That status is not a favorite."
msgstr "Essa mensagem não é favorita!"
@@ -300,7 +304,6 @@ 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
-#, fuzzy
msgid "You cannot unfollow yourself."
msgstr "Você não pode deixar de seguir você mesmo!"
@@ -336,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."
@@ -348,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)."
@@ -396,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 actions/joingroup.php:128
-#, 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
@@ -425,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."
@@ -454,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"
@@ -474,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
@@ -609,30 +710,6 @@ msgstr "Enviar"
msgid "Crop"
msgstr "Cortar"
-#: 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/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"
@@ -701,7 +778,7 @@ msgstr "Não foi possível salvar a informação de bloqueio."
#: actions/grouplogo.php:99 actions/groupmembers.php:83
#: actions/grouprss.php:98 actions/groupunblock.php:86
#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86
-#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263
+#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:260
msgid "No such group."
msgstr "Esse grupo não existe."
@@ -711,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."
@@ -770,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
@@ -958,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"
@@ -979,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"
@@ -990,9 +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
-#, fuzzy
msgid "You must be an admin to edit the group."
-msgstr "Você deve ser o administrador do grupo para editá-lo"
+msgstr "Você deve ser um administrador para editar o grupo."
#: actions/editgroup.php:154
msgid "Use this form to edit the group."
@@ -1016,7 +1163,6 @@ msgid "Options saved."
msgstr "As configurações foram salvas."
#: actions/emailsettings.php:60
-#, fuzzy
msgid "Email settings"
msgstr "Configurações do e-mail"
@@ -1049,14 +1195,14 @@ 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
-#, fuzzy
msgid "Email address"
-msgstr "Endereços de e-mail"
+msgstr "Endereço de e-mail"
#: actions/emailsettings.php:123
msgid "Email address, like \"UserName@example.org\""
@@ -1362,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
@@ -1427,7 +1573,6 @@ msgstr ""
"arquivo é %s."
#: actions/grouplogo.php:178
-#, fuzzy
msgid "User without matching profile."
msgstr "Usuário sem um perfil correspondente"
@@ -1449,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."
@@ -1560,7 +1705,6 @@ msgid "Error removing the block."
msgstr "Erro na remoção do bloqueio."
#: actions/imsettings.php:59
-#, fuzzy
msgid "IM settings"
msgstr "Configurações do MI"
@@ -1592,7 +1736,6 @@ msgstr ""
"contatos?)"
#: actions/imsettings.php:124
-#, fuzzy
msgid "IM address"
msgstr "Endereço do MI"
@@ -1695,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)"
@@ -1740,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"
@@ -1810,27 +1953,23 @@ 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:135
-#, 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
-#, 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:80 actions/otp.php:62 actions/register.php:137
msgid "Already logged in."
@@ -1854,17 +1993,6 @@ msgstr "Entrar"
msgid "Login to site"
msgstr "Autenticar-se no site"
-#: actions/login.php:230 actions/profilesettings.php:106
-#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94
-#: lib/groupeditform.php:152 lib/userprofile.php:131
-msgid "Nickname"
-msgstr "Usuário"
-
-#: actions/login.php:233 actions/register.php:429
-#: lib/accountsettingsaction.php:116
-msgid "Password"
-msgstr "Senha"
-
#: actions/login.php:236 actions/register.php:478
msgid "Remember me"
msgstr "Lembrar neste computador"
@@ -1903,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
+#, 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"
+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
+#, 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"
+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"
@@ -1933,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!"
@@ -1946,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 ""
@@ -1958,9 +2106,9 @@ msgid "Message sent"
msgstr "A mensagem foi enviada"
#: actions/newmessage.php:185
-#, fuzzy, php-format
+#, php-format
msgid "Direct message to %s sent."
-msgstr "A mensagem direta para %s foi enviada"
+msgstr "A mensagem direta para %s foi enviada."
#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
msgid "Ajax Error"
@@ -1988,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
@@ -2036,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"
@@ -2053,8 +2245,8 @@ msgstr "tipo de conteúdo "
msgid "Only "
msgstr "Apenas "
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033
-#: lib/api.php:1061 lib/api.php:1171
+#: 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."
@@ -2067,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
@@ -2099,29 +2291,24 @@ 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
-#, fuzzy
msgid "No user ID specified."
-msgstr "Não foi especificado nenhum grupo."
+msgstr "Não foi especificado nenhum ID de usuário."
#: actions/otp.php:83
-#, fuzzy
msgid "No login token specified."
-msgstr "Não foi especificada nenhuma mensagem."
+msgstr "Não foi especificado nenhum token de autenticação."
#: actions/otp.php:90
-#, fuzzy
msgid "No login token requested."
-msgstr "Nenhuma ID de perfil na requisição."
+msgstr "Não foi requerido nenhum token de autenticação."
#: actions/otp.php:95
-#, fuzzy
msgid "Invalid login token specified."
-msgstr "Token inválido ou expirado."
+msgstr "O token de autenticação especificado é inválido."
#: actions/otp.php:104
-#, fuzzy
msgid "Login token expired."
-msgstr "Autenticar-se no site"
+msgstr "O token de autenticação expirou."
#: actions/outbox.php:61
#, php-format
@@ -2322,7 +2509,6 @@ msgid "When to use SSL"
msgstr "Quando usar SSL"
#: actions/pathsadminpanel.php:308
-#, fuzzy
msgid "SSL server"
msgstr "Servidor SSL"
@@ -2353,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"
@@ -2393,7 +2579,7 @@ msgid "Full name"
msgstr "Nome completo"
#: actions/profilesettings.php:115 actions/register.php:453
-#: lib/groupeditform.php:161
+#: lib/applicationeditform.php:230 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Site"
@@ -2821,7 +3007,7 @@ msgstr ""
"e número de telefone."
#: actions/register.php:538
-#, fuzzy, php-format
+#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
"want to...\n"
@@ -2838,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 "
@@ -2965,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
@@ -2983,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
@@ -3004,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."
@@ -3117,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"
@@ -3186,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
@@ -3211,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 ""
@@ -3225,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
@@ -3280,14 +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
-#, fuzzy
msgid "You must have a valid contact email address."
msgstr "Você deve ter um endereço de e-mail para contato válido."
#: actions/siteadminpanel.php:172
-#, fuzzy, php-format
+#, php-format
msgid "Unknown language \"%s\"."
-msgstr "Idioma desconhecido \"%s\""
+msgstr "Idioma \"%s\" desconhecido."
#: actions/siteadminpanel.php:179
msgid "Invalid snapshot report URL."
@@ -3468,9 +3727,8 @@ msgid "Save site settings"
msgstr "Salvar as configurações do site"
#: actions/smssettings.php:58
-#, fuzzy
msgid "SMS settings"
-msgstr "Configuração de SMS"
+msgstr "Configuração do SMS"
#: actions/smssettings.php:69
#, php-format
@@ -3498,7 +3756,6 @@ msgid "Enter the code you received on your phone."
msgstr "Informe o código que você recebeu no seu telefone."
#: actions/smssettings.php:138
-#, fuzzy
msgid "SMS phone number"
msgstr "Telefone para SMS"
@@ -3589,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."
@@ -3630,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."
@@ -3760,12 +4017,12 @@ 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
@@ -3923,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
@@ -3990,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
@@ -4000,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 ""
@@ -4017,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 ""
@@ -4025,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
@@ -4032,29 +4298,20 @@ 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"
-
-#: actions/version.php:198 lib/groupeditform.php:172
-msgid "Description"
-msgstr "Descrição"
+msgstr "Author(es)"
#: classes/File.php:144
#, php-format
@@ -4075,8 +4332,20 @@ msgstr "Um arquivo deste tamanho excederá a sua conta de %d bytes."
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
-#, fuzzy, php-format
+#, php-format
msgid "Could not create login token for %s"
msgstr "Não foi possível criar o token de autenticação para %s"
@@ -4092,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."
@@ -4120,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!"
@@ -4180,9 +4449,9 @@ msgid "Other options"
msgstr "Outras opções"
#: lib/action.php:144
-#, fuzzy, php-format
+#, php-format
msgid "%1$s - %2$s"
-msgstr "%1$s (%2$s)"
+msgstr "%1$s - %2$s"
#: lib/action.php:159
msgid "Untitled page"
@@ -4201,10 +4470,6 @@ 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"
@@ -4358,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."
@@ -4395,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"
@@ -4415,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"
@@ -4442,7 +4762,7 @@ 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
+#, 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"
@@ -4451,7 +4771,7 @@ msgid "It does not make a lot of sense to nudge yourself!"
msgstr "Não faz muito sentido chamar a sua própria atenção!"
#: lib/command.php:99
-#, fuzzy, php-format
+#, php-format
msgid "Nudge sent to %s"
msgstr "Foi enviada a chamada de atenção para %s"
@@ -4466,14 +4786,12 @@ msgstr ""
"Assinantes: %2$s\n"
"Mensagens: %3$s"
-#: lib/command.php:152 lib/command.php:399 lib/command.php:460
-#, fuzzy
+#: 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
+#: 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\""
@@ -4482,182 +4800,176 @@ msgid "Notice marked as fave."
msgstr "Mensagem marcada como favorita."
#: lib/command.php:217
-#, fuzzy
msgid "You are already a member of that group"
-msgstr "Você já é membro desse grupo."
+msgstr "Você já é um membro desse grupo."
-#: lib/command.php:234
-#, fuzzy, php-format
+#: 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."
+msgstr "Não foi possível associar o usuário %s ao grupo %s"
-#: lib/command.php:239
-#, fuzzy, php-format
+#: lib/command.php:236
+#, php-format
msgid "%s joined group %s"
msgstr "%s associou-se ao grupo %s"
-#: lib/command.php:284
-#, fuzzy, php-format
+#: 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:289
-#, fuzzy, php-format
+#: lib/command.php:280
+#, php-format
msgid "%s left group %s"
msgstr "%s deixou o grupo %s"
-#: lib/command.php:318
-#, fuzzy, php-format
+#: lib/command.php:309
+#, php-format
msgid "Fullname: %s"
msgstr "Nome completo: %s"
-#: lib/command.php:321 lib/mail.php:254
+#: lib/command.php:312 lib/mail.php:254
#, php-format
msgid "Location: %s"
msgstr "Localização: %s"
-#: lib/command.php:324 lib/mail.php:256
+#: 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
+#: 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
+#: 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:422
-#, fuzzy
+#: lib/command.php:413
msgid "Cannot repeat your own notice"
-msgstr "Você não pode repetria sua própria mensagem."
+msgstr "Você não pode repetir sua própria mensagem"
-#: lib/command.php:427
-#, fuzzy
+#: lib/command.php:418
msgid "Already repeated that notice"
-msgstr "Você já repetiu essa mensagem."
+msgstr "Você já repetiu essa mensagem"
-#: lib/command.php:435
-#, fuzzy, php-format
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: lib/command.php:641
msgid "Login command is disabled"
msgstr "O comando para autenticação está desabilitado"
-#: lib/command.php:661
-#, fuzzy, php-format
+#: 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:677
+#: lib/command.php:668
msgid "You are not subscribed to anyone."
msgstr "Você não está assinando ninguém."
-#: lib/command.php:679
+#: 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:699
+#: lib/command.php:690
msgid "No one is subscribed to you."
msgstr "Ninguém o assinou ainda."
-#: lib/command.php:701
+#: 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:721
+#: lib/command.php:712
msgid "You are not a member of any groups."
msgstr "Você não é membro de nenhum grupo."
-#: lib/command.php:723
+#: 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:737
+#: lib/command.php:728
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4736,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."
@@ -4764,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"
@@ -4950,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"
@@ -5035,11 +5360,9 @@ msgstr ""
"Altere seu endereço de e-mail e suas opções de notificação em %8$s\n"
#: lib/mail.php:258
-#, fuzzy, php-format
+#, php-format
msgid "Bio: %s"
-msgstr ""
-"Descrição: %s\n"
-"\n"
+msgstr "Descrição: %s"
#: lib/mail.php:286
#, php-format
@@ -5253,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."
@@ -5294,18 +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
-#, fuzzy
msgid "File exceeds user's quota."
-msgstr "O arquivo excede a quota do usuário!"
+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
-#, fuzzy
msgid "Could not determine file's MIME type."
-msgstr "Não foi possível determinar o mime-type do arquivo!"
+msgstr "Não foi possível determinar o tipo MIME do arquivo."
#: lib/mediafile.php:270
#, php-format
@@ -5313,7 +5634,7 @@ msgid " Try using another %s format."
msgstr " Tente usar outro formato %s."
#: lib/mediafile.php:275
-#, fuzzy, php-format
+#, php-format
msgid "%s is not a supported file type on this server."
msgstr "%s não é um tipo de arquivo suportado neste servidor."
@@ -5347,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"
+msgstr "Divulgar minha localização"
-#: lib/noticeform.php:214
-#, fuzzy
+#: lib/noticeform.php:215
msgid "Do not share my location"
-msgstr "Indique a sua localização"
+msgstr "Não divulgar minha localização"
-#: lib/noticeform.php:215
-msgid "Hide this info"
+#: 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
@@ -5475,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"
@@ -5618,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."
@@ -5708,47 +6030,47 @@ msgstr "Mensagem"
msgid "Moderate"
msgstr "Moderar"
-#: lib/util.php:884
+#: lib/util.php:875
msgid "a few seconds ago"
msgstr "alguns segundos atrás"
-#: lib/util.php:886
+#: lib/util.php:877
msgid "about a minute ago"
msgstr "cerca de 1 minuto atrás"
-#: lib/util.php:888
+#: lib/util.php:879
#, php-format
msgid "about %d minutes ago"
msgstr "cerca de %d minutos atrás"
-#: lib/util.php:890
+#: lib/util.php:881
msgid "about an hour ago"
msgstr "cerca de 1 hora atrás"
-#: lib/util.php:892
+#: lib/util.php:883
#, php-format
msgid "about %d hours ago"
msgstr "cerca de %d horas atrás"
-#: lib/util.php:894
+#: lib/util.php:885
msgid "about a day ago"
msgstr "cerca de 1 dia atrás"
-#: lib/util.php:896
+#: lib/util.php:887
#, php-format
msgid "about %d days ago"
msgstr "cerca de %d dias atrás"
-#: lib/util.php:898
+#: lib/util.php:889
msgid "about a month ago"
msgstr "cerca de 1 mês atrás"
-#: lib/util.php:900
+#: lib/util.php:891
#, php-format
msgid "about %d months ago"
msgstr "cerca de %d meses atrás"
-#: lib/util.php:902
+#: lib/util.php:893
msgid "about a year ago"
msgstr "cerca de 1 ano atrás"
@@ -5763,7 +6085,7 @@ msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr "%s não é uma cor válida! Utilize 3 ou 6 caracteres hexadecimais."
#: scripts/xmppdaemon.php:301
-#, fuzzy, php-format
+#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr ""
-"A mensagem é muito extensa - o máximo são %d caracteres e você enviou %d"
+"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 574ae66a2..19868d34b 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-11 23:25+0000\n"
-"PO-Revision-Date: 2010-01-11 23:28:10+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 (r60950); 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,8 +36,8 @@ 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
@@ -46,15 +46,20 @@ msgstr "Ðет такой Ñтраницы"
#: 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"
@@ -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!"
@@ -135,7 +140,7 @@ msgstr "Обновлено от %1$s и его друзей на %2$s!"
#: 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/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
@@ -154,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."
@@ -183,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 ""
@@ -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 Ñимволов)"
@@ -393,7 +401,7 @@ msgstr "Ð’Ñ‹ уже ÑвлÑетеÑÑŒ членом Ñтой группы."
msgid "You have been blocked from that group by the admin."
msgstr "Ð’Ñ‹ заблокированы из Ñтой группы админиÑтратором."
-#: actions/apigroupjoin.php:138 actions/joingroup.php:128
+#: actions/apigroupjoin.php:138 actions/joingroup.php:124
#, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "Ðе удаётÑÑ Ð¿Ñ€Ð¸Ñоединить Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ %1$s к группе %2$s."
@@ -402,7 +410,7 @@ msgstr "Ðе удаётÑÑ Ð¿Ñ€Ð¸Ñоединить Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ %1
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 "Ðе удаётÑÑ ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ %1$s из группы %2$s."
@@ -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."
@@ -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 вложениÑ."
@@ -606,29 +708,6 @@ msgstr "Загрузить"
msgid "Crop"
msgstr "Обрезать"
-#: 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/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 "Подберите нужный квадратный учаÑток Ð´Ð»Ñ Ð²Ð°ÑˆÐµÐ¹ аватары"
@@ -696,7 +775,7 @@ msgstr "Ðе удаётÑÑ Ñохранить информацию о блокÐ
#: actions/grouplogo.php:99 actions/groupmembers.php:83
#: actions/grouprss.php:98 actions/groupunblock.php:86
#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86
-#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263
+#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:260
msgid "No such group."
msgstr "Ðет такой группы."
@@ -765,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
@@ -953,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 "Сохранить"
@@ -974,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"
@@ -1042,7 +1200,8 @@ 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 "Отменить"
@@ -1687,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)"
@@ -1732,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 "ОК"
@@ -1802,7 +1961,7 @@ msgstr ""
msgid "You must be logged in to join a group."
msgstr "Ð’Ñ‹ должны авторизоватьÑÑ Ð´Ð»Ñ Ð²ÑÑ‚ÑƒÐ¿Ð»ÐµÐ½Ð¸Ñ Ð² группу."
-#: actions/joingroup.php:135
+#: actions/joingroup.php:131
#, php-format
msgid "%1$s joined group %2$s"
msgstr "%1$s вÑтупил в группу %2$s"
@@ -1811,15 +1970,11 @@ msgstr "%1$s вÑтупил в группу %2$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
+#: actions/leavegroup.php:127
#, php-format
msgid "%1$s left group %2$s"
msgstr "%1$s покинул группу %2$s"
@@ -1845,17 +2000,6 @@ msgstr "Вход"
msgid "Login to site"
msgstr "ÐвторизоватьÑÑ"
-#: actions/login.php:230 actions/profilesettings.php:106
-#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94
-#: lib/groupeditform.php:152 lib/userprofile.php:131
-msgid "Nickname"
-msgstr "ИмÑ"
-
-#: actions/login.php:233 actions/register.php:429
-#: lib/accountsettingsaction.php:116
-msgid "Password"
-msgstr "Пароль"
-
#: actions/login.php:236 actions/register.php:478
msgid "Remember me"
msgstr "Запомнить менÑ"
@@ -1909,6 +2053,29 @@ msgstr "Ðевозможно Ñделать %1$s админиÑтратором
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 "ÐÐ¾Ð²Ð°Ñ Ð³Ñ€ÑƒÐ¿Ð¿Ð°"
@@ -1921,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 "Ðет контента!"
@@ -1934,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 "Ðе поÑылайте ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ñами Ñебе; проÑто потихоньку Ñкажите Ñто Ñебе."
@@ -2021,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 "ЗапиÑÑŒ без профилÑ"
@@ -2038,8 +2250,8 @@ msgstr "тип Ñодержимого "
msgid "Only "
msgstr "Только "
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033
-#: lib/api.php:1061 lib/api.php:1171
+#: 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 "Ðеподдерживаемый формат данных."
@@ -2052,7 +2264,8 @@ msgid "Notice Search"
msgstr "ПоиÑк в запиÑÑÑ…"
#: actions/othersettings.php:60
-msgid "Other Settings"
+#, fuzzy
+msgid "Other settings"
msgstr "Другие наÑтройки"
#: actions/othersettings.php:71
@@ -2084,9 +2297,8 @@ msgid "URL shortening service is too long (max 50 chars)."
msgstr "Ð¡ÐµÑ€Ð²Ð¸Ñ ÑÐ¾ÐºÑ€Ð°Ñ‰ÐµÐ½Ð¸Ñ URL Ñлишком длинный (макÑимум 50 Ñимволов)."
#: actions/otp.php:69
-#, fuzzy
msgid "No user ID specified."
-msgstr "Группа не определена."
+msgstr "Ðе указан идентификатор пользователÑ."
#: actions/otp.php:83
#, fuzzy
@@ -2375,7 +2587,7 @@ msgid "Full name"
msgstr "Полное имÑ"
#: actions/profilesettings.php:115 actions/register.php:453
-#: lib/groupeditform.php:161
+#: lib/applicationeditform.php:230 lib/groupeditform.php:161
msgid "Homepage"
msgstr "ГлавнаÑ"
@@ -2982,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 "Ðе удаётÑÑ Ð²Ð¾ÑÑтановить любимые запиÑи."
@@ -3094,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 "Создано"
@@ -4026,10 +4311,6 @@ msgstr ""
msgid "Plugins"
msgstr "Плагины"
-#: actions/version.php:195
-msgid "Name"
-msgstr "ИмÑ"
-
#: actions/version.php:196 lib/action.php:741
msgid "Version"
msgstr "ВерÑиÑ"
@@ -4038,10 +4319,6 @@ msgstr "ВерÑиÑ"
msgid "Author(s)"
msgstr "Ðвтор(Ñ‹)"
-#: actions/version.php:198 lib/groupeditform.php:172
-msgid "Description"
-msgstr "ОпиÑание"
-
#: classes/File.php:144
#, php-format
msgid ""
@@ -4061,10 +4338,25 @@ msgstr "Файл такого размера превыÑит вашу польÐ
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
-#, fuzzy, php-format
+#, php-format
msgid "Could not create login token for %s"
-msgstr "Ðе удаётÑÑ Ñоздать токен входа Ð´Ð»Ñ %s."
+msgstr "Ðе удаётÑÑ Ñоздать токен входа Ð´Ð»Ñ %s"
#: classes/Message.php:45
msgid "You are banned from sending direct messages."
@@ -4078,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."
@@ -4106,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!"
@@ -4187,10 +4479,6 @@ 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, аватару, пароль, профиль"
@@ -4345,10 +4633,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 "Ð’Ñ‹ не можете изменÑÑ‚ÑŒ Ñтот Ñайт."
@@ -4381,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 "ВложениÑ"
@@ -4401,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 "Смена Ð¿Ð°Ñ€Ð¾Ð»Ñ Ð½Ðµ разрешена"
@@ -4426,18 +4776,18 @@ msgid "Sorry, this command is not yet implemented."
msgstr "ПроÑтите, Ñта команда ещё не выполнена."
#: lib/command.php:88
-#, fuzzy, php-format
+#, php-format
msgid "Could not find a user with nickname %s"
-msgstr "Ðе удаётÑÑ Ð½Ð°Ð¹Ñ‚Ð¸ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ %s."
+msgstr "Ðе удаётÑÑ Ð½Ð°Ð¹Ñ‚Ð¸ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ %s"
#: lib/command.php:92
msgid "It does not make a lot of sense to nudge yourself!"
msgstr "Ðет ÑмыÑла «подталкивать» Ñамого ÑебÑ!"
#: lib/command.php:99
-#, fuzzy, php-format
+#, php-format
msgid "Nudge sent to %s"
-msgstr "«Подталкивание» поÑлано %s."
+msgstr "«Подталкивание» поÑлано %s"
#: lib/command.php:126
#, php-format
@@ -4450,14 +4800,12 @@ msgstr ""
"ПодпиÑчиков: %2$s\n"
"ЗапиÑей: %3$s"
-#: lib/command.php:152 lib/command.php:399 lib/command.php:460
-#, fuzzy
+#: lib/command.php:152 lib/command.php:390 lib/command.php:451
msgid "Notice with that id does not exist"
-msgstr "ЗапиÑи Ñ Ñ‚Ð°ÐºÐ¸Ð¼ id не ÑущеÑтвует."
+msgstr "ЗапиÑи Ñ Ñ‚Ð°ÐºÐ¸Ð¼ id не ÑущеÑтвует"
-#: lib/command.php:168 lib/command.php:415 lib/command.php:476
-#: lib/command.php:532
-#, fuzzy
+#: lib/command.php:168 lib/command.php:406 lib/command.php:467
+#: lib/command.php:523
msgid "User has no last notice"
msgstr "У Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð½ÐµÑ‚ поÑледней запиÑи."
@@ -4466,182 +4814,175 @@ msgid "Notice marked as fave."
msgstr "ЗапиÑÑŒ помечена как любимаÑ."
#: lib/command.php:217
-#, fuzzy
msgid "You are already a member of that group"
msgstr "Ð’Ñ‹ уже ÑвлÑетеÑÑŒ членом Ñтой группы."
-#: lib/command.php:234
-#, fuzzy, php-format
+#: lib/command.php:231
+#, php-format
msgid "Could not join user %s to group %s"
-msgstr "Ðе удаётÑÑ Ð¿Ñ€Ð¸Ñоединить Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ %1$s к группе %2$s."
+msgstr "Ðе удаётÑÑ Ð¿Ñ€Ð¸Ñоединить Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ %s к группе %s"
-#: lib/command.php:239
-#, fuzzy, php-format
+#: lib/command.php:236
+#, php-format
msgid "%s joined group %s"
msgstr "%1$s вÑтупил в группу %2$s"
-#: lib/command.php:284
-#, fuzzy, php-format
+#: lib/command.php:275
+#, php-format
msgid "Could not remove user %s to group %s"
msgstr "Ðе удаётÑÑ ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ %1$s из группы %2$s."
-#: lib/command.php:289
-#, fuzzy, php-format
+#: lib/command.php:280
+#, php-format
msgid "%s left group %s"
msgstr "%1$s покинул группу %2$s"
-#: lib/command.php:318
-#, fuzzy, php-format
+#: lib/command.php:309
+#, php-format
msgid "Fullname: %s"
msgstr "Полное имÑ: %s"
-#: lib/command.php:321 lib/mail.php:254
+#: lib/command.php:312 lib/mail.php:254
#, php-format
msgid "Location: %s"
msgstr "МеÑтораÑположение: %s"
-#: lib/command.php:324 lib/mail.php:256
+#: 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
+#: lib/command.php:349
+#, php-format
msgid "Message too long - maximum is %d characters, you sent %d"
-msgstr ""
-"Сообщение Ñлишком длинное — не больше %1$d Ñимволов, вы отправили %2$d."
+msgstr "Сообщение Ñлишком длинное — не больше %d Ñимволов, вы поÑылаете %d"
-#: lib/command.php:376
-#, fuzzy, php-format
+#: 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:422
-#, fuzzy
+#: lib/command.php:413
msgid "Cannot repeat your own notice"
msgstr "Ðевозможно повторить ÑобÑтвенную запиÑÑŒ."
-#: lib/command.php:427
-#, fuzzy
+#: lib/command.php:418
msgid "Already repeated that notice"
-msgstr "ЗапиÑÑŒ уже повторена."
+msgstr "Эта запиÑÑŒ уже повторена"
-#: lib/command.php:435
-#, fuzzy, php-format
+#: lib/command.php:426
+#, php-format
msgid "Notice from %s repeated"
-msgstr "ЗапиÑÑŒ %s повторена."
+msgstr "ЗапиÑÑŒ %s повторена"
-#: lib/command.php:437
+#: lib/command.php:428
msgid "Error repeating notice."
msgstr "Ошибка при повторении запиÑи."
-#: lib/command.php:491
-#, fuzzy, php-format
+#: lib/command.php:482
+#, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
-msgstr "ЗапиÑÑŒ Ñлишком Ð´Ð»Ð¸Ð½Ð½Ð°Ñ â€” не больше %1$d Ñимволов, вы отправили %2$d."
+msgstr "ЗапиÑÑŒ Ñлишком Ð´Ð»Ð¸Ð½Ð½Ð°Ñ â€” не больше %d Ñимволов, вы поÑылаете %d"
-#: lib/command.php:500
-#, fuzzy, php-format
+#: lib/command.php:491
+#, php-format
msgid "Reply to %s sent"
-msgstr "Ответ %s отправлен."
+msgstr "Ответ %s отправлен"
-#: lib/command.php:502
+#: lib/command.php:493
msgid "Error saving notice."
msgstr "Проблемы Ñ Ñохранением запиÑи."
-#: lib/command.php:556
-#, fuzzy
+#: 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
+#: 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
+#: lib/command.php:641
msgid "Login command is disabled"
-msgstr "Команда входа отключена."
+msgstr "Команда входа отключена"
-#: lib/command.php:661
-#, fuzzy, php-format
+#: lib/command.php:652
+#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
-msgstr "Эта ÑÑылка дейÑтвительна только один раз в течение 2 минут: %s."
+msgstr "Эта ÑÑылка дейÑтвительна только один раз в течение 2 минут: %s"
-#: lib/command.php:677
+#: lib/command.php:668
msgid "You are not subscribed to anyone."
msgstr "Ð’Ñ‹ ни на кого не подпиÑаны."
-#: lib/command.php:679
+#: 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:699
+#: lib/command.php:690
msgid "No one is subscribed to you."
msgstr "Ðикто не подпиÑан на ваÑ."
-#: lib/command.php:701
+#: 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:721
+#: lib/command.php:712
msgid "You are not a member of any groups."
msgstr "Ð’Ñ‹ не ÑоÑтоите ни в одной группе."
-#: lib/command.php:723
+#: 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:737
+#: lib/command.php:728
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4719,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 "Перейти к уÑтановщику"
@@ -4747,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 "Ошибка базы данных"
@@ -4933,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 "ПриÑоединитьÑÑ"
@@ -5324,18 +5679,18 @@ msgid "Attach a file"
msgstr "Прикрепить файл"
#: lib/noticeform.php:212
-#, fuzzy
msgid "Share my location"
msgstr "ПоделитьÑÑ Ñвоим меÑтоположением."
-#: lib/noticeform.php:214
-#, fuzzy
+#: lib/noticeform.php:215
msgid "Do not share my location"
-msgstr "Ðе публиковать Ñвоё меÑтоположение."
+msgstr "Ðе публиковать Ñвоё меÑтоположение"
-#: lib/noticeform.php:215
-msgid "Hide this info"
-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
@@ -5594,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 "Ðе удаётÑÑ ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ подпиÑку."
@@ -5684,47 +6039,47 @@ msgstr "Сообщение"
msgid "Moderate"
msgstr "Модерировать"
-#: lib/util.php:884
+#: lib/util.php:875
msgid "a few seconds ago"
msgstr "пару Ñекунд назад"
-#: lib/util.php:886
+#: lib/util.php:877
msgid "about a minute ago"
msgstr "около минуты назад"
-#: lib/util.php:888
+#: lib/util.php:879
#, php-format
msgid "about %d minutes ago"
msgstr "около %d минут(ы) назад"
-#: lib/util.php:890
+#: lib/util.php:881
msgid "about an hour ago"
msgstr "около чаÑа назад"
-#: lib/util.php:892
+#: lib/util.php:883
#, php-format
msgid "about %d hours ago"
msgstr "около %d чаÑа(ов) назад"
-#: lib/util.php:894
+#: lib/util.php:885
msgid "about a day ago"
msgstr "около Ð´Ð½Ñ Ð½Ð°Ð·Ð°Ð´"
-#: lib/util.php:896
+#: lib/util.php:887
#, php-format
msgid "about %d days ago"
msgstr "около %d днÑ(ей) назад"
-#: lib/util.php:898
+#: lib/util.php:889
msgid "about a month ago"
msgstr "около меÑÑца назад"
-#: lib/util.php:900
+#: lib/util.php:891
#, php-format
msgid "about %d months ago"
msgstr "около %d меÑÑца(ев) назад"
-#: lib/util.php:902
+#: lib/util.php:893
msgid "about a year ago"
msgstr "около года назад"
diff --git a/locale/statusnet.po b/locale/statusnet.po
index 87d8b0b50..a7f7f9f74 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-11 23:25+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 <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -31,8 +31,8 @@ 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
@@ -41,15 +41,20 @@ msgstr ""
#: 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!"
@@ -123,7 +128,7 @@ msgstr ""
#: 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/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
@@ -142,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 ""
@@ -171,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 ""
@@ -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 ""
@@ -372,7 +380,7 @@ msgstr ""
msgid "You have been blocked from that group by the admin."
msgstr ""
-#: actions/apigroupjoin.php:138 actions/joingroup.php:128
+#: 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 ""
@@ -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 ""
@@ -584,29 +683,6 @@ msgstr ""
msgid "Crop"
msgstr ""
-#: 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/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 ""
@@ -671,7 +747,7 @@ msgstr ""
#: actions/grouplogo.php:99 actions/groupmembers.php:83
#: actions/grouprss.php:98 actions/groupunblock.php:86
#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86
-#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263
+#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:260
msgid "No such group."
msgstr ""
@@ -740,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
@@ -922,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 ""
@@ -943,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"
@@ -1009,7 +1156,8 @@ 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 ""
@@ -1603,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 ""
@@ -1644,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 ""
@@ -1688,7 +1836,7 @@ msgstr ""
msgid "You must be logged in to join a group."
msgstr ""
-#: actions/joingroup.php:135
+#: actions/joingroup.php:131
#, php-format
msgid "%1$s joined group %2$s"
msgstr ""
@@ -1697,15 +1845,11 @@ 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
+#: actions/leavegroup.php:127
#, php-format
msgid "%1$s left group %2$s"
msgstr ""
@@ -1731,17 +1875,6 @@ msgstr ""
msgid "Login to site"
msgstr ""
-#: actions/login.php:230 actions/profilesettings.php:106
-#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94
-#: lib/groupeditform.php:152 lib/userprofile.php:131
-msgid "Nickname"
-msgstr ""
-
-#: actions/login.php:233 actions/register.php:429
-#: lib/accountsettingsaction.php:116
-msgid "Password"
-msgstr ""
-
#: actions/login.php:236 actions/register.php:478
msgid "Remember me"
msgstr ""
@@ -1790,6 +1923,26 @@ msgstr ""
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 ""
@@ -1802,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 ""
@@ -1815,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 ""
@@ -1894,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 ""
@@ -1911,8 +2106,8 @@ msgstr ""
msgid "Only "
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033
-#: lib/api.php:1061 lib/api.php:1171
+#: 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 ""
@@ -1925,7 +2120,7 @@ msgid "Notice Search"
msgstr ""
#: actions/othersettings.php:60
-msgid "Other Settings"
+msgid "Other settings"
msgstr ""
#: actions/othersettings.php:71
@@ -2237,7 +2432,7 @@ msgid "Full name"
msgstr ""
#: actions/profilesettings.php:115 actions/register.php:453
-#: lib/groupeditform.php:161
+#: lib/applicationeditform.php:230 lib/groupeditform.php:161
msgid "Homepage"
msgstr ""
@@ -2791,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 ""
@@ -2896,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 ""
@@ -3751,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 ""
@@ -3763,10 +4024,6 @@ msgstr ""
msgid "Author(s)"
msgstr ""
-#: actions/version.php:198 lib/groupeditform.php:172
-msgid "Description"
-msgstr ""
-
#: classes/File.php:144
#, php-format
msgid ""
@@ -3784,6 +4041,18 @@ msgstr ""
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"
@@ -3801,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 ""
@@ -3906,10 +4175,6 @@ 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 ""
@@ -4058,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 ""
@@ -4094,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 ""
@@ -4114,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 ""
@@ -4160,12 +4482,12 @@ 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
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
msgid "User has no last notice"
msgstr ""
@@ -4177,169 +4499,169 @@ msgstr ""
msgid "You are already a member of that group"
msgstr ""
-#: lib/command.php:234
+#: lib/command.php:231
#, php-format
msgid "Could not join user %s to group %s"
msgstr ""
-#: lib/command.php:239
+#: lib/command.php:236
#, php-format
msgid "%s joined group %s"
msgstr ""
-#: lib/command.php:284
+#: lib/command.php:275
#, php-format
msgid "Could not remove user %s to group %s"
msgstr ""
-#: lib/command.php:289
+#: lib/command.php:280
#, php-format
msgid "%s left group %s"
msgstr ""
-#: lib/command.php:318
+#: lib/command.php:309
#, php-format
msgid "Fullname: %s"
msgstr ""
-#: lib/command.php:321 lib/mail.php:254
+#: lib/command.php:312 lib/mail.php:254
#, php-format
msgid "Location: %s"
msgstr ""
-#: lib/command.php:324 lib/mail.php:256
+#: 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 %d characters, you sent %d"
msgstr ""
-#: lib/command.php:376
+#: lib/command.php:367
#, php-format
msgid "Direct message to %s sent"
msgstr ""
-#: lib/command.php:378
+#: lib/command.php:369
msgid "Error sending direct message."
msgstr ""
-#: lib/command.php:422
+#: lib/command.php:413
msgid "Cannot repeat your own notice"
msgstr ""
-#: lib/command.php:427
+#: lib/command.php:418
msgid "Already repeated that notice"
msgstr ""
-#: lib/command.php:435
+#: lib/command.php:426
#, php-format
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
#, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr ""
-#: lib/command.php:500
+#: lib/command.php:491
#, 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
+#: 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
+#: 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
+#: lib/command.php:641
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:661
+#: lib/command.php:652
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:677
+#: lib/command.php:668
msgid "You are not subscribed to anyone."
msgstr ""
-#: lib/command.php:679
+#: 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:699
+#: lib/command.php:690
msgid "No one is subscribed to you."
msgstr ""
-#: lib/command.php:701
+#: 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:721
+#: lib/command.php:712
msgid "You are not a member of any groups."
msgstr ""
-#: lib/command.php:723
+#: 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:737
+#: lib/command.php:728
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4380,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 ""
@@ -4408,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 ""
@@ -4590,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 ""
@@ -4895,12 +5230,14 @@ msgstr ""
msgid "Share my location"
msgstr ""
-#: lib/noticeform.php:214
+#: lib/noticeform.php:215
msgid "Do not share my location"
msgstr ""
-#: lib/noticeform.php:215
-msgid "Hide this info"
+#: lib/noticeform.php:216
+msgid ""
+"Sorry, retrieving your geo location is taking longer than expected, please "
+"try again later"
msgstr ""
#: lib/noticelist.php:428
@@ -5160,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 ""
@@ -5250,47 +5587,47 @@ msgstr ""
msgid "Moderate"
msgstr ""
-#: lib/util.php:884
+#: lib/util.php:875
msgid "a few seconds ago"
msgstr ""
-#: lib/util.php:886
+#: lib/util.php:877
msgid "about a minute ago"
msgstr ""
-#: lib/util.php:888
+#: lib/util.php:879
#, php-format
msgid "about %d minutes ago"
msgstr ""
-#: lib/util.php:890
+#: lib/util.php:881
msgid "about an hour ago"
msgstr ""
-#: lib/util.php:892
+#: lib/util.php:883
#, php-format
msgid "about %d hours ago"
msgstr ""
-#: lib/util.php:894
+#: lib/util.php:885
msgid "about a day ago"
msgstr ""
-#: lib/util.php:896
+#: lib/util.php:887
#, php-format
msgid "about %d days ago"
msgstr ""
-#: lib/util.php:898
+#: lib/util.php:889
msgid "about a month ago"
msgstr ""
-#: lib/util.php:900
+#: lib/util.php:891
#, php-format
msgid "about %d months ago"
msgstr ""
-#: lib/util.php:902
+#: lib/util.php:893
msgid "about a year ago"
msgstr ""
diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po
index 3d395afce..8d093bc49 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-11 23:25+0000\n"
-"PO-Revision-Date: 2010-01-11 23:28:14+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 (r60950); 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,8 +34,8 @@ 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
@@ -44,15 +44,20 @@ msgstr "Ingen sådan sida"
#: 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!"
@@ -133,7 +138,7 @@ msgstr "Uppdateringar från %1$s och vänner på %2$s!"
#: 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/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
@@ -152,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."
@@ -181,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 ""
@@ -328,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."
@@ -340,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)"
@@ -388,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 actions/joingroup.php:128
+#: 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."
@@ -397,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."
@@ -417,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."
@@ -446,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."
@@ -601,29 +705,6 @@ msgstr "Ladda upp"
msgid "Crop"
msgstr "Beskär"
-#: 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/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"
@@ -691,7 +772,7 @@ msgstr "Misslyckades att spara blockeringsinformation."
#: actions/grouplogo.php:99 actions/groupmembers.php:83
#: actions/grouprss.php:98 actions/groupunblock.php:86
#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86
-#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263
+#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:260
msgid "No such group."
msgstr "Ingen sådan grupp."
@@ -761,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
@@ -949,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"
@@ -970,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"
@@ -1040,7 +1204,8 @@ 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"
@@ -1677,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)"
@@ -1724,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"
@@ -1768,7 +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:135
+#: actions/joingroup.php:131
#, fuzzy, php-format
msgid "%1$s joined group %2$s"
msgstr "%s gick med i grupp %s"
@@ -1777,15 +1942,11 @@ 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
+#: actions/leavegroup.php:127
#, fuzzy, php-format
msgid "%1$s left group %2$s"
msgstr "%s lämnade grupp %s"
@@ -1811,17 +1972,6 @@ msgstr "Logga in"
msgid "Login to site"
msgstr "Logga in på webbplatsen"
-#: actions/login.php:230 actions/profilesettings.php:106
-#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94
-#: lib/groupeditform.php:152 lib/userprofile.php:131
-msgid "Nickname"
-msgstr "Smeknamn"
-
-#: actions/login.php:233 actions/register.php:429
-#: lib/accountsettingsaction.php:116
-msgid "Password"
-msgstr "Lösenord"
-
#: actions/login.php:236 actions/register.php:478
msgid "Remember me"
msgstr "Kom ihåg mig"
@@ -1874,6 +2024,29 @@ msgstr "Kan inte göra %s till en administratör för grupp %s"
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"
@@ -1886,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!"
@@ -1899,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 ""
@@ -1988,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"
@@ -2005,8 +2223,8 @@ msgstr "innehållstyp "
msgid "Only "
msgstr "Bara "
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033
-#: lib/api.php:1061 lib/api.php:1171
+#: 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"
@@ -2019,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
@@ -2341,7 +2560,7 @@ msgid "Full name"
msgstr "Fullständigt namn"
#: actions/profilesettings.php:115 actions/register.php:453
-#: lib/groupeditform.php:161
+#: lib/applicationeditform.php:230 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Hemsida"
@@ -2938,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."
@@ -3043,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"
@@ -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,10 +4260,6 @@ msgstr "Sessioner"
msgid "Author(s)"
msgstr "Författare"
-#: actions/version.php:198 lib/groupeditform.php:172
-msgid "Description"
-msgstr "Beskrivning"
-
#: classes/File.php:144
#, php-format
msgid ""
@@ -3994,8 +4279,23 @@ msgstr "En så här stor fil skulle överskrida din användarkvot på %d byte."
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
-#, fuzzy, php-format
+#, php-format
msgid "Could not create login token for %s"
msgstr "Kunde inte skapa inloggnings-token för %s"
@@ -4011,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."
@@ -4039,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!"
@@ -4120,10 +4420,6 @@ 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"
@@ -4277,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."
@@ -4314,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"
@@ -4334,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"
@@ -4359,7 +4717,7 @@ msgid "Sorry, this command is not yet implemented."
msgstr "Ledsen, detta kommando är inte implementerat än."
#: lib/command.php:88
-#, fuzzy, php-format
+#, php-format
msgid "Could not find a user with nickname %s"
msgstr "Kunde inte hitta en användare med smeknamnet %s"
@@ -4368,7 +4726,7 @@ msgid "It does not make a lot of sense to nudge yourself!"
msgstr "Det verkar inte vara särskilt meningsfullt att knuffa dig själv!"
#: lib/command.php:99
-#, fuzzy, php-format
+#, php-format
msgid "Nudge sent to %s"
msgstr "Knuff skickad till %s"
@@ -4383,14 +4741,12 @@ msgstr ""
"Prenumeranter: %2$s\n"
"Notiser: %3$s"
-#: lib/command.php:152 lib/command.php:399 lib/command.php:460
-#, fuzzy
+#: 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
+#: 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"
@@ -4399,179 +4755,173 @@ msgid "Notice marked as fave."
msgstr "Notis markerad som favorit."
#: lib/command.php:217
-#, fuzzy
msgid "You are already a member of that group"
-msgstr "Du är redan en medlem i denna grupp."
+msgstr "Du är redan en medlem i denna grupp"
-#: lib/command.php:234
-#, fuzzy, php-format
+#: lib/command.php:231
+#, php-format
msgid "Could not join user %s to group %s"
-msgstr "Kunde inte ansluta användare % till grupp %s."
+msgstr "Kunde inte ansluta användare %s till groupp %s"
-#: lib/command.php:239
-#, fuzzy, php-format
+#: lib/command.php:236
+#, php-format
msgid "%s joined group %s"
msgstr "%s gick med i grupp %s"
-#: lib/command.php:284
-#, fuzzy, php-format
+#: 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:289
-#, fuzzy, php-format
+#: lib/command.php:280
+#, php-format
msgid "%s left group %s"
msgstr "%s lämnade grupp %s"
-#: lib/command.php:318
-#, fuzzy, php-format
+#: lib/command.php:309
+#, php-format
msgid "Fullname: %s"
msgstr "Fullständigt namn: %s"
-#: lib/command.php:321 lib/mail.php:254
+#: lib/command.php:312 lib/mail.php:254
#, php-format
msgid "Location: %s"
msgstr "Plats: %s"
-#: lib/command.php:324 lib/mail.php:256
+#: 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
+#: 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
+#: 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:422
-#, fuzzy
+#: lib/command.php:413
msgid "Cannot repeat your own notice"
-msgstr "Kan inte upprepa din egen notis."
+msgstr "Kan inte upprepa din egen notis"
-#: lib/command.php:427
-#, fuzzy
+#: lib/command.php:418
msgid "Already repeated that notice"
-msgstr "Redan upprepat denna notis."
+msgstr "Redan upprepat denna notis"
-#: lib/command.php:435
-#, fuzzy, php-format
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: lib/command.php:641
msgid "Login command is disabled"
msgstr "Inloggningskommando är inaktiverat"
-#: lib/command.php:661
-#, fuzzy, php-format
+#: 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:677
+#: lib/command.php:668
msgid "You are not subscribed to anyone."
msgstr "Du prenumererar inte på någon."
-#: lib/command.php:679
+#: 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:699
+#: lib/command.php:690
msgid "No one is subscribed to you."
msgstr "Ingen prenumerar på dig."
-#: lib/command.php:701
+#: 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:721
+#: 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:723
+#: 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:737
+#: lib/command.php:728
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4612,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."
@@ -4640,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"
@@ -4824,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"
@@ -5149,13 +5513,15 @@ msgstr "Bifoga en fil"
msgid "Share my location"
msgstr "Dela din plats"
-#: lib/noticeform.php:214
+#: lib/noticeform.php:215
#, fuzzy
msgid "Do not share my location"
msgstr "Dela din plats"
-#: lib/noticeform.php:215
-msgid "Hide this info"
+#: lib/noticeform.php:216
+msgid ""
+"Sorry, retrieving your geo location is taking longer than expected, please "
+"try again later"
msgstr ""
#: lib/noticelist.php:428
@@ -5416,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."
@@ -5506,47 +5872,47 @@ msgstr "Meddelande"
msgid "Moderate"
msgstr "Moderera"
-#: lib/util.php:884
+#: lib/util.php:875
msgid "a few seconds ago"
msgstr "ett par sekunder sedan"
-#: lib/util.php:886
+#: lib/util.php:877
msgid "about a minute ago"
msgstr "för nån minut sedan"
-#: lib/util.php:888
+#: lib/util.php:879
#, php-format
msgid "about %d minutes ago"
msgstr "för %d minuter sedan"
-#: lib/util.php:890
+#: lib/util.php:881
msgid "about an hour ago"
msgstr "för en timma sedan"
-#: lib/util.php:892
+#: lib/util.php:883
#, php-format
msgid "about %d hours ago"
msgstr "för %d timmar sedan"
-#: lib/util.php:894
+#: lib/util.php:885
msgid "about a day ago"
msgstr "för en dag sedan"
-#: lib/util.php:896
+#: lib/util.php:887
#, php-format
msgid "about %d days ago"
msgstr "för %d dagar sedan"
-#: lib/util.php:898
+#: lib/util.php:889
msgid "about a month ago"
msgstr "för en månad sedan"
-#: lib/util.php:900
+#: lib/util.php:891
#, php-format
msgid "about %d months ago"
msgstr "för %d månader sedan"
-#: lib/util.php:902
+#: lib/util.php:893
msgid "about a year ago"
msgstr "för ett år sedan"
diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po
index a9e89cc5a..84b9402c1 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-11 23:25+0000\n"
-"PO-Revision-Date: 2010-01-11 23:28:19+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 (r60950); 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,8 +33,8 @@ 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
@@ -43,15 +43,20 @@ msgstr "à°…à°Ÿà±à°µà°‚à°Ÿà°¿ పేజీ లేదà±"
#: 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!"
@@ -125,7 +130,7 @@ msgstr ""
#: 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/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
@@ -145,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 ""
@@ -176,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 ""
@@ -256,18 +262,16 @@ msgid "No status found with that ID."
msgstr ""
#: actions/apifavoritecreate.php:119
-#, fuzzy
msgid "This status is already a favorite."
-msgstr "à°ˆ నోటీసౠఇపà±à°ªà°Ÿà°¿à°•à±‡ మీ ఇషà±à°Ÿà°¾à°‚శం!"
+msgstr "à°ˆ నోటీసౠఇపà±à°ªà°Ÿà°¿à°•à±‡ మీ ఇషà±à°Ÿà°¾à°‚శం."
#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176
msgid "Could not create favorite."
msgstr "ఇషà±à°Ÿà°¾à°‚శానà±à°¨à°¿ సృషà±à°Ÿà°¿à°‚చలేకపోయాం."
#: actions/apifavoritedestroy.php:122
-#, fuzzy
msgid "That status is not a favorite."
-msgstr "à°† నోటీసౠఇషà±à°Ÿà°¾à°‚శం కాదà±!"
+msgstr "à°† నోటీసౠఇషà±à°Ÿà°¾à°‚శం కాదà±."
#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
msgid "Could not delete favorite."
@@ -323,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."
@@ -335,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 à°…à°•à±à°·à°°à°¾à°²à± à°—à°°à°¿à°·à±à° à°‚)."
@@ -383,7 +389,7 @@ msgstr "మీరౠఇపà±à°ªà°Ÿà°¿à°•à±‡ à°† à°—à±à°‚à°ªà±à°²à±‹ సభà±
msgid "You have been blocked from that group by the admin."
msgstr "నిరà±à°µà°¾à°¹à°•à±à°²à± à°† à°—à±à°‚పౠనà±à°‚à°¡à°¿ మిమà±à°®à°²à±à°¨à°¿ నిరోధించారà±."
-#: actions/apigroupjoin.php:138 actions/joingroup.php:128
+#: actions/apigroupjoin.php:138 actions/joingroup.php:124
#, fuzzy, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "ఓపెనà±à°à°¡à±€ ఫారమà±à°¨à± సృషà±à°Ÿà°¿à°‚చలేకపోయాం: %s"
@@ -392,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 à°—à±à°‚పౠనà±à°‚à°¡à°¿ తొలగించలేకపోయాం."
@@ -412,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 ""
@@ -443,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ని à°•à°²à±à°ªà±à°•à±à°¨à°¿."
@@ -515,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
@@ -598,29 +697,6 @@ msgstr "à°Žà°—à±à°®à°¤à°¿à°‚à°šà±"
msgid "Crop"
msgstr "à°•à°¤à±à°¤à°¿à°°à°¿à°‚à°šà±"
-#: 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/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,7 +761,7 @@ msgstr "నిరోధపౠసమాచారానà±à°¨à°¿ à°­à°¦à±à°°à°ªà
#: actions/grouplogo.php:99 actions/groupmembers.php:83
#: actions/grouprss.php:98 actions/groupunblock.php:86
#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86
-#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263
+#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:260
msgid "No such group."
msgstr "à°…à°Ÿà±à°µà°‚à°Ÿà°¿ à°—à±à°‚పౠలేదà±."
@@ -756,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
@@ -940,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 "à°­à°¦à±à°°à°ªà°°à°šà±"
@@ -961,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"
@@ -972,7 +1127,6 @@ msgstr "à°—à±à°‚à°ªà±à°¨à°¿ సృషà±à°Ÿà°¿à°‚చడానికి మీà
#: 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."
msgstr "à°—à±à°‚à°ªà±à°¨à°¿ మారà±à°šà°¡à°¾à°¨à°¿à°•à°¿ మీరౠనిరà±à°µà°¾à°¹à°•à±à°²à°¯à°¿ ఉండాలి."
@@ -998,7 +1152,6 @@ msgid "Options saved."
msgstr "ఎంపికలౠభదà±à°°à°®à°¯à±à°¯à°¾à°¯à°¿."
#: actions/emailsettings.php:60
-#, fuzzy
msgid "Email settings"
msgstr "ఈమెయిలౠఅమరికలà±"
@@ -1029,14 +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
-#, fuzzy
msgid "Email address"
-msgstr "ఈమెయిలౠచిరà±à°¨à°¾à°®à°¾à°²à±"
+msgstr "ఈమెయిలౠచిరà±à°¨à°¾à°®à°¾"
#: actions/emailsettings.php:123
msgid "Email address, like \"UserName@example.org\""
@@ -1513,7 +1666,6 @@ msgid "Error removing the block."
msgstr "నిరోధానà±à°¨à°¿ తొలగించడంలో పొరపాటà±."
#: actions/imsettings.php:59
-#, fuzzy
msgid "IM settings"
msgstr "IM అమరికలà±"
@@ -1540,7 +1692,6 @@ msgid ""
msgstr ""
#: actions/imsettings.php:124
-#, fuzzy
msgid "IM address"
msgstr "IM à°šà°¿à°°à±à°¨à°¾à°®à°¾"
@@ -1633,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)"
@@ -1674,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 "పంపించà±"
@@ -1718,25 +1869,21 @@ msgstr ""
msgid "You must be logged in to join a group."
msgstr "à°—à±à°‚à°ªà±à°²à±à°²à±‹ చేరడానికి మీరౠపà±à°°à°µà±‡à°¶à°¿à°‚à°šà°¿ ఉండాలి."
-#: actions/joingroup.php:135
-#, 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
-#, fuzzy, php-format
+#: actions/leavegroup.php:127
+#, php-format
msgid "%1$s left group %2$s"
msgstr "%2$s à°—à±à°‚పౠనà±à°‚à°¡à°¿ %1$s వైదొలిగారà±"
@@ -1761,17 +1908,6 @@ msgstr "à°ªà±à°°à°µà±‡à°¶à°¿à°‚à°šà°‚à°¡à°¿"
msgid "Login to site"
msgstr "సైటౠలోనికి à°ªà±à°°à°µà±‡à°¶à°¿à°‚à°šà±"
-#: actions/login.php:230 actions/profilesettings.php:106
-#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94
-#: lib/groupeditform.php:152 lib/userprofile.php:131
-msgid "Nickname"
-msgstr "పేరà±"
-
-#: actions/login.php:233 actions/register.php:429
-#: lib/accountsettingsaction.php:116
-msgid "Password"
-msgstr "సంకేతపదం"
-
#: actions/login.php:236 actions/register.php:478
msgid "Remember me"
msgstr "ననà±à°¨à± à°—à±à°°à±à°¤à±à°‚à°šà±à°•à±‹"
@@ -1805,9 +1941,9 @@ 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
@@ -1823,6 +1959,29 @@ msgstr "%s ఇపà±à°ªà°Ÿà°¿à°•à±‡ \"%s\" à°—à±à°‚పౠయొకà±à°• à°’à°
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 "కొతà±à°¤ à°—à±à°‚à°ªà±"
@@ -1835,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 "విషయం లేదà±!"
@@ -1848,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 "మీకౠమీరే సందేశానà±à°¨à°¿ పంపà±à°•à±‹à°•à°‚à°¡à°¿; దాని బదà±à°²à± మీలో మీరే మెలà±à°²à°—à°¾ చెపà±à°ªà±à°•à±‹à°‚à°¡à°¿."
@@ -1930,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 ""
@@ -1947,8 +2151,8 @@ msgstr "విషయ రకం "
msgid "Only "
msgstr "మాతà±à°°à°®à±‡ "
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033
-#: lib/api.php:1061 lib/api.php:1171
+#: 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 ""
@@ -1961,7 +2165,7 @@ msgid "Notice Search"
msgstr "నోటీసà±à°² à°…à°¨à±à°µà±‡à°·à°£"
#: actions/othersettings.php:60
-msgid "Other Settings"
+msgid "Other settings"
msgstr "ఇతర అమరికలà±"
#: actions/othersettings.php:71
@@ -2147,7 +2351,7 @@ msgstr "అలంకారం"
#: actions/pathsadminpanel.php:237
msgid "Theme server"
-msgstr ""
+msgstr "అలంకారాల సేవకి"
#: actions/pathsadminpanel.php:241
msgid "Theme path"
@@ -2162,9 +2366,8 @@ msgid "Avatars"
msgstr "అవతారాలà±"
#: actions/pathsadminpanel.php:257
-#, fuzzy
msgid "Avatar server"
-msgstr "అవతారపౠఅమరికలà±"
+msgstr "అవతారాల సేవకి"
#: actions/pathsadminpanel.php:261
#, fuzzy
@@ -2180,9 +2383,8 @@ msgid "Backgrounds"
msgstr "నేపథà±à°¯à°¾à°²à±"
#: actions/pathsadminpanel.php:278
-#, fuzzy
msgid "Background server"
-msgstr "నేపథà±à°¯à°‚"
+msgstr "నేపథà±à°¯à°¾à°² సేవకి"
#: actions/pathsadminpanel.php:282
#, fuzzy
@@ -2290,7 +2492,7 @@ msgid "Full name"
msgstr "పూరà±à°¤à°¿ పేరà±"
#: actions/profilesettings.php:115 actions/register.php:453
-#: lib/groupeditform.php:161
+#: lib/applicationeditform.php:230 lib/groupeditform.php:161
msgid "Homepage"
msgstr "హోమౠపేజీ"
@@ -2563,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!"
@@ -2634,7 +2836,7 @@ 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."
@@ -2858,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 ""
@@ -2963,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 "సృషà±à°Ÿà°¿à°¤à°‚"
@@ -3101,17 +3375,16 @@ msgstr ""
#: actions/siteadminpanel.php:146
msgid "Site name must have non-zero length."
-msgstr ""
+msgstr "సైటౠపేరౠతపà±à°ªà°¨à°¿à°¸à°°à°¿à°—à°¾ à°¸à±à°¨à±à°¨à°¾ కంటే à°Žà°•à±à°•à±à°µ పొడవà±à°‚డాలి."
#: actions/siteadminpanel.php:154
-#, fuzzy
msgid "You must have a valid contact email address."
-msgstr "మీకౠసరైన సంపà±à°°à°¦à°¿à°‚పౠఈమెయిలౠచిరà±à°¨à°¾à°®à°¾ ఉండాలి"
+msgstr "మీకౠసరైన సంపà±à°°à°¦à°¿à°‚పౠఈమెయిలౠచిరà±à°¨à°¾à°®à°¾ ఉండాలి."
#: actions/siteadminpanel.php:172
-#, fuzzy, php-format
+#, php-format
msgid "Unknown language \"%s\"."
-msgstr "à°—à±à°°à±à°¤à± తెలియని భాష \"%s\""
+msgstr "à°—à±à°°à±à°¤à± తెలియని భాష \"%s\"."
#: actions/siteadminpanel.php:179
msgid "Invalid snapshot report URL."
@@ -3167,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"
@@ -3233,7 +3504,7 @@ msgstr "à°…à°Ÿà±à°µà°‚à°Ÿà°¿ వాడà±à°•à°°à°¿ లేరà±."
#: actions/siteadminpanel.php:335
msgid "Disable new registrations."
-msgstr ""
+msgstr "కొతà±à°¤ నమోదà±à°²à°¨à± అచేతనంచేయి."
#: actions/siteadminpanel.php:341
msgid "Snapshots"
@@ -3296,7 +3567,6 @@ msgid "Save site settings"
msgstr "సైటౠఅమరికలనౠభదà±à°°à°ªà°°à°šà±"
#: actions/smssettings.php:58
-#, fuzzy
msgid "SMS settings"
msgstr "SMS అమరికలà±"
@@ -3342,7 +3612,7 @@ msgstr ""
#: actions/smssettings.php:306
msgid "No phone number."
-msgstr ""
+msgstr "ఫోనౠనెంబరౠలేదà±."
#: actions/smssettings.php:311
msgid "No carrier selected."
@@ -3350,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."
@@ -3609,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"
@@ -3792,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
@@ -3804,9 +4074,8 @@ msgid ""
msgstr ""
#: actions/version.php:157
-#, fuzzy
msgid "StatusNet"
-msgstr "à°¸à±à°¥à°¿à°¤à°¿à°¨à°¿ తొలగించాం."
+msgstr "à°¸à±à°Ÿà±‡à°Ÿà°¸à±â€Œà°¨à±†à°Ÿà±"
#: actions/version.php:161
msgid "Contributors"
@@ -3839,24 +4108,13 @@ 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 "రచయిత"
-
-#: actions/version.php:198 lib/groupeditform.php:172
-msgid "Description"
-msgstr "వివరణ"
+msgstr "రచయిత(à°²à±)"
#: classes/File.php:144
#, php-format
@@ -3875,6 +4133,19 @@ msgstr ""
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"
@@ -3892,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à°•à°¿ à°¸à±à°µà°¾à°—తం!"
@@ -3980,9 +4251,9 @@ msgid "Other options"
msgstr "ఇతర ఎంపికలà±"
#: lib/action.php:144
-#, fuzzy, php-format
+#, php-format
msgid "%1$s - %2$s"
-msgstr "%1$s (%2$s)"
+msgstr "%1$s - %2$s"
#: lib/action.php:159
msgid "Untitled page"
@@ -4001,10 +4272,6 @@ 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 "మీ ఈమెయిలà±, అవతారం, సంకేతపదం మరియౠపà±à°°à±Œà°«à±ˆà°³à±à°³à°¨à± మారà±à°šà±à°•à±‹à°‚à°¡à°¿"
@@ -4111,7 +4378,7 @@ msgstr "బాడà±à°œà°¿"
#: lib/action.php:773
msgid "StatusNet software license"
-msgstr ""
+msgstr "à°¸à±à°Ÿà±‡à°Ÿà°¸à±â€Œà°¨à±†à°Ÿà± మృదూపకరణ లైసెనà±à°¸à±"
#: lib/action.php:776
#, php-format
@@ -4163,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 "à°ˆ సైటà±à°•à°¿ మీరౠమారà±à°ªà±à°²à± చేయలేరà±."
@@ -4201,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 "జోడింపà±à°²à±"
@@ -4222,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 "సంకేతపదం మారà±à°ªà±"
@@ -4249,7 +4578,7 @@ msgid "Sorry, this command is not yet implemented."
msgstr ""
#: lib/command.php:88
-#, fuzzy, php-format
+#, php-format
msgid "Could not find a user with nickname %s"
msgstr "వాడà±à°•à°°à°¿à°¨à°¿ తాజాకరించలేకà±à°¨à±à°¨à°¾à°‚."
@@ -4273,13 +4602,13 @@ 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"
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"
msgstr "వాడà±à°•à°°à°¿à°•à°¿ à°ªà±à°°à±Šà°«à±ˆà°²à± లేదà±."
@@ -4289,177 +4618,176 @@ msgid "Notice marked as fave."
msgstr ""
#: lib/command.php:217
-#, fuzzy
msgid "You are already a member of that group"
-msgstr "మీరౠఇపà±à°ªà°Ÿà°¿à°•à±‡ à°† à°—à±à°‚à°ªà±à°²à±‹ సభà±à°¯à±à°²à±."
+msgstr "మీరౠఇపà±à°ªà°Ÿà°¿à°•à±‡ à°† à°—à±à°‚à°ªà±à°²à±‹ సభà±à°¯à±à°²à±"
-#: lib/command.php:234
-#, fuzzy, php-format
+#: lib/command.php:231
+#, php-format
msgid "Could not join user %s to group %s"
-msgstr "ఓపెనà±à°à°¡à±€ ఫారమà±à°¨à± సృషà±à°Ÿà°¿à°‚చలేకపోయాం: %s"
+msgstr "వాడà±à°•à°°à°¿ %sని %s à°—à±à°‚à°ªà±à°²à±‹ చేరà±à°šà°²à±‡à°•à°ªà±‹à°¯à°¾à°‚"
-#: lib/command.php:239
-#, fuzzy, php-format
+#: lib/command.php:236
+#, php-format
msgid "%s joined group %s"
msgstr "%s %s à°—à±à°‚à°ªà±à°²à±‹ చేరారà±"
-#: lib/command.php:284
-#, fuzzy, php-format
+#: lib/command.php:275
+#, php-format
msgid "Could not remove user %s to group %s"
msgstr "వాడà±à°•à°°à°¿ %sని %s à°—à±à°‚పౠనà±à°‚à°¡à°¿ తొలగించలేకపోయాం"
-#: lib/command.php:289
-#, fuzzy, php-format
+#: lib/command.php:280
+#, php-format
msgid "%s left group %s"
msgstr "%2$s à°—à±à°‚పౠనà±à°‚à°¡à°¿ %1$s వైదొలిగారà±"
-#: lib/command.php:318
-#, fuzzy, php-format
+#: lib/command.php:309
+#, php-format
msgid "Fullname: %s"
msgstr "పూరà±à°¤à°¿à°ªà±‡à°°à±: %s"
-#: lib/command.php:321 lib/mail.php:254
+#: lib/command.php:312 lib/mail.php:254
#, php-format
msgid "Location: %s"
msgstr "à°ªà±à°°à°¾à°‚తం: %s"
-#: lib/command.php:324 lib/mail.php:256
+#: 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 %d characters, you sent %d"
msgstr "నోటిసౠచాలా పొడవà±à°—à°¾ ఉంది - %d à°…à°•à±à°·à°°à°¾à°²à± à°—à°°à°¿à°·à±à° à°‚, మీరౠ%d పంపించారà±"
-#: lib/command.php:376
-#, fuzzy, php-format
+#: 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:422
+#: lib/command.php:413
#, fuzzy
msgid "Cannot repeat your own notice"
msgstr "à°ˆ లైసెనà±à°¸à±à°•à°¿ అంగీకరించకపోతే మీరౠనమోదà±à°šà±‡à°¸à±à°•à±‹à°²à±‡à°°à±."
-#: lib/command.php:427
+#: lib/command.php:418
#, fuzzy
msgid "Already repeated that notice"
msgstr "à°ˆ నోటీసà±à°¨à°¿ తొలగించà±"
-#: lib/command.php:435
+#: lib/command.php:426
#, fuzzy, php-format
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
+#: 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"
msgstr "%sà°•à°¿ à°¸à±à°ªà°‚దనలà±"
-#: lib/command.php:502
+#: lib/command.php:493
#, fuzzy
msgid "Error saving notice."
msgstr "సందేశానà±à°¨à°¿ à°­à°¦à±à°°à°ªà°°à°šà°¡à°‚లో పొరపాటà±."
-#: lib/command.php:556
+#: lib/command.php:547
msgid "Specify the name of the user to subscribe to"
-msgstr ""
+msgstr "à°à°µà°°à°¿à°•à°¿ చందా చేరాలనà±à°•à±à°‚à°Ÿà±à°¨à±à°¨à°¾à°°à±‹ à°† వాడà±à°•à°°à°¿ పేరౠతెలియజేయండి"
-#: lib/command.php:563
+#: lib/command.php:554
#, php-format
msgid "Subscribed to %s"
msgstr "%sà°•à°¿ చందా చేరారà±"
-#: lib/command.php:584
+#: lib/command.php:575
msgid "Specify the name of the user to unsubscribe from"
-msgstr ""
+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
+#: lib/command.php:641
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:661
-#, fuzzy, php-format
+#: 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:677
+#: lib/command.php:668
msgid "You are not subscribed to anyone."
msgstr "మీరౠఎవరికీ చందాచేరలేదà±."
-#: lib/command.php:679
+#: 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:699
+#: lib/command.php:690
msgid "No one is subscribed to you."
msgstr "మీకౠచందాదారà±à°²à± ఎవరూ లేరà±."
-#: lib/command.php:701
+#: 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:721
+#: lib/command.php:712
msgid "You are not a member of any groups."
msgstr "మీరౠఠగà±à°‚à°ªà±à°²à±‹à°¨à±‚ సభà±à°¯à±à°²à± కాదà±."
-#: lib/command.php:723
+#: 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:737
+#: lib/command.php:728
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4500,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 ""
@@ -4529,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 ""
@@ -4538,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."
@@ -4615,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
@@ -4718,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 "చేరà±"
@@ -5029,13 +5369,15 @@ msgstr "à°’à°• ఫైలà±à°¨à°¿ జోడించà±"
msgid "Share my location"
msgstr "à°Ÿà±à°¯à°¾à°—à±à°²à°¨à°¿ à°­à°¦à±à°°à°ªà°°à°šà°²à±‡à°•à±à°¨à±à°¨à°¾à°‚."
-#: lib/noticeform.php:214
+#: lib/noticeform.php:215
#, fuzzy
msgid "Do not share my location"
msgstr "à°Ÿà±à°¯à°¾à°—à±à°²à°¨à°¿ à°­à°¦à±à°°à°ªà°°à°šà°²à±‡à°•à±à°¨à±à°¨à°¾à°‚."
-#: lib/noticeform.php:215
-msgid "Hide this info"
+#: lib/noticeform.php:216
+msgid ""
+"Sorry, retrieving your geo location is taking longer than expected, please "
+"try again later"
msgstr ""
#: lib/noticelist.php:428
@@ -5305,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 "చందాని తొలగించలేకపోయాం."
@@ -5400,47 +5742,47 @@ msgstr "సందేశం"
msgid "Moderate"
msgstr ""
-#: lib/util.php:884
+#: lib/util.php:875
msgid "a few seconds ago"
msgstr "కొనà±à°¨à°¿ à°•à±à°·à°£à°¾à°² à°•à±à°°à°¿à°¤à°‚"
-#: lib/util.php:886
+#: lib/util.php:877
msgid "about a minute ago"
msgstr "à°“ నిమిషం à°•à±à°°à°¿à°¤à°‚"
-#: lib/util.php:888
+#: lib/util.php:879
#, php-format
msgid "about %d minutes ago"
msgstr "%d నిమిషాల à°•à±à°°à°¿à°¤à°‚"
-#: lib/util.php:890
+#: lib/util.php:881
msgid "about an hour ago"
msgstr "à°’à°• à°—à°‚à°Ÿ à°•à±à°°à°¿à°¤à°‚"
-#: lib/util.php:892
+#: lib/util.php:883
#, php-format
msgid "about %d hours ago"
msgstr "%d à°—à°‚à°Ÿà°² à°•à±à°°à°¿à°¤à°‚"
-#: lib/util.php:894
+#: lib/util.php:885
msgid "about a day ago"
msgstr "à°“ రోజౠకà±à°°à°¿à°¤à°‚"
-#: lib/util.php:896
+#: lib/util.php:887
#, php-format
msgid "about %d days ago"
msgstr "%d రోజà±à°² à°•à±à°°à°¿à°¤à°‚"
-#: lib/util.php:898
+#: lib/util.php:889
msgid "about a month ago"
msgstr "à°“ నెల à°•à±à°°à°¿à°¤à°‚"
-#: lib/util.php:900
+#: lib/util.php:891
#, php-format
msgid "about %d months ago"
msgstr "%d నెలల à°•à±à°°à°¿à°¤à°‚"
-#: lib/util.php:902
+#: lib/util.php:893
msgid "about a year ago"
msgstr "à°’à°• సంవతà±à°¸à°°à°‚ à°•à±à°°à°¿à°¤à°‚"
@@ -5455,6 +5797,6 @@ msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr "%s అనేది సరైన రంగౠకాదà±! 3 లేదా 6 హెకà±à°¸à± à°…à°•à±à°·à°°à°¾à°²à°¨à± వాడండి."
#: scripts/xmppdaemon.php:301
-#, fuzzy, php-format
+#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr "నోటిసౠచాలా పొడవà±à°—à°¾ ఉంది - %d à°…à°•à±à°·à°°à°¾à°²à± à°—à°°à°¿à°·à±à° à°‚, మీరౠ%d పంపించారà±"
+msgstr "నోటిసౠచాలా పొడవà±à°—à°¾ ఉంది - %1$d à°…à°•à±à°·à°°à°¾à°²à± à°—à°°à°¿à°·à±à° à°‚, మీరౠ%2$d పంపించారà±."
diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po
index 9374b52ce..99c424388 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-11 23:25+0000\n"
-"PO-Revision-Date: 2010-01-11 23:28:23+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 (r60950); 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,8 +34,8 @@ 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
@@ -44,15 +44,20 @@ msgstr "Böyle bir durum mesajı yok."
#: 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!"
@@ -127,7 +132,7 @@ msgstr ""
#: 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/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
@@ -147,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 ""
@@ -178,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 ""
@@ -329,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."
@@ -341,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)."
@@ -391,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 actions/joingroup.php:128
+#: 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"
@@ -401,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"
@@ -421,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 ""
@@ -453,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 ""
@@ -612,29 +715,6 @@ msgstr "Yükle"
msgid "Crop"
msgstr ""
-#: 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/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 ""
@@ -704,7 +784,7 @@ msgstr ""
#: actions/grouplogo.php:99 actions/groupmembers.php:83
#: actions/grouprss.php:98 actions/groupunblock.php:86
#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86
-#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263
+#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:260
#, fuzzy
msgid "No such group."
msgstr "Böyle bir durum mesajı yok."
@@ -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
@@ -973,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"
@@ -994,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"
@@ -1064,7 +1223,8 @@ 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"
@@ -1699,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 ""
@@ -1740,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"
@@ -1784,7 +1944,7 @@ msgstr ""
msgid "You must be logged in to join a group."
msgstr ""
-#: actions/joingroup.php:135
+#: actions/joingroup.php:131
#, php-format
msgid "%1$s joined group %2$s"
msgstr ""
@@ -1793,16 +1953,12 @@ 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
+#: actions/leavegroup.php:127
#, fuzzy, php-format
msgid "%1$s left group %2$s"
msgstr "%1$s'in %2$s'deki durum mesajları "
@@ -1829,17 +1985,6 @@ msgstr "GiriÅŸ"
msgid "Login to site"
msgstr ""
-#: actions/login.php:230 actions/profilesettings.php:106
-#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94
-#: lib/groupeditform.php:152 lib/userprofile.php:131
-msgid "Nickname"
-msgstr "Takma ad"
-
-#: actions/login.php:233 actions/register.php:429
-#: lib/accountsettingsaction.php:116
-msgid "Password"
-msgstr "Parola"
-
#: actions/login.php:236 actions/register.php:478
msgid "Remember me"
msgstr "Beni hatırla"
@@ -1894,6 +2039,27 @@ msgstr "Kullanıcının profili yok."
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 ""
@@ -1906,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!"
@@ -1919,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 ""
@@ -2001,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"
@@ -2019,8 +2228,8 @@ msgstr "BaÄŸlan"
msgid "Only "
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033
-#: lib/api.php:1061 lib/api.php:1171
+#: 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 ""
@@ -2034,7 +2243,7 @@ msgstr ""
#: actions/othersettings.php:60
#, fuzzy
-msgid "Other Settings"
+msgid "Other settings"
msgstr "Ayarlar"
#: actions/othersettings.php:71
@@ -2371,7 +2580,7 @@ msgid "Full name"
msgstr "Tam Ä°sim"
#: actions/profilesettings.php:115 actions/register.php:453
-#: lib/groupeditform.php:161
+#: lib/applicationeditform.php:230 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Başlangıç Sayfası"
@@ -2949,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 ""
@@ -3057,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"
@@ -3952,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"
@@ -3966,11 +4244,6 @@ msgstr "KiÅŸisel"
msgid "Author(s)"
msgstr ""
-#: actions/version.php:198 lib/groupeditform.php:172
-#, fuzzy
-msgid "Description"
-msgstr "Abonelikler"
-
#: classes/File.php:144
#, php-format
msgid ""
@@ -3988,6 +4261,21 @@ msgstr ""
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"
@@ -4005,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 ""
@@ -4116,11 +4404,6 @@ 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 ""
@@ -4284,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 ""
@@ -4323,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 ""
@@ -4344,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."
@@ -4371,7 +4718,7 @@ msgid "Sorry, this command is not yet implemented."
msgstr ""
#: lib/command.php:88
-#, fuzzy, php-format
+#, php-format
msgid "Could not find a user with nickname %s"
msgstr "Kullanıcı güncellenemedi."
@@ -4392,12 +4739,12 @@ 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
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"
msgstr "Kullanıcının profili yok."
@@ -4411,173 +4758,173 @@ msgstr ""
msgid "You are already a member of that group"
msgstr "Zaten giriş yapmış durumdasıznız!"
-#: lib/command.php:234
+#: lib/command.php:231
#, fuzzy, php-format
msgid "Could not join user %s to group %s"
msgstr "Sunucuya yönlendirme yapılamadı: %s"
-#: lib/command.php:239
+#: lib/command.php:236
#, fuzzy, php-format
msgid "%s joined group %s"
msgstr "%1$s'in %2$s'deki durum mesajları "
-#: lib/command.php:284
+#: 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:289
+#: lib/command.php:280
#, fuzzy, php-format
msgid "%s left group %s"
msgstr "%1$s'in %2$s'deki durum mesajları "
-#: lib/command.php:318
+#: lib/command.php:309
#, fuzzy, php-format
msgid "Fullname: %s"
msgstr "Tam Ä°sim"
-#: lib/command.php:321 lib/mail.php:254
+#: lib/command.php:312 lib/mail.php:254
#, php-format
msgid "Location: %s"
msgstr ""
-#: lib/command.php:324 lib/mail.php:256
+#: 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 %d characters, you sent %d"
msgstr ""
-#: lib/command.php:376
+#: lib/command.php:367
#, php-format
msgid "Direct message to %s sent"
msgstr ""
-#: lib/command.php:378
+#: lib/command.php:369
msgid "Error sending direct message."
msgstr ""
-#: lib/command.php:422
+#: 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:427
+#: lib/command.php:418
#, fuzzy
msgid "Already repeated that notice"
msgstr "Zaten giriş yapmış durumdasıznız!"
-#: lib/command.php:435
+#: lib/command.php:426
#, fuzzy, php-format
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 %d characters, you sent %d"
msgstr ""
-#: lib/command.php:500
+#: lib/command.php:491
#, fuzzy, php-format
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
+#: 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
+#: 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
+#: lib/command.php:641
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:661
+#: lib/command.php:652
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:677
+#: lib/command.php:668
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Bize o profili yollamadınız"
-#: lib/command.php:679
+#: 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:699
+#: lib/command.php:690
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Uzaktan abonelik"
-#: lib/command.php:701
+#: 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:721
+#: lib/command.php:712
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Bize o profili yollamadınız"
-#: lib/command.php:723
+#: 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:737
+#: lib/command.php:728
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4618,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 ""
@@ -4647,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 ""
@@ -4841,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"
@@ -5160,13 +5521,15 @@ msgstr ""
msgid "Share my location"
msgstr "Profil kaydedilemedi."
-#: lib/noticeform.php:214
+#: lib/noticeform.php:215
#, fuzzy
msgid "Do not share my location"
msgstr "Profil kaydedilemedi."
-#: lib/noticeform.php:215
-msgid "Hide this info"
+#: 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 +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."
@@ -5538,47 +5901,47 @@ msgstr ""
msgid "Moderate"
msgstr ""
-#: lib/util.php:884
+#: lib/util.php:875
msgid "a few seconds ago"
msgstr "birkaç saniye önce"
-#: lib/util.php:886
+#: lib/util.php:877
msgid "about a minute ago"
msgstr "yaklaşık bir dakika önce"
-#: lib/util.php:888
+#: lib/util.php:879
#, php-format
msgid "about %d minutes ago"
msgstr "yaklaşık %d dakika önce"
-#: lib/util.php:890
+#: lib/util.php:881
msgid "about an hour ago"
msgstr "yaklaşık bir saat önce"
-#: lib/util.php:892
+#: lib/util.php:883
#, php-format
msgid "about %d hours ago"
msgstr "yaklaşık %d saat önce"
-#: lib/util.php:894
+#: lib/util.php:885
msgid "about a day ago"
msgstr "yaklaşık bir gün önce"
-#: lib/util.php:896
+#: lib/util.php:887
#, php-format
msgid "about %d days ago"
msgstr "yaklaşık %d gün önce"
-#: lib/util.php:898
+#: lib/util.php:889
msgid "about a month ago"
msgstr "yaklaşık bir ay önce"
-#: lib/util.php:900
+#: lib/util.php:891
#, php-format
msgid "about %d months ago"
msgstr "yaklaşık %d ay önce"
-#: lib/util.php:902
+#: lib/util.php:893
msgid "about a year ago"
msgstr "yaklaşık bir yıl önce"
diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po
index 187011216..4d8de517c 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-11 23:25+0000\n"
-"PO-Revision-Date: 2010-01-11 23:28:27+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 (r60950); 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,8 +36,8 @@ 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
@@ -46,15 +46,20 @@ msgstr "Ðемає такої Ñторінки"
#: 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"
@@ -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!"
@@ -134,7 +139,7 @@ msgstr "ÐžÐ½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð²Ñ–Ð´ %1$s та друзів на %2$s!"
#: 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/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
@@ -153,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."
@@ -183,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 ""
@@ -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 знаків макÑимум)."
@@ -389,7 +397,7 @@ msgstr "Ви вже Ñ” учаÑником цієї групи."
msgid "You have been blocked from that group by the admin."
msgstr "Ðдмін цієї групи заблокував Вашу приÑутніÑÑ‚ÑŒ в ній."
-#: actions/apigroupjoin.php:138 actions/joingroup.php:128
+#: actions/apigroupjoin.php:138 actions/joingroup.php:124
#, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "Ðе вдалоÑÑŒ долучити кориÑтувача %1$s до групи %2$s."
@@ -398,7 +406,7 @@ msgstr "Ðе вдалоÑÑŒ долучити кориÑтувача %1$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
#, php-format
msgid "Could not remove user %1$s from group %2$s."
msgstr "Ðе вдалоÑÑŒ видалити кориÑтувача %1$s з групи %2$s."
@@ -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 "Цей метод потребує або ÐÐПИСÐТИ, або ВИДÐЛИТИ."
@@ -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 ""
@@ -603,30 +705,6 @@ msgstr "Завантажити"
msgid "Crop"
msgstr "Ð’Ñ‚Ñти"
-#: 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/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 "Оберіть квадратну ділÑнку зображеннÑ, Ñка й буде Вашою автарою."
@@ -694,7 +772,7 @@ msgstr "Ð—Ð±ÐµÑ€ÐµÐ¶ÐµÐ½Ð½Ñ Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ— про Ð±Ð»Ð¾ÐºÑƒÐ²Ð°Ð½Ð½Ñ Ð·
#: actions/grouplogo.php:99 actions/groupmembers.php:83
#: actions/grouprss.php:98 actions/groupunblock.php:86
#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86
-#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263
+#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:260
msgid "No such group."
msgstr "Такої групи немає."
@@ -763,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
@@ -949,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 "Зберегти"
@@ -970,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"
@@ -1038,7 +1187,8 @@ 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 "СкаÑувати"
@@ -1671,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)"
@@ -1717,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 "Так!"
@@ -1788,7 +1938,7 @@ msgstr ""
msgid "You must be logged in to join a group."
msgstr "Ви повинні Ñпочатку увійти на Ñайт, аби приєднатиÑÑ Ð´Ð¾ групи."
-#: actions/joingroup.php:135
+#: actions/joingroup.php:131
#, php-format
msgid "%1$s joined group %2$s"
msgstr "%1$s приєднавÑÑ Ð´Ð¾ групи %2$s"
@@ -1797,15 +1947,11 @@ msgstr "%1$s приєднавÑÑ Ð´Ð¾ групи %2$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
+#: actions/leavegroup.php:127
#, php-format
msgid "%1$s left group %2$s"
msgstr "%1$s залишив групу %2$s"
@@ -1831,17 +1977,6 @@ msgstr "Увійти"
msgid "Login to site"
msgstr "Вхід на Ñайт"
-#: actions/login.php:230 actions/profilesettings.php:106
-#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94
-#: lib/groupeditform.php:152 lib/userprofile.php:131
-msgid "Nickname"
-msgstr "Ð†Ð¼â€™Ñ ÐºÐ¾Ñ€Ð¸Ñтувача"
-
-#: actions/login.php:233 actions/register.php:429
-#: lib/accountsettingsaction.php:116
-msgid "Password"
-msgstr "Пароль"
-
#: actions/login.php:236 actions/register.php:478
msgid "Remember me"
msgstr "Пам’Ñтати мене"
@@ -1897,6 +2032,26 @@ msgstr "Ðе можна надати %1$s права адміна в групі
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 "Ðова група"
@@ -1909,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 "Ðемає зміÑту!"
@@ -1922,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 ""
@@ -2010,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 "Ð”Ð¾Ð¿Ð¸Ñ Ð½Ðµ має профілю"
@@ -2027,8 +2225,8 @@ msgstr "тип зміÑту "
msgid "Only "
msgstr "Лише "
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033
-#: lib/api.php:1061 lib/api.php:1171
+#: 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 "Такий формат даних не підтримуєтьÑÑ."
@@ -2041,7 +2239,7 @@ msgid "Notice Search"
msgstr "Пошук допиÑів"
#: actions/othersettings.php:60
-msgid "Other Settings"
+msgid "Other settings"
msgstr "Інші опції"
#: actions/othersettings.php:71
@@ -2073,29 +2271,24 @@ msgid "URL shortening service is too long (max 50 chars)."
msgstr "Ð¡ÐµÑ€Ð²Ñ–Ñ ÑÐºÐ¾Ñ€Ð¾Ñ‡ÐµÐ½Ð½Ñ URL-Ð°Ð´Ñ€ÐµÑ Ð½Ð°Ð´Ñ‚Ð¾ довгий (50 знаків макÑимум)."
#: actions/otp.php:69
-#, fuzzy
msgid "No user ID specified."
-msgstr "Групу не визначено."
+msgstr "ID кориÑтувача не визначено."
#: actions/otp.php:83
-#, fuzzy
msgid "No login token specified."
-msgstr "Зазначеного допиÑу немає."
+msgstr "Токен Ð´Ð»Ñ Ð²Ñ…Ð¾Ð´Ñƒ не визначено."
#: actions/otp.php:90
-#, fuzzy
msgid "No login token requested."
-msgstr "У запиті відÑутній ID профілю."
+msgstr "Токен Ð´Ð»Ñ Ð²Ñ…Ð¾Ð´Ñƒ у запиті відÑутній."
#: actions/otp.php:95
-#, fuzzy
msgid "Invalid login token specified."
-msgstr "ÐедійÑний або неправильний токен."
+msgstr "Токен Ð´Ð»Ñ Ð²Ñ…Ð¾Ð´Ñƒ визначено Ñк неправильний."
#: actions/otp.php:104
-#, fuzzy
msgid "Login token expired."
-msgstr "Вхід на Ñайт"
+msgstr "Токен Ð´Ð»Ñ Ð²Ñ…Ð¾Ð´Ñƒ втратив чинніÑÑ‚ÑŒ."
#: actions/outbox.php:61
#, php-format
@@ -2365,7 +2558,7 @@ msgid "Full name"
msgstr "Повне ім’Ñ"
#: actions/profilesettings.php:115 actions/register.php:453
-#: lib/groupeditform.php:161
+#: lib/applicationeditform.php:230 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Веб-Ñторінка"
@@ -2973,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 "Ðе можна відновити обрані допиÑи."
@@ -3086,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 "Створено"
@@ -4014,10 +4279,6 @@ msgstr ""
msgid "Plugins"
msgstr "Додатки"
-#: actions/version.php:195
-msgid "Name"
-msgstr "Ім’Ñ"
-
#: actions/version.php:196 lib/action.php:741
msgid "Version"
msgstr "ВерÑÑ–Ñ"
@@ -4026,10 +4287,6 @@ msgstr "ВерÑÑ–Ñ"
msgid "Author(s)"
msgstr "Ðвтор(и)"
-#: actions/version.php:198 lib/groupeditform.php:172
-msgid "Description"
-msgstr "ОпиÑ"
-
#: classes/File.php:144
#, php-format
msgid ""
@@ -4049,10 +4306,22 @@ msgstr "Розміри цього файлу перевищують Вашу кÐ
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
-#, fuzzy, php-format
+#, php-format
msgid "Could not create login token for %s"
-msgstr "Ðе вдалоÑÑ Ñтворити токен входу Ð´Ð»Ñ %s."
+msgstr "Ðе вдалоÑÑ Ñтворити токен входу Ð´Ð»Ñ %s"
#: classes/Message.php:45
msgid "You are banned from sending direct messages."
@@ -4066,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."
@@ -4094,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!"
@@ -4154,9 +4423,9 @@ msgid "Other options"
msgstr "Інші опції"
#: lib/action.php:144
-#, fuzzy, php-format
+#, php-format
msgid "%1$s - %2$s"
-msgstr "%1$s (%2$s)"
+msgstr "%1$s — %2$s"
#: lib/action.php:159
msgid "Untitled page"
@@ -4175,10 +4444,6 @@ 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 "Змінити електронну адреÑу, аватару, пароль, профіль"
@@ -4332,10 +4597,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 "Ви не можете щоÑÑŒ змінювати на цьому Ñайті."
@@ -4368,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 "ВкладеннÑ"
@@ -4388,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 "Змінювати пароль не дозволено"
@@ -4413,18 +4736,18 @@ msgid "Sorry, this command is not yet implemented."
msgstr "Даруйте, але Ð²Ð¸ÐºÐ¾Ð½Ð°Ð½Ð½Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¸ ще не завершено."
#: lib/command.php:88
-#, fuzzy, php-format
+#, php-format
msgid "Could not find a user with nickname %s"
-msgstr "Ðе вдалоÑÑ Ð·Ð½Ð°Ð¹Ñ‚Ð¸ кориÑтувача з ім’Ñм %s."
+msgstr "Ðе вдалоÑÑ Ð·Ð½Ð°Ð¹Ñ‚Ð¸ кориÑтувача з іменем %s"
#: lib/command.php:92
msgid "It does not make a lot of sense to nudge yourself!"
msgstr "Гадаємо, кориÑÑ‚Ñ– від «розштовхуваннÑ» Ñамого Ñебе небагато, чи не так?!"
#: lib/command.php:99
-#, fuzzy, php-format
+#, php-format
msgid "Nudge sent to %s"
-msgstr "Спробу «розштовхати» %s зараховано."
+msgstr "Спробу «розштовхати» %s зараховано"
#: lib/command.php:126
#, php-format
@@ -4437,199 +4760,190 @@ msgstr ""
"ПідпиÑчики: %2$s\n"
"ДопиÑи: %3$s"
-#: lib/command.php:152 lib/command.php:399 lib/command.php:460
-#, fuzzy
+#: lib/command.php:152 lib/command.php:390 lib/command.php:451
msgid "Notice with that id does not exist"
-msgstr "ДопиÑу з таким id не Ñ–Ñнує."
+msgstr "Такого допиÑу не Ñ–Ñнує"
-#: lib/command.php:168 lib/command.php:415 lib/command.php:476
-#: lib/command.php:532
-#, fuzzy
+#: lib/command.php:168 lib/command.php:406 lib/command.php:467
+#: lib/command.php:523
msgid "User has no last notice"
-msgstr "КориÑтувач не має оÑтаннього допиÑу."
+msgstr "КориÑтувач не має оÑтаннього допиÑу"
#: lib/command.php:190
msgid "Notice marked as fave."
msgstr "Ð”Ð¾Ð¿Ð¸Ñ Ð¿Ð¾Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¾ Ñк обраний."
#: lib/command.php:217
-#, fuzzy
msgid "You are already a member of that group"
msgstr "Ви вже Ñ” учаÑником цієї групи."
-#: lib/command.php:234
-#, fuzzy, php-format
+#: lib/command.php:231
+#, php-format
msgid "Could not join user %s to group %s"
msgstr "Ðе вдалоÑÑŒ долучити кориÑтувача %1$s до групи %2$s."
-#: lib/command.php:239
-#, fuzzy, php-format
+#: lib/command.php:236
+#, php-format
msgid "%s joined group %s"
msgstr "%1$s приєднавÑÑ Ð´Ð¾ групи %2$s"
-#: lib/command.php:284
-#, fuzzy, php-format
+#: lib/command.php:275
+#, php-format
msgid "Could not remove user %s to group %s"
msgstr "Ðе вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ кориÑтувача %1$s з групи %2$s."
-#: lib/command.php:289
-#, fuzzy, php-format
+#: lib/command.php:280
+#, php-format
msgid "%s left group %s"
msgstr "%1$s залишив групу %2$s"
-#: lib/command.php:318
-#, fuzzy, php-format
+#: lib/command.php:309
+#, php-format
msgid "Fullname: %s"
msgstr "Повне ім’Ñ: %s"
-#: lib/command.php:321 lib/mail.php:254
+#: lib/command.php:312 lib/mail.php:254
#, php-format
msgid "Location: %s"
msgstr "ЛокаціÑ: %s"
-#: lib/command.php:324 lib/mail.php:256
+#: 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
+#: lib/command.php:349
+#, php-format
msgid "Message too long - maximum is %d characters, you sent %d"
-msgstr ""
-"ÐŸÐ¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð½Ð°Ð´Ñ‚Ð¾ довге — макÑимум %1$d Ñимволів, а Ви надÑилаєте %2$d."
+msgstr "ÐŸÐ¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð½Ð°Ð´Ñ‚Ð¾ довге — макÑимум %d знаків, а ви надÑилаєте %d"
-#: lib/command.php:376
-#, fuzzy, php-format
+#: 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:422
-#, fuzzy
+#: lib/command.php:413
msgid "Cannot repeat your own notice"
-msgstr "Ðе можу вторувати Вашому влаÑному допиÑу."
+msgstr "Ðе можу вторувати Вашому влаÑному допиÑу"
-#: lib/command.php:427
-#, fuzzy
+#: lib/command.php:418
msgid "Already repeated that notice"
-msgstr "Цьому допиÑу вже вторували."
+msgstr "Цьому допиÑу вже вторували"
-#: lib/command.php:435
-#, fuzzy, php-format
+#: lib/command.php:426
+#, php-format
msgid "Notice from %s repeated"
-msgstr "ДопиÑу від %s вторували."
+msgstr "ДопиÑу від %s вторували"
-#: lib/command.php:437
+#: lib/command.php:428
msgid "Error repeating notice."
msgstr "Помилка із вторуваннÑм допиÑу."
-#: lib/command.php:491
-#, fuzzy, php-format
+#: lib/command.php:482
+#, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
-msgstr "Ð”Ð¾Ð¿Ð¸Ñ Ð½Ð°Ð´Ñ‚Ð¾ довгий — макÑимум %1$d Ñимволів, а Ви надÑилаєте %2$d."
+msgstr "Ð”Ð¾Ð¿Ð¸Ñ Ð½Ð°Ð´Ñ‚Ð¾ довгий — макÑимум %d знаків, а ви надÑилаєте %d"
-#: lib/command.php:500
-#, fuzzy, php-format
+#: lib/command.php:491
+#, php-format
msgid "Reply to %s sent"
-msgstr "Відповідь Ð´Ð»Ñ %s надіÑлано."
+msgstr "Відповідь до %s надіÑлано"
-#: lib/command.php:502
+#: lib/command.php:493
msgid "Error saving notice."
msgstr "Проблема при збереженні допиÑу."
-#: lib/command.php:556
-#, fuzzy
+#: lib/command.php:547
msgid "Specify the name of the user to subscribe to"
-msgstr "Зазначте Ñ–Ð¼â€™Ñ ÐºÐ¾Ñ€Ð¸Ñтувача, до Ñкого бажаєте підпиÑатиÑÑŒ."
+msgstr "Зазначте Ñ–Ð¼â€™Ñ ÐºÐ¾Ñ€Ð¸Ñтувача, до Ñкого бажаєте підпиÑатиÑÑŒ"
-#: lib/command.php:563
+#: lib/command.php:554
#, php-format
msgid "Subscribed to %s"
msgstr "ПідпиÑано до %s"
-#: lib/command.php:584
-#, fuzzy
+#: lib/command.php:575
msgid "Specify the name of the user to unsubscribe from"
-msgstr "Зазначте Ñ–Ð¼â€™Ñ ÐºÐ¾Ñ€Ð¸Ñтувача, від Ñкого бажаєте відпиÑатиÑÑŒ."
+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
+#: lib/command.php:641
msgid "Login command is disabled"
-msgstr "Команду входу відключено."
+msgstr "Команду входу відключено"
-#: lib/command.php:661
-#, fuzzy, php-format
+#: lib/command.php:652
+#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-"Це поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð¼Ð¾Ð¶Ð½Ð° викориÑтати лише раз, воно дійÑне протÑгом 2 хвилин: %s."
+"Це поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð¼Ð¾Ð¶Ð½Ð° викориÑтати лише раз, воно дійÑне протÑгом 2 хвилин: %s"
-#: lib/command.php:677
+#: lib/command.php:668
msgid "You are not subscribed to anyone."
msgstr "Ви не маєте жодних підпиÑок."
-#: lib/command.php:679
+#: 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:699
+#: lib/command.php:690
msgid "No one is subscribed to you."
msgstr "До Ð’Ð°Ñ Ð½Ñ–Ñ…Ñ‚Ð¾ не підпиÑаний."
-#: lib/command.php:701
+#: 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:721
+#: lib/command.php:712
msgid "You are not a member of any groups."
msgstr "Ви не Ñ” учаÑником жодної групи."
-#: lib/command.php:723
+#: 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:737
+#: lib/command.php:728
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4705,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 "Іти до файлу інÑталÑції."
@@ -4733,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 "Помилка бази даних"
@@ -4918,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 "ПриєднатиÑÑŒ"
@@ -5309,18 +5636,20 @@ msgid "Attach a file"
msgstr "ВклаÑти файл"
#: lib/noticeform.php:212
-#, fuzzy
msgid "Share my location"
msgstr "Показувати локацію."
-#: lib/noticeform.php:214
-#, fuzzy
+#: lib/noticeform.php:215
msgid "Do not share my location"
-msgstr "Приховувати локацію."
+msgstr "Приховувати мою локацію"
-#: lib/noticeform.php:215
-msgid "Hide this info"
-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
@@ -5579,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 "Ðе вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ підпиÑку."
@@ -5669,47 +5998,47 @@ msgstr "ПовідомленнÑ"
msgid "Moderate"
msgstr "Модерувати"
-#: lib/util.php:884
+#: lib/util.php:875
msgid "a few seconds ago"
msgstr "мить тому"
-#: lib/util.php:886
+#: lib/util.php:877
msgid "about a minute ago"
msgstr "хвилину тому"
-#: lib/util.php:888
+#: lib/util.php:879
#, php-format
msgid "about %d minutes ago"
msgstr "близько %d хвилин тому"
-#: lib/util.php:890
+#: lib/util.php:881
msgid "about an hour ago"
msgstr "годину тому"
-#: lib/util.php:892
+#: lib/util.php:883
#, php-format
msgid "about %d hours ago"
msgstr "близько %d годин тому"
-#: lib/util.php:894
+#: lib/util.php:885
msgid "about a day ago"
msgstr "день тому"
-#: lib/util.php:896
+#: lib/util.php:887
#, php-format
msgid "about %d days ago"
msgstr "близько %d днів тому"
-#: lib/util.php:898
+#: lib/util.php:889
msgid "about a month ago"
msgstr "міÑÑць тому"
-#: lib/util.php:900
+#: lib/util.php:891
#, php-format
msgid "about %d months ago"
msgstr "близько %d міÑÑців тому"
-#: lib/util.php:902
+#: lib/util.php:893
msgid "about a year ago"
msgstr "рік тому"
diff --git a/locale/vi/LC_MESSAGES/statusnet.po b/locale/vi/LC_MESSAGES/statusnet.po
index b503aa625..1d889777d 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-11 23:25+0000\n"
-"PO-Revision-Date: 2010-01-11 23:28:31+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 (r60950); 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,8 +33,8 @@ 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
@@ -43,15 +43,20 @@ msgstr "Không có tin nhắn nào."
#: 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!"
@@ -126,7 +131,7 @@ msgstr ""
#: 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/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
@@ -146,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."
@@ -177,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 ""
@@ -331,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."
@@ -343,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ự)"
@@ -393,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 actions/joingroup.php:128
+#: 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."
@@ -403,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."
@@ -423,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"
@@ -455,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 ""
@@ -617,29 +720,6 @@ msgstr "Tải file"
msgid "Crop"
msgstr "Nhóm"
-#: 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/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 ""
@@ -709,7 +789,7 @@ msgstr ""
#: actions/grouplogo.php:99 actions/groupmembers.php:83
#: actions/grouprss.php:98 actions/groupunblock.php:86
#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86
-#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263
+#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:260
#, fuzzy
msgid "No such group."
msgstr "Không có tin nhắn nào."
@@ -780,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
@@ -984,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"
@@ -1008,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"
@@ -1082,7 +1244,8 @@ 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"
@@ -1742,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)"
@@ -1790,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"
@@ -1861,7 +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:135
+#: actions/joingroup.php:131
#, fuzzy, php-format
msgid "%1$s joined group %2$s"
msgstr "%s và nhóm"
@@ -1871,17 +2034,12 @@ 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
+#: actions/leavegroup.php:127
#, fuzzy, php-format
msgid "%1$s left group %2$s"
msgstr "%s và nhóm"
@@ -1908,17 +2066,6 @@ msgstr "Äăng nhập"
msgid "Login to site"
msgstr ""
-#: actions/login.php:230 actions/profilesettings.php:106
-#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94
-#: lib/groupeditform.php:152 lib/userprofile.php:131
-msgid "Nickname"
-msgstr "Biệt danh"
-
-#: actions/login.php:233 actions/register.php:429
-#: lib/accountsettingsaction.php:116
-msgid "Password"
-msgstr "Mật khẩu"
-
#: actions/login.php:236 actions/register.php:478
msgid "Remember me"
msgstr "Nhớ tôi"
@@ -1972,6 +2119,28 @@ msgstr "Bạn phải đăng nhập vào má»›i có thể gá»­i thÆ° má»i những
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"
@@ -1986,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!"
@@ -2000,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 ""
@@ -2086,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"
@@ -2104,8 +2317,8 @@ msgstr "Kết nối"
msgid "Only "
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033
-#: lib/api.php:1061 lib/api.php:1171
+#: 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."
@@ -2120,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
@@ -2463,7 +2676,7 @@ msgid "Full name"
msgstr "Tên đầy đủ"
#: actions/profilesettings.php:115 actions/register.php:453
-#: lib/groupeditform.php:161
+#: lib/applicationeditform.php:230 lib/groupeditform.php:161
msgid "Homepage"
msgstr "Trang chủ hoặc Blog"
@@ -3063,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"
@@ -3172,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"
@@ -4096,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"
@@ -4110,10 +4392,6 @@ msgstr "Cá nhân"
msgid "Author(s)"
msgstr ""
-#: actions/version.php:198 lib/groupeditform.php:172
-msgid "Description"
-msgstr "Mô tả"
-
#: classes/File.php:144
#, php-format
msgid ""
@@ -4131,6 +4409,21 @@ msgstr ""
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"
@@ -4151,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 "
@@ -4264,11 +4557,6 @@ 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"
msgstr "Thay đổi mật khẩu của bạn"
@@ -4435,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."
@@ -4478,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 ""
@@ -4499,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."
@@ -4549,13 +4898,13 @@ 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"
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"
msgstr "NgÆ°á»i dùng không có thông tin."
@@ -4570,176 +4919,176 @@ msgstr "Tin nhắn này đã có trong danh sách tin nhắn Æ°a thích của bá
msgid "You are already a member of that group"
msgstr "Bạn đã theo những ngÆ°á»i này:"
-#: lib/command.php:234
+#: lib/command.php:231
#, fuzzy, php-format
msgid "Could not join user %s to group %s"
msgstr "Không thể theo bạn này: %s đã có trong danh sách bạn bè của bạn rồi."
-#: lib/command.php:239
+#: lib/command.php:236
#, fuzzy, php-format
msgid "%s joined group %s"
msgstr "%s và nhóm"
-#: lib/command.php:284
+#: 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:289
+#: lib/command.php:280
#, fuzzy, php-format
msgid "%s left group %s"
msgstr "%s và nhóm"
-#: lib/command.php:318
+#: lib/command.php:309
#, fuzzy, php-format
msgid "Fullname: %s"
msgstr "Tên đầy đủ"
-#: lib/command.php:321 lib/mail.php:254
+#: lib/command.php:312 lib/mail.php:254
#, fuzzy, php-format
msgid "Location: %s"
msgstr "Thành phố: %s"
-#: lib/command.php:324 lib/mail.php:256
+#: 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 %d characters, you sent %d"
msgstr ""
-#: lib/command.php:376
+#: lib/command.php:367
#, fuzzy, php-format
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:422
+#: 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:427
+#: lib/command.php:418
#, fuzzy
msgid "Already repeated that notice"
msgstr "Xóa tin nhắn"
-#: lib/command.php:435
+#: lib/command.php:426
#, fuzzy, php-format
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 %d characters, you sent %d"
msgstr ""
-#: lib/command.php:500
+#: lib/command.php:491
#, fuzzy, php-format
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
+#: 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
+#: 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
+#: lib/command.php:641
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:661
+#: lib/command.php:652
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:677
+#: 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:679
+#: 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:699
+#: lib/command.php:690
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Không thể tạo favorite."
-#: lib/command.php:701
+#: 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:721
+#: 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:723
+#: 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:737
+#: lib/command.php:728
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4780,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 ""
@@ -4809,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 ""
@@ -5010,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"
@@ -5382,13 +5745,15 @@ msgstr ""
msgid "Share my location"
msgstr "Không thể lưu hồ sơ cá nhân."
-#: lib/noticeform.php:214
+#: lib/noticeform.php:215
#, fuzzy
msgid "Do not share my location"
msgstr "Không thể lưu hồ sơ cá nhân."
-#: lib/noticeform.php:215
-msgid "Hide this info"
+#: lib/noticeform.php:216
+msgid ""
+"Sorry, retrieving your geo location is taking longer than expected, please "
+"try again later"
msgstr ""
#: lib/noticelist.php:428
@@ -5674,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."
@@ -5777,47 +6142,47 @@ msgstr "Tin mới nhất"
msgid "Moderate"
msgstr ""
-#: lib/util.php:884
+#: lib/util.php:875
msgid "a few seconds ago"
msgstr "vài giây trước"
-#: lib/util.php:886
+#: lib/util.php:877
msgid "about a minute ago"
msgstr "1 phút trước"
-#: lib/util.php:888
+#: lib/util.php:879
#, php-format
msgid "about %d minutes ago"
msgstr "%d phút trước"
-#: lib/util.php:890
+#: lib/util.php:881
msgid "about an hour ago"
msgstr "1 giá» trÆ°á»›c"
-#: lib/util.php:892
+#: lib/util.php:883
#, php-format
msgid "about %d hours ago"
msgstr "%d giá» trÆ°á»›c"
-#: lib/util.php:894
+#: lib/util.php:885
msgid "about a day ago"
msgstr "1 ngày trước"
-#: lib/util.php:896
+#: lib/util.php:887
#, php-format
msgid "about %d days ago"
msgstr "%d ngày trước"
-#: lib/util.php:898
+#: lib/util.php:889
msgid "about a month ago"
msgstr "1 tháng trước"
-#: lib/util.php:900
+#: lib/util.php:891
#, php-format
msgid "about %d months ago"
msgstr "%d tháng trước"
-#: lib/util.php:902
+#: lib/util.php:893
msgid "about a year ago"
msgstr "1 năm trước"
diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po
index 040571a28..ec2e005d1 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-11 23:25+0000\n"
-"PO-Revision-Date: 2010-01-11 23:28:35+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 (r60950); 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,8 +35,8 @@ 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
@@ -45,15 +45,20 @@ msgstr "没有该页é¢"
#: 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!"
@@ -128,7 +133,7 @@ msgstr "æ¥è‡ª%2$s 上 %1$s 和好å‹çš„æ›´æ–°ï¼"
#: 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/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
@@ -148,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请求。"
@@ -179,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 ""
@@ -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
#, fuzzy, php-format
msgid "Description is too long (max %d chars)."
msgstr "æ述过长(ä¸èƒ½è¶…过140字符)。"
@@ -391,7 +399,7 @@ msgstr "您已ç»æ˜¯è¯¥ç»„æˆå‘˜"
msgid "You have been blocked from that group by the admin."
msgstr ""
-#: actions/apigroupjoin.php:138 actions/joingroup.php:128
+#: 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 组"
@@ -401,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 "无法订阅用户:未找到。"
@@ -421,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请求。"
@@ -453,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 ""
@@ -611,29 +714,6 @@ msgstr "上传"
msgid "Crop"
msgstr "剪è£"
-#: 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/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 "请选择一å—方形区域作为你的头åƒ"
@@ -703,7 +783,7 @@ msgstr "ä¿å­˜é˜»æ­¢ä¿¡æ¯å¤±è´¥ã€‚"
#: actions/grouplogo.php:99 actions/groupmembers.php:83
#: actions/grouprss.php:98 actions/groupunblock.php:86
#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86
-#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263
+#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:260
msgid "No such group."
msgstr "没有这个组。"
@@ -776,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
@@ -976,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 "ä¿å­˜"
@@ -997,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"
@@ -1068,7 +1231,8 @@ 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 "å–消"
@@ -1712,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)"
@@ -1753,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 "å‘é€"
@@ -1818,7 +1982,7 @@ msgstr ""
msgid "You must be logged in to join a group."
msgstr "您必须登录æ‰èƒ½åŠ å…¥ç»„。"
-#: actions/joingroup.php:135
+#: actions/joingroup.php:131
#, fuzzy, php-format
msgid "%1$s joined group %2$s"
msgstr "%s 加入 %s 组"
@@ -1828,17 +1992,12 @@ 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
+#: actions/leavegroup.php:127
#, fuzzy, php-format
msgid "%1$s left group %2$s"
msgstr "%s 离开群 %s"
@@ -1865,17 +2024,6 @@ msgstr "登录"
msgid "Login to site"
msgstr "登录"
-#: actions/login.php:230 actions/profilesettings.php:106
-#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94
-#: lib/groupeditform.php:152 lib/userprofile.php:131
-msgid "Nickname"
-msgstr "昵称"
-
-#: actions/login.php:233 actions/register.php:429
-#: lib/accountsettingsaction.php:116
-msgid "Password"
-msgstr "密ç "
-
#: actions/login.php:236 actions/register.php:478
msgid "Remember me"
msgstr "è®°ä½ç™»å½•çŠ¶æ€"
@@ -1926,6 +2074,29 @@ msgstr "åªæœ‰adminæ‰èƒ½ç¼–辑这个组"
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 "新组"
@@ -1938,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 "没有内容ï¼"
@@ -1951,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 "ä¸è¦å‘自己å‘é€æ¶ˆæ¯ï¼›è·Ÿè‡ªå·±æ‚„悄说就得了。"
@@ -2033,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 "通告没有关è”个人信æ¯"
@@ -2051,8 +2267,8 @@ msgstr "连接"
msgid "Only "
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033
-#: lib/api.php:1061 lib/api.php:1171
+#: 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 "ä¸æ”¯æŒçš„æ•°æ®æ ¼å¼ã€‚"
@@ -2066,7 +2282,7 @@ msgstr "æœç´¢é€šå‘Š"
#: actions/othersettings.php:60
#, fuzzy
-msgid "Other Settings"
+msgid "Other settings"
msgstr "Twitter 设置"
#: actions/othersettings.php:71
@@ -2401,7 +2617,7 @@ msgid "Full name"
msgstr "å…¨å"
#: actions/profilesettings.php:115 actions/register.php:453
-#: lib/groupeditform.php:161
+#: lib/applicationeditform.php:230 lib/groupeditform.php:161
msgid "Homepage"
msgstr "主页"
@@ -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 "无法获å–收è—的通告。"
@@ -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"
@@ -4020,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"
@@ -4034,11 +4320,6 @@ msgstr "个人"
msgid "Author(s)"
msgstr ""
-#: actions/version.php:198 lib/groupeditform.php:172
-#, fuzzy
-msgid "Description"
-msgstr "æè¿°"
-
#: classes/File.php:144
#, php-format
msgid ""
@@ -4056,6 +4337,21 @@ msgstr ""
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"
@@ -4074,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 消æ¯"
@@ -4184,10 +4480,6 @@ 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"
msgstr "修改资料"
@@ -4353,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."
@@ -4398,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 ""
@@ -4419,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 "密ç å·²ä¿å­˜ã€‚"
@@ -4467,14 +4820,13 @@ 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"
msgstr "没有找到此IDçš„ä¿¡æ¯ã€‚"
-#: lib/command.php:168 lib/command.php:415 lib/command.php:476
-#: lib/command.php:532
-#, fuzzy
+#: lib/command.php:168 lib/command.php:406 lib/command.php:467
+#: lib/command.php:523
msgid "User has no last notice"
msgstr "用户没有通告。"
@@ -4483,179 +4835,176 @@ msgid "Notice marked as fave."
msgstr "通告被标记为收è—。"
#: lib/command.php:217
-#, fuzzy
msgid "You are already a member of that group"
msgstr "您已ç»æ˜¯è¯¥ç»„æˆå‘˜"
-#: lib/command.php:234
+#: lib/command.php:231
#, fuzzy, php-format
msgid "Could not join user %s to group %s"
msgstr "无法把 %s 用户添加到 %s 组"
-#: lib/command.php:239
+#: lib/command.php:236
#, fuzzy, php-format
msgid "%s joined group %s"
msgstr "%s 加入 %s 组"
-#: lib/command.php:284
+#: lib/command.php:275
#, fuzzy, php-format
msgid "Could not remove user %s to group %s"
msgstr "无法订阅用户:未找到。"
-#: lib/command.php:289
-#, fuzzy, php-format
+#: lib/command.php:280
+#, php-format
msgid "%s left group %s"
msgstr "%s 离开群 %s"
-#: lib/command.php:318
-#, fuzzy, php-format
+#: lib/command.php:309
+#, php-format
msgid "Fullname: %s"
msgstr "å…¨å:%s"
-#: lib/command.php:321 lib/mail.php:254
+#: lib/command.php:312 lib/mail.php:254
#, php-format
msgid "Location: %s"
msgstr "ä½ç½®ï¼š%s"
-#: lib/command.php:324 lib/mail.php:256
+#: 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 %d characters, you sent %d"
msgstr "您的消æ¯åŒ…å« %d 个字符,超出长度é™åˆ¶ - ä¸èƒ½è¶…过 140 个字符。"
-#: lib/command.php:376
-#, fuzzy, php-format
+#: 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:422
+#: lib/command.php:413
#, fuzzy
msgid "Cannot repeat your own notice"
msgstr "无法开å¯é€šå‘Šã€‚"
-#: lib/command.php:427
+#: lib/command.php:418
#, fuzzy
msgid "Already repeated that notice"
msgstr "删除通告"
-#: lib/command.php:435
+#: lib/command.php:426
#, fuzzy, php-format
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 %d characters, you sent %d"
msgstr "您的消æ¯åŒ…å« %d 个字符,超出长度é™åˆ¶ - ä¸èƒ½è¶…过 140 个字符。"
-#: lib/command.php:500
+#: lib/command.php:491
#, fuzzy, php-format
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
+#: 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
+#: 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
+#: lib/command.php:641
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:661
+#: lib/command.php:652
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:677
+#: lib/command.php:668
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "您未告知此个人信æ¯"
-#: lib/command.php:679
+#: lib/command.php:670
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "您已订阅这些用户:"
-#: lib/command.php:699
+#: lib/command.php:690
#, fuzzy
msgid "No one is subscribed to you."
msgstr "无法订阅他人更新。"
-#: lib/command.php:701
+#: lib/command.php:692
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "无法订阅他人更新。"
-#: lib/command.php:721
+#: lib/command.php:712
#, fuzzy
msgid "You are not a member of any groups."
msgstr "您未告知此个人信æ¯"
-#: lib/command.php:723
+#: 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:737
+#: lib/command.php:728
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4696,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 "登入本站"
@@ -4726,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 ""
@@ -4921,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"
@@ -5250,13 +5613,15 @@ msgstr ""
msgid "Share my location"
msgstr "无法ä¿å­˜ä¸ªäººä¿¡æ¯ã€‚"
-#: lib/noticeform.php:214
+#: lib/noticeform.php:215
#, fuzzy
msgid "Do not share my location"
msgstr "无法ä¿å­˜ä¸ªäººä¿¡æ¯ã€‚"
-#: lib/noticeform.php:215
-msgid "Hide this info"
+#: lib/noticeform.php:216
+msgid ""
+"Sorry, retrieving your geo location is taking longer than expected, please "
+"try again later"
msgstr ""
#: lib/noticelist.php:428
@@ -5541,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 "无法删除订阅。"
@@ -5643,47 +6008,47 @@ msgstr "新消æ¯"
msgid "Moderate"
msgstr ""
-#: lib/util.php:884
+#: lib/util.php:875
msgid "a few seconds ago"
msgstr "几秒å‰"
-#: lib/util.php:886
+#: lib/util.php:877
msgid "about a minute ago"
msgstr "一分钟å‰"
-#: lib/util.php:888
+#: lib/util.php:879
#, php-format
msgid "about %d minutes ago"
msgstr "%d 分钟å‰"
-#: lib/util.php:890
+#: lib/util.php:881
msgid "about an hour ago"
msgstr "一å°æ—¶å‰"
-#: lib/util.php:892
+#: lib/util.php:883
#, php-format
msgid "about %d hours ago"
msgstr "%d å°æ—¶å‰"
-#: lib/util.php:894
+#: lib/util.php:885
msgid "about a day ago"
msgstr "一天å‰"
-#: lib/util.php:896
+#: lib/util.php:887
#, php-format
msgid "about %d days ago"
msgstr "%d 天å‰"
-#: lib/util.php:898
+#: lib/util.php:889
msgid "about a month ago"
msgstr "一个月å‰"
-#: lib/util.php:900
+#: lib/util.php:891
#, php-format
msgid "about %d months ago"
msgstr "%d 个月å‰"
-#: lib/util.php:902
+#: lib/util.php:893
msgid "about a year ago"
msgstr "一年å‰"
diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.po b/locale/zh_TW/LC_MESSAGES/statusnet.po
index 314bd0cdd..2fdb74d71 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-11 23:25+0000\n"
-"PO-Revision-Date: 2010-01-11 23:28:38+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 (r60950); 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,8 +33,8 @@ 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
@@ -43,15 +43,20 @@ msgstr "無此通知"
#: 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!"
@@ -126,7 +131,7 @@ msgstr ""
#: 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/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
@@ -146,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 ""
@@ -177,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 ""
@@ -324,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."
@@ -336,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個字元)"
@@ -385,7 +393,7 @@ msgstr ""
msgid "You have been blocked from that group by the admin."
msgstr ""
-#: actions/apigroupjoin.php:138 actions/joingroup.php:128
+#: 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 +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"
@@ -415,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 ""
@@ -447,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 ""
@@ -604,29 +707,6 @@ msgstr ""
msgid "Crop"
msgstr ""
-#: 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/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 ""
@@ -696,7 +776,7 @@ msgstr ""
#: actions/grouplogo.php:99 actions/groupmembers.php:83
#: actions/grouprss.php:98 actions/groupunblock.php:86
#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86
-#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263
+#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:260
#, fuzzy
msgid "No such group."
msgstr "無此通知"
@@ -768,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
@@ -963,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 ""
@@ -984,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"
@@ -1053,7 +1212,8 @@ 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 "å–消"
@@ -1671,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 ""
@@ -1712,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 ""
@@ -1756,7 +1916,7 @@ msgstr ""
msgid "You must be logged in to join a group."
msgstr ""
-#: actions/joingroup.php:135
+#: actions/joingroup.php:131
#, php-format
msgid "%1$s joined group %2$s"
msgstr ""
@@ -1765,15 +1925,11 @@ 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
+#: actions/leavegroup.php:127
#, fuzzy, php-format
msgid "%1$s left group %2$s"
msgstr "%1$s的狀態是%2$s"
@@ -1799,17 +1955,6 @@ msgstr "登入"
msgid "Login to site"
msgstr ""
-#: actions/login.php:230 actions/profilesettings.php:106
-#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94
-#: lib/groupeditform.php:152 lib/userprofile.php:131
-msgid "Nickname"
-msgstr "暱稱"
-
-#: actions/login.php:233 actions/register.php:429
-#: lib/accountsettingsaction.php:116
-msgid "Password"
-msgstr ""
-
#: actions/login.php:236 actions/register.php:478
msgid "Remember me"
msgstr ""
@@ -1858,6 +2003,27 @@ msgstr "無法從 %s 建立OpenID"
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 ""
@@ -1870,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 "無內容"
@@ -1883,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 ""
@@ -1962,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 ""
@@ -1980,8 +2189,8 @@ msgstr "連çµ"
msgid "Only "
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033
-#: lib/api.php:1061 lib/api.php:1171
+#: 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 ""
@@ -1995,7 +2204,7 @@ msgstr ""
#: actions/othersettings.php:60
#, fuzzy
-msgid "Other Settings"
+msgid "Other settings"
msgstr "線上å³æ™‚通設定"
#: actions/othersettings.php:71
@@ -2320,7 +2529,7 @@ msgid "Full name"
msgstr "å…¨å"
#: actions/profilesettings.php:115 actions/register.php:453
-#: lib/groupeditform.php:161
+#: lib/applicationeditform.php:230 lib/groupeditform.php:161
msgid "Homepage"
msgstr "個人首é "
@@ -2886,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 ""
@@ -2993,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"
@@ -3875,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"
@@ -3889,11 +4166,6 @@ msgstr "地點"
msgid "Author(s)"
msgstr ""
-#: actions/version.php:198 lib/groupeditform.php:172
-#, fuzzy
-msgid "Description"
-msgstr "所有訂閱"
-
#: classes/File.php:144
#, php-format
msgid ""
@@ -3911,6 +4183,21 @@ msgstr ""
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"
@@ -3928,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 ""
@@ -4039,11 +4326,6 @@ 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 ""
@@ -4201,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 ""
@@ -4240,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 ""
@@ -4260,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 ""
@@ -4285,7 +4625,7 @@ msgid "Sorry, this command is not yet implemented."
msgstr ""
#: lib/command.php:88
-#, fuzzy, php-format
+#, php-format
msgid "Could not find a user with nickname %s"
msgstr "無法更新使用者"
@@ -4306,12 +4646,12 @@ 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
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"
msgstr "新訊æ¯"
@@ -4325,172 +4665,172 @@ msgstr ""
msgid "You are already a member of that group"
msgstr "無法連çµåˆ°ä¼ºæœå™¨:%s"
-#: lib/command.php:234
+#: lib/command.php:231
#, fuzzy, php-format
msgid "Could not join user %s to group %s"
msgstr "無法連çµåˆ°ä¼ºæœå™¨:%s"
-#: lib/command.php:239
+#: lib/command.php:236
#, fuzzy, php-format
msgid "%s joined group %s"
msgstr "%1$s的狀態是%2$s"
-#: lib/command.php:284
+#: lib/command.php:275
#, fuzzy, php-format
msgid "Could not remove user %s to group %s"
msgstr "無法從 %s 建立OpenID"
-#: lib/command.php:289
+#: lib/command.php:280
#, fuzzy, php-format
msgid "%s left group %s"
msgstr "%1$s的狀態是%2$s"
-#: lib/command.php:318
+#: lib/command.php:309
#, fuzzy, php-format
msgid "Fullname: %s"
msgstr "å…¨å"
-#: lib/command.php:321 lib/mail.php:254
+#: lib/command.php:312 lib/mail.php:254
#, php-format
msgid "Location: %s"
msgstr ""
-#: lib/command.php:324 lib/mail.php:256
+#: 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 %d characters, you sent %d"
msgstr ""
-#: lib/command.php:376
+#: lib/command.php:367
#, php-format
msgid "Direct message to %s sent"
msgstr ""
-#: lib/command.php:378
+#: lib/command.php:369
msgid "Error sending direct message."
msgstr ""
-#: lib/command.php:422
+#: lib/command.php:413
#, fuzzy
msgid "Cannot repeat your own notice"
msgstr "儲存使用者發生錯誤"
-#: lib/command.php:427
+#: lib/command.php:418
#, fuzzy
msgid "Already repeated that notice"
msgstr "無此使用者"
-#: lib/command.php:435
+#: lib/command.php:426
#, fuzzy, php-format
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 %d characters, you sent %d"
msgstr ""
-#: lib/command.php:500
+#: lib/command.php:491
#, fuzzy, 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
+#: 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
+#: 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
+#: lib/command.php:641
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:661
+#: lib/command.php:652
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:677
+#: lib/command.php:668
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "此帳號已註冊"
-#: lib/command.php:679
+#: lib/command.php:670
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "此帳號已註冊"
-#: lib/command.php:699
+#: lib/command.php:690
#, fuzzy
msgid "No one is subscribed to you."
msgstr "無此訂閱"
-#: lib/command.php:701
+#: lib/command.php:692
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "無此訂閱"
-#: lib/command.php:721
+#: lib/command.php:712
#, fuzzy
msgid "You are not a member of any groups."
msgstr "無法連çµåˆ°ä¼ºæœå™¨:%s"
-#: lib/command.php:723
+#: 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:737
+#: lib/command.php:728
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4531,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 ""
@@ -4560,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 ""
@@ -4748,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"
@@ -5067,13 +5421,15 @@ msgstr ""
msgid "Share my location"
msgstr "無法儲存個人資料"
-#: lib/noticeform.php:214
+#: lib/noticeform.php:215
#, fuzzy
msgid "Do not share my location"
msgstr "無法儲存個人資料"
-#: lib/noticeform.php:215
-msgid "Hide this info"
+#: lib/noticeform.php:216
+msgid ""
+"Sorry, retrieving your geo location is taking longer than expected, please "
+"try again later"
msgstr ""
#: lib/noticelist.php:428
@@ -5344,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 "無法刪除帳號"
@@ -5440,47 +5796,47 @@ msgstr ""
msgid "Moderate"
msgstr ""
-#: lib/util.php:884
+#: lib/util.php:875
msgid "a few seconds ago"
msgstr ""
-#: lib/util.php:886
+#: lib/util.php:877
msgid "about a minute ago"
msgstr ""
-#: lib/util.php:888
+#: lib/util.php:879
#, php-format
msgid "about %d minutes ago"
msgstr ""
-#: lib/util.php:890
+#: lib/util.php:881
msgid "about an hour ago"
msgstr ""
-#: lib/util.php:892
+#: lib/util.php:883
#, php-format
msgid "about %d hours ago"
msgstr ""
-#: lib/util.php:894
+#: lib/util.php:885
msgid "about a day ago"
msgstr ""
-#: lib/util.php:896
+#: lib/util.php:887
#, php-format
msgid "about %d days ago"
msgstr ""
-#: lib/util.php:898
+#: lib/util.php:889
msgid "about a month ago"
msgstr ""
-#: lib/util.php:900
+#: lib/util.php:891
#, php-format
msgid "about %d months ago"
msgstr ""
-#: lib/util.php:902
+#: lib/util.php:893
msgid "about a year ago"
msgstr ""
diff --git a/plugins/Imap/ImapPlugin.php b/plugins/Imap/ImapPlugin.php
index d9768b680..89a775a16 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;
+ /**
+ * 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)
+ {
+ $dir = dirname(__FILE__);
+
+ switch ($cls)
+ {
+ case 'ImapManager':
+ case 'IMAPMailHandler':
+ include_once $dir . '/'.strtolower($cls).'.php';
+ return false;
+ default:
+ return true;
+ }
}
- function onGetValidDaemons($daemons)
+ function onStartIoManagerClasses(&$classes)
{
- if(! self::$daemon_added){
- array_push($daemons, INSTALLDIR .
- '/plugins/Imap/imapdaemon.php');
- self::$daemon_added = true;
- }
- return true;
+ $classes[] = new ImapManager($this);
}
function onPluginVersion(&$versions)
diff --git a/plugins/Imap/imapdaemon.php b/plugins/Imap/imapdaemon.php
deleted file mode 100755
index 7e60e1376..000000000
--- a/plugins/Imap/imapdaemon.php
+++ /dev/null
@@ -1,147 +0,0 @@
-#!/usr/bin/env php
-<?php
-/*
- * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2008, 2009, StatusNet, Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-define('INSTALLDIR', realpath(dirname(__FILE__) . '/../..'));
-
-$shortoptions = 'fi::';
-$longoptions = array('id::', 'foreground');
-
-$helptext = <<<END_OF_IMAP_HELP
-Daemon script for receiving new notices from users via a mail box (IMAP, POP3, etc)
-
- -i --id Identity (default none)
- -f --foreground Stay in the foreground (default background)
-
-END_OF_IMAP_HELP;
-
-require_once INSTALLDIR.'/scripts/commandline.inc';
-
-require_once INSTALLDIR . '/lib/common.php';
-require_once INSTALLDIR . '/lib/daemon.php';
-require_once INSTALLDIR.'/lib/mailhandler.php';
-
-class IMAPDaemon extends Daemon
-{
- function __construct($resource=null, $daemonize=true, $attrs)
- {
- parent::__construct($daemonize);
-
- foreach ($attrs as $attr=>$value)
- {
- $this->$attr = $value;
- }
-
- $this->log(LOG_INFO, "INITIALIZE IMAPDaemon {" . $this->name() . "}");
- }
-
- function name()
- {
- return strtolower('imapdaemon.'.$this->user.'.'.crc32($this->mailbox));
- }
-
- function run()
- {
- $this->connect();
- while(true)
- {
- if(imap_ping($this->conn) || $this->connect())
- {
- $this->check_mailbox();
- }
- sleep($this->poll_frequency);
- }
- }
-
- function check_mailbox()
- {
- $count = imap_num_msg($this->conn);
- $this->log(LOG_INFO, "Found $count messages");
- if($count > 0){
- $handler = new IMAPMailHandler();
- for($i=1; $i <= $count; $i++)
- {
- $rawmessage = imap_fetchheader($this->conn, $count, FT_PREFETCHTEXT) . imap_body($this->conn, $i);
- $handler->handle_message($rawmessage);
- imap_delete($this->conn, $i);
- }
- imap_expunge($this->conn);
- $this->log(LOG_INFO, "Finished processing messages");
- }
- }
-
- function log($level, $msg)
- {
- $text = $this->name() . ': '.$msg;
- common_log($level, $text);
- if (!$this->daemonize)
- {
- $line = common_log_line($level, $text);
- echo $line;
- echo "\n";
- }
- }
-
- function connect()
- {
- $this->conn = imap_open($this->mailbox, $this->user, $this->password);
- if($this->conn){
- $this->log(LOG_INFO, "Connected");
- return true;
- }else{
- $this->log(LOG_INFO, "Failed to connect: " . imap_last_error());
- return false;
- }
- }
-}
-
-class IMAPMailHandler extends MailHandler
-{
- function error($from, $msg)
- {
- $this->log(LOG_INFO, "Error: $from $msg");
- $headers['To'] = $from;
- $headers['Subject'] = _m('Error');
-
- return mail_send(array($from), $headers, $msg);
- }
-}
-
-if (have_option('i', 'id')) {
- $id = get_option_value('i', 'id');
-} else if (count($args) > 0) {
- $id = $args[0];
-} else {
- $id = null;
-}
-
-$foreground = have_option('f', 'foreground');
-
-foreach(ImapPlugin::$instances as $pluginInstance){
-
- $daemon = new IMAPDaemon($id, !$foreground, array(
- 'mailbox' => $pluginInstance->mailbox,
- 'user' => $pluginInstance->user,
- 'password' => $pluginInstance->password,
- 'poll_frequency' => $pluginInstance->poll_frequency
- ));
-
- $daemon->runOnce();
-
-}
diff --git a/plugins/Imap/imapmailhandler.php b/plugins/Imap/imapmailhandler.php
new file mode 100644
index 000000000..3d4b6113a
--- /dev/null
+++ b/plugins/Imap/imapmailhandler.php
@@ -0,0 +1,32 @@
+<?php
+/*
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2008, 2009, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
+
+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 000000000..e4fda5809
--- /dev/null
+++ b/plugins/Imap/imapmanager.php
@@ -0,0 +1,129 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * IMAP IO Manager
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category Plugin
+ * @package StatusNet
+ * @author Craig Andrews <candrews@integralblue.com>
+ * @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 eb3a05117..1755033f1 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/MemcachePlugin.php b/plugins/MemcachePlugin.php
index fbc2802f7..8c8b8da6d 100644
--- a/plugins/MemcachePlugin.php
+++ b/plugins/MemcachePlugin.php
@@ -165,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/scripts/initializeinbox.php b/scripts/initializeinbox.php
index 43afc48eb..44508fe22 100644
--- a/scripts/initializeinbox.php
+++ b/scripts/initializeinbox.php
@@ -20,17 +20,18 @@
define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
-$shortoptions = 'i:n:af';
-$longoptions = array('id=', 'nickname=', 'all', 'force');
+$shortoptions = 'i:n:af:';
+$longoptions = array('id=', 'nickname=', 'all', 'file=');
$helptext = <<<END_OF_INITIALIZEINBOX_HELP
initializeinbox.php [options]
initialize the inbox for a user
- -i --id ID of user to update
- -n --nickname nickname of the user to update
- -f --force force update even if user already has a location
- -a --all update all
+ -i --id ID of user to update
+ -n --nickname nickname of the user to update
+ -f FILENAME read list of IDs from FILENAME (1 per line)
+ --file=FILENAME ditto
+ -a --all update all
END_OF_INITIALIZEINBOX_HELP;
@@ -60,6 +61,21 @@ try {
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);
@@ -75,14 +91,20 @@ function initializeInbox($user)
print "Initializing inbox for $user->nickname...";
}
- $inbox = Inbox::staticGet('user_id', $user_id);
+ $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);
+ $inbox = Inbox::initialize($user->id);
if (!have_option('q', 'quiet')) {
if (empty($inbox)) {
print "ERR\n";
diff --git a/scripts/queuedaemon.php b/scripts/queuedaemon.php
index 8ef364fe7..162f617e0 100755
--- a/scripts/queuedaemon.php
+++ b/scripts/queuedaemon.php
@@ -21,7 +21,7 @@
define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
$shortoptions = 'fi:at:';
-$longoptions = array('id=', 'foreground', 'all', 'threads=');
+$longoptions = array('id=', 'foreground', 'all', 'threads=', 'skip-xmpp', 'xmpp-only');
/**
* Attempts to get a count of the processors available on the current system
@@ -260,6 +260,13 @@ if (!$threads) {
$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/update_po_templates.php b/scripts/update_po_templates.php
index 83bff6d80..f882f673a 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 = <<<END
---
BASIC:
- id: out-statusnet-{$plugin}
+ id: out-statusnet-{$pluginlc}
label: StatusNet - {$plugin}
- description: "{{int:bw-desc-statusnet-plugin-{$plugin}}}"
+ description: "{{int:bw-desc-statusnet-plugin-{$pluginlc}}}"
namespace: NS_STATUSNET
- display: out/statusnet/{$plugin}
+ display: out/statusnet/{$pluginlc}
class: GettextMessageGroup
FILES:
class: GettextFFS
sourcePattern: %GROUPROOT%/plugins/{$plugin}/locale/%CODE%/LC_MESSAGES/{$plugin}.po
- targetPattern: {$plugin}.po
+ targetPattern: plugins/{$plugin}/locale/%CODE%/LC_MESSAGES/{$plugin}.po
codeMap:
en-gb: en_GB
no: nb
@@ -103,7 +104,7 @@ FILES:
MANGLER
class: StringMatcher
- prefix: {$plugin}-
+ prefix: {$pluginlc}-
patterns:
- "*"
@@ -208,4 +209,3 @@ if ($plugins) {
}
}
}
-
diff --git a/tests/oauth/README b/tests/oauth/README
new file mode 100644
index 000000000..dd76feb0c
--- /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 000000000..2394826c7
--- /dev/null
+++ b/tests/oauth/exchangetokens.php
@@ -0,0 +1,105 @@
+#!/usr/bin/env php
+<?php
+/*
+ * StatusNet - a distributed open-source microblogging tool
+ * Copyright (C) 2008, 2009, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/../..'));
+
+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 = <<<END_OF_ETOKENS_HELP
+ exchangetokens.php [options]
+ Exchange an authorized OAuth request token for an access token
+
+ -t --oauth_token authorized request token
+ -s --token_secret authorized request token secret
+
+END_OF_ETOKENS_HELP;
+
+require_once INSTALLDIR . '/scripts/commandline.inc';
+
+$token = null;
+$token_secret = null;
+
+if (have_option('t', 'oauth_token')) {
+ $token = get_option_value('oauth_token');
+}
+
+if (have_option('s', 'token_secret')) {
+ $token_secret = get_option_value('s', 'token_secret');
+}
+
+if (empty($token)) {
+ print "Please specify a request token.\n";
+ exit(1);
+}
+
+if (empty($token_secret)) {
+ print "Please specify a request token secret.\n";
+ exit(1);
+}
+
+$rt = new OAuthToken($token, $token_secret);
+common_debug("Exchange request token = " . var_export($rt, true));
+
+$parsed = parse_url($at_endpoint);
+$params = array();
+parse_str($parsed['query'], $params);
+
+$hmac_method = new OAuthSignatureMethod_HMAC_SHA1();
+
+$req_req = OAuthRequest::from_consumer_and_token($test_consumer, $rt, "GET", $at_endpoint, $params);
+$req_req->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 000000000..fc546a0f4
--- /dev/null
+++ b/tests/oauth/getrequesttoken.php
@@ -0,0 +1,71 @@
+#!/usr/bin/env php
+<?php
+/*
+ * StatusNet - a distributed open-source microblogging tool
+ * Copyright (C) 2008, 2009, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/../..'));
+
+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 000000000..16b747fe4
--- /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 000000000..873bdb8bd
--- /dev/null
+++ b/tests/oauth/verifycreds.php
@@ -0,0 +1,101 @@
+#!/usr/bin/env php
+<?php
+/*
+ * StatusNet - a distributed open-source microblogging tool
+ * Copyright (C) 2008, 2009, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/../..'));
+
+require_once INSTALLDIR . '/extlib/OAuth.php';
+
+$shortoptions = 'o:s:';
+$longoptions = array('oauth_token=', 'token_secret=');
+
+$helptext = <<<END_OF_VERIFY_HELP
+ verifycreds.php [options]
+ Use an access token to verify credentials thru the api
+
+ -o --oauth_token access token
+ -s --token_secret access token secret
+
+END_OF_VERIFY_HELP;
+
+$token = null;
+$token_secret = null;
+
+require_once INSTALLDIR . '/scripts/commandline.inc';
+
+if (have_option('o', 'oauth_token')) {
+ $token = get_option_value('oauth_token');
+}
+
+if (have_option('s', 'token_secret')) {
+ $token_secret = get_option_value('s', 'token_secret');
+}
+
+if (empty($token)) {
+ print "Please specify an access token.\n";
+ exit(1);
+}
+
+if (empty($token_secret)) {
+ print "Please specify an access token secret.\n";
+ exit(1);
+}
+
+$ini = parse_ini_file("oauth.ini");
+
+$test_consumer = new OAuthConsumer($ini['consumer_key'], $ini['consumer_secret']);
+
+$endpoint = $ini['apiroot'] . '/account/verify_credentials.xml';
+
+print "$endpoint\n";
+
+$at = new OAuthToken($token, $token_secret);
+
+$parsed = parse_url($endpoint);
+$params = array();
+parse_str($parsed['query'], $params);
+
+$hmac_method = new OAuthSignatureMethod_HMAC_SHA1();
+
+$req_req = OAuthRequest::from_consumer_and_token($test_consumer, $at, "GET", $endpoint, $params);
+$req_req->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 cdacb9a62..fbf3b6a5b 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/images/icons/icons-01.gif b/theme/base/images/icons/icons-01.gif
index 06202a047..f93d33d79 100644
--- a/theme/base/images/icons/icons-01.gif
+++ b/theme/base/images/icons/icons-01.gif
Binary files 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 000000000..ccf357ab2
--- /dev/null
+++ b/theme/base/images/icons/twotone/green/key.gif
Binary files differ
diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index 2360976e5..3aebb239d 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 91af1d8ec..2818196c2 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);
}