summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--EVENTS.txt6
-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/confirmaddress.php2
-rw-r--r--actions/designadminpanel.php2
-rw-r--r--actions/editapplication.php264
-rw-r--r--actions/emailsettings.php2
-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/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/statusnet.sql30
-rw-r--r--js/farbtastic/farbtastic.css (renamed from theme/base/css/farbtastic.css)6
-rw-r--r--js/geometa.js133
-rw-r--r--js/util.js30
-rw-r--r--lib/action.php10
-rw-r--r--lib/api.php5
-rw-r--r--lib/apiauth.php128
-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/connectsettingsaction.php6
-rw-r--r--lib/default.php4
-rw-r--r--lib/designsettings.php2
-rw-r--r--lib/router.php25
-rw-r--r--lib/statusnet.php2
-rw-r--r--locale/ar/LC_MESSAGES/statusnet.po715
-rw-r--r--locale/arz/LC_MESSAGES/statusnet.po711
-rw-r--r--locale/bg/LC_MESSAGES/statusnet.po540
-rw-r--r--locale/ca/LC_MESSAGES/statusnet.po543
-rw-r--r--locale/cs/LC_MESSAGES/statusnet.po534
-rw-r--r--locale/de/LC_MESSAGES/statusnet.po541
-rw-r--r--locale/el/LC_MESSAGES/statusnet.po523
-rw-r--r--locale/en_GB/LC_MESSAGES/statusnet.po540
-rw-r--r--locale/es/LC_MESSAGES/statusnet.po540
-rw-r--r--locale/fa/LC_MESSAGES/statusnet.po534
-rw-r--r--locale/fi/LC_MESSAGES/statusnet.po546
-rw-r--r--locale/fr/LC_MESSAGES/statusnet.po560
-rw-r--r--locale/ga/LC_MESSAGES/statusnet.po546
-rw-r--r--locale/he/LC_MESSAGES/statusnet.po533
-rw-r--r--locale/hsb/LC_MESSAGES/statusnet.po577
-rw-r--r--locale/ia/LC_MESSAGES/statusnet.po533
-rw-r--r--locale/is/LC_MESSAGES/statusnet.po539
-rw-r--r--locale/it/LC_MESSAGES/statusnet.po542
-rw-r--r--locale/ja/LC_MESSAGES/statusnet.po534
-rw-r--r--locale/ko/LC_MESSAGES/statusnet.po539
-rw-r--r--locale/mk/LC_MESSAGES/statusnet.po537
-rw-r--r--locale/nb/LC_MESSAGES/statusnet.po531
-rw-r--r--locale/nl/LC_MESSAGES/statusnet.po548
-rw-r--r--locale/nn/LC_MESSAGES/statusnet.po539
-rw-r--r--locale/pl/LC_MESSAGES/statusnet.po525
-rw-r--r--locale/pt/LC_MESSAGES/statusnet.po540
-rw-r--r--locale/pt_BR/LC_MESSAGES/statusnet.po774
-rw-r--r--locale/ru/LC_MESSAGES/statusnet.po543
-rw-r--r--locale/statusnet.po506
-rw-r--r--locale/sv/LC_MESSAGES/statusnet.po918
-rw-r--r--locale/te/LC_MESSAGES/statusnet.po596
-rw-r--r--locale/tr/LC_MESSAGES/statusnet.po535
-rw-r--r--locale/uk/LC_MESSAGES/statusnet.po529
-rw-r--r--locale/vi/LC_MESSAGES/statusnet.po538
-rw-r--r--locale/zh_CN/LC_MESSAGES/statusnet.po542
-rw-r--r--locale/zh_TW/LC_MESSAGES/statusnet.po528
-rw-r--r--plugins/LdapAuthentication/LdapAuthenticationPlugin.php16
-rw-r--r--plugins/MobileProfile/MobileProfilePlugin.php2
-rw-r--r--plugins/MobileProfile/mp-screen.css46
-rw-r--r--plugins/README-plugins21
-rw-r--r--plugins/Recaptcha/RecaptchaPlugin.php14
-rwxr-xr-xscripts/useremail.php25
-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.css88
-rw-r--r--theme/base/css/mobile.css150
-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.css8
-rw-r--r--theme/identica/css/display.css8
94 files changed, 20037 insertions, 4402 deletions
diff --git a/EVENTS.txt b/EVENTS.txt
index 6e6afa070..1ed670697 100644
--- a/EVENTS.txt
+++ b/EVENTS.txt
@@ -150,6 +150,12 @@ StartAddressData: Allows the site owner to provide additional information about
EndAddressData: At the end of <address>
- $action: the current action
+StartShowSiteNotice: Before showing site notice
+- $action: the current action
+
+EndShowSiteNotice: After showing site notice
+- $action: the current action
+
StartLoginGroupNav: Before showing the login and register navigation menu
- $action: the current action
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/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/designadminpanel.php b/actions/designadminpanel.php
index f862aff0e..72ad6ade2 100644
--- a/actions/designadminpanel.php
+++ b/actions/designadminpanel.php
@@ -289,7 +289,7 @@ class DesignadminpanelAction extends AdminPanelAction
function showStylesheets()
{
parent::showStylesheets();
- $this->cssLink('css/farbtastic.css','base','screen, projection, tv');
+ $this->cssLink('js/farbtastic/farbtastic.css',null,'screen, projection, tv');
}
/**
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/emailsettings.php b/actions/emailsettings.php
index bfef2970d..08608348c 100644
--- a/actions/emailsettings.php
+++ b/actions/emailsettings.php
@@ -130,7 +130,7 @@ class EmailsettingsAction extends AccountSettingsAction
if (common_config('emailpost', 'enabled') && $user->email) {
$this->elementStart('fieldset', array('id' => 'settings_email_incoming'));
- $this->element('legend',_('Incoming email'));
+ $this->element('legend', null, _('Incoming email'));
if ($user->incomingemail) {
$this->elementStart('p');
$this->element('span', 'address', $user->incomingemail);
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/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/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/theme/base/css/farbtastic.css b/js/farbtastic/farbtastic.css
index 7efcc73c3..a88e7b868 100644
--- a/theme/base/css/farbtastic.css
+++ b/js/farbtastic/farbtastic.css
@@ -16,17 +16,17 @@
height: 101px;
}
.farbtastic .wheel {
- background: url(../../../js/farbtastic/wheel.png) no-repeat;
+ background: url(wheel.png) no-repeat;
width: 195px;
height: 195px;
}
.farbtastic .overlay {
- background: url(../../../js/farbtastic/mask.png) no-repeat;
+ background: url(mask.png) no-repeat;
}
.farbtastic .marker {
width: 17px;
height: 17px;
margin: -8px 0 0 -8px;
overflow: hidden;
- background: url(../../../js/farbtastic/marker.png) no-repeat;
+ background: url(marker.png) no-repeat;
}
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 88016bd6d..aeec8d89d 100644
--- a/js/util.js
+++ b/js/util.js
@@ -509,7 +509,7 @@ var SN = { // StatusNet
}
if (typeof(location.name) == 'undefined') {
- NLN_text = position.coords.latitude + ';' + position.coords.longitude;
+ NLN_text = data.lat + ';' + data.lon;
}
else {
NLN_text = location.name;
@@ -525,13 +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
+ 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));
});
@@ -566,9 +566,9 @@ 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);
@@ -593,9 +593,9 @@ var SN = { // StatusNet
else {
if (NLat.length > 0 && NLon.length > 0) {
var data = {
- 'lat': NLat,
- 'lon': NLon,
- 'token': $('#token').val()
+ lat: NLat,
+ lon: NLon,
+ token: $('#token').val()
};
getJSONgeocodeURL(geocodeURL, data);
@@ -624,8 +624,6 @@ var SN = { // StatusNet
else {
removeNoticeDataGeo();
}
-
- $('#'+SN.C.S.NoticeDataText).focus();
}).change();
}
},
diff --git a/lib/action.php b/lib/action.php
index 171bea17c..e24277558 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -199,10 +199,6 @@ class Action extends HTMLOutputter // lawsuit
if (Event::handle('StartShowStatusNetStyles', array($this)) &&
Event::handle('StartShowLaconicaStyles', array($this))) {
$this->cssLink('css/display.css',null,'screen, projection, tv');
- if (common_config('site', 'mobile')) {
- // TODO: "handheld" CSS for other mobile devices
- $this->cssLink('css/mobile.css','base','only screen and (max-device-width: 480px)'); // Mobile WebKit
- }
$this->cssLink('css/print.css','base','print');
Event::handle('EndShowStatusNetStyles', array($this));
Event::handle('EndShowLaconicaStyles', array($this));
@@ -373,7 +369,11 @@ class Action extends HTMLOutputter // lawsuit
$this->elementStart('div', array('id' => 'header'));
$this->showLogo();
$this->showPrimaryNav();
- $this->showSiteNotice();
+ if (Event::handle('StartShowSiteNotice', array($this))) {
+ $this->showSiteNotice();
+
+ Event::handle('EndShowSiteNotice', array($this));
+ }
if (common_logged_in()) {
$this->showNoticeForm();
} 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..927dcad6a 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,121 @@ 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();
+ }
+ } else {
+
+ // Check to see if a basic auth user is there even
+ // if one's not required
+
+ $this->checkBasicAuthUser(false);
}
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;
+
+ if (Event::handle('StartSetApiUser', array(&$user))) {
+ $this->auth_user = User::staticGet('id', $appUser->profile_id);
+ Event::handle('EndSetApiUser', array($user));
+ }
+
+ $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?
*
@@ -91,13 +204,13 @@ class ApiAuthAction extends ApiAction
* @return boolean true or false
*/
- function checkBasicAuthUser()
+ function checkBasicAuthUser($required = true)
{
$this->basicAuthProcessHeader();
$realm = common_config('site', 'name') . ' API';
- if (!isset($this->auth_user)) {
+ if (!isset($this->auth_user) && $required) {
header('WWW-Authenticate: Basic realm="' . $realm . '"');
// show error if the user clicks 'cancel'
@@ -105,12 +218,16 @@ class ApiAuthAction extends ApiAction
$this->showBasicAuthError();
exit;
- } else {
+ } else if (isset($this->auth_user)) {
$nickname = $this->auth_user;
$password = $this->auth_pw;
$user = common_check_user($nickname, $password);
if (Event::handle('StartSetApiUser', array(&$user))) {
$this->auth_user = $user;
+
+ // By default, all basic auth users have read and write access
+ $this->access = self::READ_WRITE;
+
Event::handle('EndSetApiUser', array($user));
}
@@ -128,6 +245,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/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/default.php b/lib/default.php
index 5b2ae6c7c..ceae0efaa 100644
--- a/lib/default.php
+++ b/lib/default.php
@@ -206,6 +206,8 @@ $default =
'uploads' => true,
'filecommand' => '/usr/bin/file',
),
+ 'application' =>
+ array('desclimit' => null),
'group' =>
array('maxaliases' => 3,
'desclimit' => null),
@@ -249,6 +251,8 @@ $default =
'Mapstraction' => null,
'Linkback' => null,
'WikiHashtags' => null,
+ 'PubSubHubBub' => null,
+ 'RSSCloud' => null,
'OpenID' => null),
),
'admin' =>
diff --git a/lib/designsettings.php b/lib/designsettings.php
index b70ba0dfc..8e44c03a9 100644
--- a/lib/designsettings.php
+++ b/lib/designsettings.php
@@ -314,7 +314,7 @@ class DesignSettingsAction extends AccountSettingsAction
function showStylesheets()
{
parent::showStylesheets();
- $this->cssLink('css/farbtastic.css','base','screen, projection, tv');
+ $this->cssLink('js/farbtastic/farbtastic.css',null,'screen, projection, tv');
}
/**
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/statusnet.php b/lib/statusnet.php
index 29e903026..beeb26ccc 100644
--- a/lib/statusnet.php
+++ b/lib/statusnet.php
@@ -63,7 +63,7 @@ class StatusNet
}
}
if (!class_exists($pluginclass)) {
- throw new ServerException(500, "Plugin $name not found.");
+ throw new ServerException("Plugin $name not found.", 500);
}
}
diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po
index 4e63e3e33..28e85d92f 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-13 22:04+0000\n"
-"PO-Revision-Date: 2010-01-13 22:04:40+0000\n"
+"POT-Creation-Date: 2010-01-18 23:16+0000\n"
+"PO-Revision-Date: 2010-01-19 23:52:48+0000\n"
"Language-Team: Arabic\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r61027); Translate extension (2010-01-04)\n"
+"X-Generator: MediaWiki 1.16alpha (r61275); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ar\n"
"X-Message-Group: out-statusnet\n"
@@ -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
@@ -52,8 +52,13 @@ msgstr "لا صفحة كهذه"
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 ""
@@ -380,18 +385,18 @@ msgid "You have been blocked from that group by the admin."
msgstr ""
#: actions/apigroupjoin.php:138 actions/joingroup.php:124
-#, fuzzy, php-format
+#, 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:119
-#, fuzzy, php-format
+#, 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 ""
@@ -435,19 +531,19 @@ msgstr "حُذِفت الحالة."
#: actions/apistatusesshow.php:144
msgid "No status with that ID found."
-msgstr ""
+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 ""
@@ -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\""
@@ -1147,7 +1289,7 @@ msgstr "أزيل هذا العنوان."
#: actions/emailsettings.php:446 actions/smssettings.php:518
msgid "No incoming email address."
-msgstr ""
+msgstr "لا عنوان بريد إلكتروني وارد."
#: actions/emailsettings.php:456 actions/emailsettings.php:478
#: actions/smssettings.php:528 actions/smssettings.php:552
@@ -1253,7 +1395,7 @@ msgstr "المستخدم الذي تستمع إليه غير موجود."
#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
msgid "You can use the local subscription!"
-msgstr ""
+msgstr "تستطيع استخدام الاشتراك المحلي!"
#: actions/finishremotesubscribe.php:99
msgid "That user has blocked you from subscribing."
@@ -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 "عنوان المراسلة الفورية"
@@ -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:237
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236
msgid "Send"
msgstr "أرسل"
@@ -1702,9 +1841,9 @@ msgid "You must be logged in to join a group."
msgstr ""
#: actions/joingroup.php:131
-#, fuzzy, php-format
+#, 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."
@@ -1715,9 +1854,9 @@ msgid "You are not a member of that group."
msgstr "لست عضوا في تلك المجموعة."
#: actions/leavegroup.php:127
-#, fuzzy, php-format
+#, 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."
@@ -1740,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 "تذكّرني"
@@ -1786,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 "مجموعة جديدة"
@@ -1834,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"
@@ -1862,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
@@ -1903,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 ""
@@ -1920,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 "ليس نسق بيانات مدعوم."
@@ -1934,7 +2124,7 @@ msgid "Notice Search"
msgstr "بحث الإشعارات"
#: actions/othersettings.php:60
-msgid "Other Settings"
+msgid "Other settings"
msgstr "إعدادات أخرى"
#: actions/othersettings.php:71
@@ -1966,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
@@ -2186,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"
@@ -2252,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 "الصفحة الرئيسية"
@@ -2735,7 +2919,7 @@ msgstr ""
#: actions/repeat.php:57
msgid "Only logged-in users can repeat notices."
-msgstr ""
+msgstr "يستطيع المستخدمون الوالجون وحدهم تكرار الإشعارات."
#: actions/repeat.php:64 actions/repeat.php:71
msgid "No notice specified."
@@ -2812,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 ""
@@ -2921,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 "أنشئ"
@@ -3061,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."
@@ -3247,7 +3500,6 @@ msgid "Save site settings"
msgstr "اذف إعدادت الموقع"
#: actions/smssettings.php:58
-#, fuzzy
msgid "SMS settings"
msgstr "إعدادات الرسائل القصيرة"
@@ -3277,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"
@@ -3362,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."
@@ -3399,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."
@@ -3733,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
@@ -3745,9 +3996,8 @@ msgid ""
msgstr ""
#: actions/version.php:157
-#, fuzzy
msgid "StatusNet"
-msgstr "حُذِفت الحالة."
+msgstr "ستاتس نت"
#: actions/version.php:161
msgid "Contributors"
@@ -3778,26 +4028,15 @@ 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 "الوصف"
+msgstr "المؤلف(ون)"
#: classes/File.php:144
#, php-format
@@ -3817,19 +4056,16 @@ 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 "ملف المجموعة الشخصي"
+msgstr "الانضمام للمجموعة فشل."
#: classes/Group_member.php:53
-#, fuzzy
msgid "Not part of group."
-msgstr "تعذر تحديث المجموعة."
+msgstr "ليس جزءا من المجموعة."
#: classes/Group_member.php:60
-#, fuzzy
msgid "Group leave failed."
-msgstr "ملف المجموعة الشخصي"
+msgstr "ترك المجموعة فشل."
#: classes/Login_token.php:76
#, php-format
@@ -3880,12 +4116,12 @@ msgstr ""
msgid "Problem saving notice."
msgstr "مشكلة أثناء حفظ الإشعار."
-#: classes/Notice.php:1052
+#: classes/Notice.php:1059
#, php-format
msgid "DB error inserting reply: %s"
msgstr ""
-#: classes/Notice.php:1423
+#: classes/Notice.php:1441
#, php-format
msgid "RT @%1$s %2$s"
msgstr "آر تي @%1$s %2$s"
@@ -3932,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"
@@ -3953,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 ""
@@ -4059,7 +4291,7 @@ msgstr ""
#: lib/action.php:773
msgid "StatusNet software license"
-msgstr ""
+msgstr "رخصة برنامج StatusNet"
#: lib/action.php:776
#, php-format
@@ -4110,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."
@@ -4147,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 "مرفقات"
@@ -4167,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"
@@ -4194,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
@@ -4219,9 +4505,8 @@ msgstr ""
"الإشعارات: %3$s"
#: lib/command.php:152 lib/command.php:390 lib/command.php:451
-#, fuzzy
msgid "Notice with that id does not exist"
-msgstr "لا ملف بهذه الهوية."
+msgstr "الملاحظة بهذا الرقم غير موجودة"
#: lib/command.php:168 lib/command.php:406 lib/command.php:467
#: lib/command.php:523
@@ -4233,14 +4518,13 @@ 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:231
-#, fuzzy, php-format
+#, php-format
msgid "Could not join user %s to group %s"
-msgstr "تعذّر إنشاء المجموعة."
+msgstr "لم يمكن ضم المستخدم %s إلى المجموعة %s"
#: lib/command.php:236
#, php-format
@@ -4248,14 +4532,14 @@ msgid "%s joined group %s"
msgstr "%s انضم إلى مجموعة %s"
#: lib/command.php:275
-#, fuzzy, php-format
+#, php-format
msgid "Could not remove user %s to group %s"
-msgstr "تعذّر إنشاء المجموعة."
+msgstr "لم يمكن إزالة المستخدم %s من المجموعة %s"
#: lib/command.php:280
-#, fuzzy, php-format
+#, php-format
msgid "%s left group %s"
-msgstr "%s انضم إلى مجموعة %s"
+msgstr "%s ترك المجموعة %s"
#: lib/command.php:309
#, php-format
@@ -4283,18 +4567,17 @@ msgid "Message too long - maximum is %d characters, you sent %d"
msgstr ""
#: lib/command.php:367
-#, fuzzy, php-format
+#, php-format
msgid "Direct message to %s sent"
-msgstr "رسالة مباشرة %s"
+msgstr "رسالة مباشرة إلى %s تم إرسالها"
#: lib/command.php:369
msgid "Error sending direct message."
msgstr ""
#: lib/command.php:413
-#, fuzzy
msgid "Cannot repeat your own notice"
-msgstr "لا يمكنك تكرار ملحوظتك الخاصة."
+msgstr "لا يمكنك تكرار ملاحظتك الخاصة"
#: lib/command.php:418
msgid "Already repeated that notice"
@@ -4481,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 "خطأ قاعدة بيانات"
@@ -4669,9 +4960,9 @@ msgid "[%s]"
msgstr "[%s]"
#: lib/jabber.php:385
-#, fuzzy, php-format
+#, php-format
msgid "Unknown inbox source %d."
-msgstr "لغة غير معروفة \"%s\""
+msgstr "مصدر صندوق وارد غير معروف %d."
#: lib/joinform.php:114
msgid "Join"
@@ -4731,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
@@ -4884,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."
@@ -4927,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
@@ -4971,20 +5261,14 @@ msgid "Attach a file"
msgstr "أرفق ملفًا"
#: lib/noticeform.php:212
-#, fuzzy
msgid "Share my location"
-msgstr "لم يمكن حفظ تفضيلات الموقع."
+msgstr "شارك موقعي"
#: lib/noticeform.php:215
-#, fuzzy
msgid "Do not share my location"
-msgstr "لم يمكن حفظ تفضيلات الموقع."
+msgstr "لا تشارك موقعي"
#: lib/noticeform.php:216
-msgid "Hide this info"
-msgstr ""
-
-#: lib/noticeform.php:217
msgid ""
"Sorry, retrieving your geo location is taking longer than expected, please "
"try again later"
@@ -5105,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"
@@ -5338,47 +5621,47 @@ msgstr "رسالة"
msgid "Moderate"
msgstr ""
-#: lib/util.php:877
+#: lib/util.php:875
msgid "a few seconds ago"
msgstr "قبل لحظات قليلة"
-#: lib/util.php:879
+#: lib/util.php:877
msgid "about a minute ago"
msgstr "قبل دقيقة تقريبًا"
-#: lib/util.php:881
+#: lib/util.php:879
#, php-format
msgid "about %d minutes ago"
msgstr ""
-#: lib/util.php:883
+#: lib/util.php:881
msgid "about an hour ago"
msgstr "قبل ساعة تقريبًا"
-#: lib/util.php:885
+#: lib/util.php:883
#, php-format
msgid "about %d hours ago"
msgstr ""
-#: lib/util.php:887
+#: lib/util.php:885
msgid "about a day ago"
msgstr "قبل يوم تقريبا"
-#: lib/util.php:889
+#: lib/util.php:887
#, php-format
msgid "about %d days ago"
msgstr ""
-#: lib/util.php:891
+#: lib/util.php:889
msgid "about a month ago"
msgstr "قبل شهر تقريبًا"
-#: lib/util.php:893
+#: lib/util.php:891
#, php-format
msgid "about %d months ago"
msgstr ""
-#: lib/util.php:895
+#: 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 fbdc01063..b5f740c4f 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-13 22:04+0000\n"
-"PO-Revision-Date: 2010-01-13 22:04:44+0000\n"
+"POT-Creation-Date: 2010-01-15 19:15+0000\n"
+"PO-Revision-Date: 2010-01-19 23:52:52+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 (r61027); Translate extension (2010-01-04)\n"
+"X-Generator: MediaWiki 1.16alpha (r61275); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: arz\n"
"X-Message-Group: out-statusnet\n"
@@ -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
@@ -51,8 +52,13 @@ msgstr "لا صفحه كهذه"
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 ""
@@ -379,18 +385,18 @@ msgid "You have been blocked from that group by the admin."
msgstr ""
#: actions/apigroupjoin.php:138 actions/joingroup.php:124
-#, fuzzy, php-format
+#, 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:119
-#, fuzzy, php-format
+#, 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 ""
@@ -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 "عنوان المراسله الفورية"
@@ -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:237
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236
msgid "Send"
msgstr "أرسل"
@@ -1701,9 +1841,9 @@ msgid "You must be logged in to join a group."
msgstr ""
#: actions/joingroup.php:131
-#, fuzzy, php-format
+#, 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."
@@ -1714,9 +1854,9 @@ msgid "You are not a member of that group."
msgstr "لست عضوا فى تلك المجموعه."
#: actions/leavegroup.php:127
-#, fuzzy, php-format
+#, 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."
@@ -1739,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 "تذكّرني"
@@ -1785,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 "مجموعه جديدة"
@@ -1833,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"
@@ -1861,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
@@ -1902,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 ""
@@ -1919,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."
@@ -1965,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
@@ -2185,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"
@@ -2251,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 "الصفحه الرئيسية"
@@ -2811,6 +2996,80 @@ msgstr ""
msgid "User is already sandboxed."
msgstr ""
+#: actions/showapplication.php:82
+msgid "You must be logged in to view an application."
+msgstr "يجب أن تكون مسجل الدخول لرؤيه تطبيق."
+
+#: actions/showapplication.php:158
+msgid "Application profile"
+msgstr ""
+
+#: actions/showapplication.php:160 lib/applicationeditform.php:182
+msgid "Icon"
+msgstr ""
+
+#: actions/showapplication.php:170 actions/version.php:195
+#: lib/applicationeditform.php:197
+msgid "Name"
+msgstr "الاسم"
+
+#: actions/showapplication.php:179 lib/applicationeditform.php:224
+msgid "Organization"
+msgstr "المنظمة"
+
+#: actions/showapplication.php:188 actions/version.php:198
+#: lib/applicationeditform.php:211 lib/groupeditform.php:172
+msgid "Description"
+msgstr "الوصف"
+
+#: actions/showapplication.php:193 actions/showgroup.php:429
+#: lib/profileaction.php:174
+msgid "Statistics"
+msgstr "إحصاءات"
+
+#: actions/showapplication.php:204
+#, php-format
+msgid "created by %1$s - %2$s access by default - %3$d users"
+msgstr ""
+
+#: actions/showapplication.php:214
+msgid "Application actions"
+msgstr ""
+
+#: actions/showapplication.php:233
+msgid "Reset key & secret"
+msgstr ""
+
+#: actions/showapplication.php:241
+msgid "Application info"
+msgstr ""
+
+#: actions/showapplication.php:243
+msgid "Consumer key"
+msgstr ""
+
+#: actions/showapplication.php:248
+msgid "Consumer secret"
+msgstr ""
+
+#: actions/showapplication.php:253
+msgid "Request token URL"
+msgstr ""
+
+#: actions/showapplication.php:258
+msgid "Access token URL"
+msgstr ""
+
+#: actions/showapplication.php:263
+msgid "Authorize URL"
+msgstr "اسمح بالمسار"
+
+#: actions/showapplication.php:268
+msgid ""
+"Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
+"signature method."
+msgstr ""
+
#: actions/showfavorites.php:132
msgid "Could not retrieve favorite notices."
msgstr ""
@@ -2920,10 +3179,6 @@ msgstr "(لا شيء)"
msgid "All members"
msgstr "جميع الأعضاء"
-#: actions/showgroup.php:429 lib/profileaction.php:174
-msgid "Statistics"
-msgstr "إحصاءات"
-
#: actions/showgroup.php:432
msgid "Created"
msgstr "أنشئ"
@@ -3060,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."
@@ -3246,7 +3500,6 @@ msgid "Save site settings"
msgstr "اذف إعدادت الموقع"
#: actions/smssettings.php:58
-#, fuzzy
msgid "SMS settings"
msgstr "إعدادات الرسائل القصيرة"
@@ -3276,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"
@@ -3361,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."
@@ -3398,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."
@@ -3732,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
@@ -3744,9 +3996,8 @@ msgid ""
msgstr ""
#: actions/version.php:157
-#, fuzzy
msgid "StatusNet"
-msgstr "حُذِفت الحاله."
+msgstr "ستاتس نت"
#: actions/version.php:161
msgid "Contributors"
@@ -3779,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
@@ -3816,19 +4056,16 @@ 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 "ملف المجموعه الشخصي"
+msgstr "الانضمام للمجموعه فشل."
#: classes/Group_member.php:53
-#, fuzzy
msgid "Not part of group."
-msgstr "تعذر تحديث المجموعه."
+msgstr "ليس جزءا من المجموعه."
#: classes/Group_member.php:60
-#, fuzzy
msgid "Group leave failed."
-msgstr "ملف المجموعه الشخصي"
+msgstr "ترك المجموعه فشل."
#: classes/Login_token.php:76
#, php-format
@@ -3879,12 +4116,12 @@ msgstr ""
msgid "Problem saving notice."
msgstr "مشكله أثناء حفظ الإشعار."
-#: classes/Notice.php:1052
+#: classes/Notice.php:1059
#, php-format
msgid "DB error inserting reply: %s"
msgstr ""
-#: classes/Notice.php:1423
+#: classes/Notice.php:1441
#, php-format
msgid "RT @%1$s %2$s"
msgstr "آر تى @%1$s %2$s"
@@ -3931,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"
@@ -3952,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 ""
@@ -4109,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."
@@ -4146,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 "مرفقات"
@@ -4166,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"
@@ -4193,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
@@ -4218,9 +4506,8 @@ msgstr ""
"الإشعارات: %3$s"
#: lib/command.php:152 lib/command.php:390 lib/command.php:451
-#, fuzzy
msgid "Notice with that id does not exist"
-msgstr "لا ملف بهذه الهويه."
+msgstr "الملاحظه بهذا الرقم غير موجودة"
#: lib/command.php:168 lib/command.php:406 lib/command.php:467
#: lib/command.php:523
@@ -4232,14 +4519,13 @@ 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:231
-#, fuzzy, php-format
+#, php-format
msgid "Could not join user %s to group %s"
-msgstr "تعذّر إنشاء المجموعه."
+msgstr "لم يمكن ضم المستخدم %s إلى المجموعه %s"
#: lib/command.php:236
#, php-format
@@ -4247,14 +4533,14 @@ msgid "%s joined group %s"
msgstr "%s انضم إلى مجموعه %s"
#: lib/command.php:275
-#, fuzzy, php-format
+#, php-format
msgid "Could not remove user %s to group %s"
-msgstr "تعذّر إنشاء المجموعه."
+msgstr "لم يمكن إزاله المستخدم %s من المجموعه %s"
#: lib/command.php:280
-#, fuzzy, php-format
+#, php-format
msgid "%s left group %s"
-msgstr "%s انضم إلى مجموعه %s"
+msgstr "%s ترك المجموعه %s"
#: lib/command.php:309
#, php-format
@@ -4282,18 +4568,17 @@ msgid "Message too long - maximum is %d characters, you sent %d"
msgstr ""
#: lib/command.php:367
-#, fuzzy, php-format
+#, php-format
msgid "Direct message to %s sent"
-msgstr "رساله مباشره %s"
+msgstr "رساله مباشره إلى %s تم إرسالها"
#: lib/command.php:369
msgid "Error sending direct message."
msgstr ""
#: lib/command.php:413
-#, fuzzy
msgid "Cannot repeat your own notice"
-msgstr "لا يمكنك تكرار ملحوظتك الخاصه."
+msgstr "لا يمكنك تكرار ملاحظتك الخاصة"
#: lib/command.php:418
msgid "Already repeated that notice"
@@ -4480,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 "خطأ قاعده بيانات"
@@ -4668,9 +4961,9 @@ msgid "[%s]"
msgstr "[%s]"
#: lib/jabber.php:385
-#, fuzzy, php-format
+#, php-format
msgid "Unknown inbox source %d."
-msgstr "لغه غير معروفه \"%s\""
+msgstr "مصدر صندوق وارد غير معروف %d."
#: lib/joinform.php:114
msgid "Join"
@@ -4730,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
@@ -4883,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."
@@ -4926,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
@@ -4970,20 +5262,14 @@ msgid "Attach a file"
msgstr "أرفق ملفًا"
#: lib/noticeform.php:212
-#, fuzzy
msgid "Share my location"
-msgstr "لم يمكن حفظ تفضيلات الموقع."
+msgstr "شارك موقعى"
#: lib/noticeform.php:215
-#, fuzzy
msgid "Do not share my location"
-msgstr "لم يمكن حفظ تفضيلات الموقع."
+msgstr "لا تشارك موقعي"
#: lib/noticeform.php:216
-msgid "Hide this info"
-msgstr ""
-
-#: lib/noticeform.php:217
msgid ""
"Sorry, retrieving your geo location is taking longer than expected, please "
"try again later"
@@ -5104,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"
@@ -5337,47 +5622,47 @@ msgstr "رسالة"
msgid "Moderate"
msgstr ""
-#: lib/util.php:877
+#: lib/util.php:875
msgid "a few seconds ago"
msgstr "قبل لحظات قليلة"
-#: lib/util.php:879
+#: lib/util.php:877
msgid "about a minute ago"
msgstr "قبل دقيقه تقريبًا"
-#: lib/util.php:881
+#: lib/util.php:879
#, php-format
msgid "about %d minutes ago"
msgstr ""
-#: lib/util.php:883
+#: lib/util.php:881
msgid "about an hour ago"
msgstr "قبل ساعه تقريبًا"
-#: lib/util.php:885
+#: lib/util.php:883
#, php-format
msgid "about %d hours ago"
msgstr ""
-#: lib/util.php:887
+#: lib/util.php:885
msgid "about a day ago"
msgstr "قبل يوم تقريبا"
-#: lib/util.php:889
+#: lib/util.php:887
#, php-format
msgid "about %d days ago"
msgstr ""
-#: lib/util.php:891
+#: lib/util.php:889
msgid "about a month ago"
msgstr "قبل شهر تقريبًا"
-#: lib/util.php:893
+#: lib/util.php:891
#, php-format
msgid "about %d months ago"
msgstr ""
-#: lib/util.php:895
+#: 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 7fe8ac423..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-13 22:04+0000\n"
-"PO-Revision-Date: 2010-01-13 22:04:47+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 (r61027); 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
@@ -51,8 +51,13 @@ msgstr "Няма такака страница."
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 символа)."
@@ -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 "Изберете квадратна област от изображението за аватар"
@@ -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 "Отказ"
@@ -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:237
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236
msgid "Send"
msgstr "Прати"
@@ -1820,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 "Запомни ме"
@@ -1883,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 "Нова група"
@@ -1991,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 "Бележката няма профил"
@@ -2008,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 "Неподдържан формат на данните"
@@ -2022,7 +2242,8 @@ msgid "Notice Search"
msgstr "Търсене на бележки"
#: actions/othersettings.php:60
-msgid "Other Settings"
+#, fuzzy
+msgid "Other settings"
msgstr "Други настройки"
#: actions/othersettings.php:71
@@ -2344,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 "Лична страница"
@@ -2932,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 "Грешка при изтегляне на любимите бележки"
@@ -3037,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 "Създадена на"
@@ -3929,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"
@@ -3944,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 ""
@@ -4111,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 "Промяна на поща, аватар, парола, профил"
@@ -4272,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 "Не можете да променяте този сайт."
@@ -4312,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 ""
@@ -4332,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 "Паролата е записана."
@@ -4635,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 "Грешка в базата от данни"
@@ -5152,10 +5506,6 @@ msgid "Do not share my location"
msgstr "Грешка при запазване етикетите."
#: lib/noticeform.php:216
-msgid "Hide this info"
-msgstr ""
-
-#: lib/noticeform.php:217
msgid ""
"Sorry, retrieving your geo location is taking longer than expected, please "
"try again later"
@@ -5521,47 +5871,47 @@ msgstr "Съобщение"
msgid "Moderate"
msgstr ""
-#: lib/util.php:877
+#: lib/util.php:875
msgid "a few seconds ago"
msgstr "преди няколко секунди"
-#: lib/util.php:879
+#: lib/util.php:877
msgid "about a minute ago"
msgstr "преди около минута"
-#: lib/util.php:881
+#: lib/util.php:879
#, php-format
msgid "about %d minutes ago"
msgstr "преди около %d минути"
-#: lib/util.php:883
+#: lib/util.php:881
msgid "about an hour ago"
msgstr "преди около час"
-#: lib/util.php:885
+#: lib/util.php:883
#, php-format
msgid "about %d hours ago"
msgstr "преди около %d часа"
-#: lib/util.php:887
+#: lib/util.php:885
msgid "about a day ago"
msgstr "преди около ден"
-#: lib/util.php:889
+#: lib/util.php:887
#, php-format
msgid "about %d days ago"
msgstr "преди около %d дни"
-#: lib/util.php:891
+#: lib/util.php:889
msgid "about a month ago"
msgstr "преди около месец"
-#: lib/util.php:893
+#: lib/util.php:891
#, php-format
msgid "about %d months ago"
msgstr "преди около %d месеца"
-#: lib/util.php:895
+#: 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 8ad8d18ec..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-13 22:04+0000\n"
-"PO-Revision-Date: 2010-01-13 22:04:50+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 (r61027); 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
@@ -51,8 +51,13 @@ msgstr "No existeix la pàgina."
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)."
@@ -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 ""
@@ -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 ""
@@ -769,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
@@ -956,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"
@@ -977,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"
@@ -1047,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"
@@ -1723,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:237
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236
msgid "Send"
msgstr "Envia"
@@ -1833,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"
@@ -1899,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"
@@ -2008,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"
@@ -2025,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."
@@ -2039,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
@@ -2366,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"
@@ -2973,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."
@@ -3078,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"
@@ -3984,10 +4280,6 @@ msgstr ""
msgid "Plugins"
msgstr "Connectors"
-#: actions/version.php:195
-msgid "Name"
-msgstr "Nom"
-
#: actions/version.php:196 lib/action.php:741
#, fuzzy
msgid "Version"
@@ -3998,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 ""
@@ -4163,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"
@@ -4321,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."
@@ -4361,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"
@@ -4381,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."
@@ -4683,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"
@@ -5203,10 +5558,6 @@ msgid "Do not share my location"
msgstr "Comparteix la vostra ubicació"
#: lib/noticeform.php:216
-msgid "Hide this info"
-msgstr ""
-
-#: lib/noticeform.php:217
msgid ""
"Sorry, retrieving your geo location is taking longer than expected, please "
"try again later"
@@ -5570,47 +5921,47 @@ msgstr "Missatge"
msgid "Moderate"
msgstr "Modera"
-#: lib/util.php:877
+#: lib/util.php:875
msgid "a few seconds ago"
msgstr "fa pocs segons"
-#: lib/util.php:879
+#: lib/util.php:877
msgid "about a minute ago"
msgstr "fa un minut"
-#: lib/util.php:881
+#: lib/util.php:879
#, php-format
msgid "about %d minutes ago"
msgstr "fa %d minuts"
-#: lib/util.php:883
+#: lib/util.php:881
msgid "about an hour ago"
msgstr "fa una hora"
-#: lib/util.php:885
+#: lib/util.php:883
#, php-format
msgid "about %d hours ago"
msgstr "fa %d hores"
-#: lib/util.php:887
+#: lib/util.php:885
msgid "about a day ago"
msgstr "fa un dia"
-#: lib/util.php:889
+#: lib/util.php:887
#, php-format
msgid "about %d days ago"
msgstr "fa %d dies"
-#: lib/util.php:891
+#: lib/util.php:889
msgid "about a month ago"
msgstr "fa un mes"
-#: lib/util.php:893
+#: lib/util.php:891
#, php-format
msgid "about %d months ago"
msgstr "fa %d mesos"
-#: lib/util.php:895
+#: 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 6d4ee65b6..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-13 22:04+0000\n"
-"PO-Revision-Date: 2010-01-13 22:04:54+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 (r61027); 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
@@ -52,8 +52,13 @@ msgstr "Žádné takové oznámení."
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ů)"
@@ -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 ""
@@ -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"
@@ -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:237
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236
msgid "Send"
msgstr "Odeslat"
@@ -1814,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ě"
@@ -1876,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"
@@ -1983,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"
@@ -2001,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 ""
@@ -2016,7 +2230,7 @@ msgstr ""
#: actions/othersettings.php:60
#, fuzzy
-msgid "Other Settings"
+msgid "Other settings"
msgstr "Nastavení"
#: actions/othersettings.php:71
@@ -2350,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"
@@ -2929,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 ""
@@ -3036,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"
@@ -3939,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"
@@ -3953,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 ""
@@ -4118,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 ""
@@ -4285,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 ""
@@ -4324,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 ""
@@ -4344,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"
@@ -4654,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 ""
@@ -5174,10 +5518,6 @@ msgid "Do not share my location"
msgstr "Nelze uložit profil"
#: lib/noticeform.php:216
-msgid "Hide this info"
-msgstr ""
-
-#: lib/noticeform.php:217
msgid ""
"Sorry, retrieving your geo location is taking longer than expected, please "
"try again later"
@@ -5550,47 +5890,47 @@ msgstr "Zpráva"
msgid "Moderate"
msgstr ""
-#: lib/util.php:877
+#: lib/util.php:875
msgid "a few seconds ago"
msgstr "před pár sekundami"
-#: lib/util.php:879
+#: lib/util.php:877
msgid "about a minute ago"
msgstr "asi před minutou"
-#: lib/util.php:881
+#: lib/util.php:879
#, php-format
msgid "about %d minutes ago"
msgstr "asi před %d minutami"
-#: lib/util.php:883
+#: lib/util.php:881
msgid "about an hour ago"
msgstr "asi před hodinou"
-#: lib/util.php:885
+#: lib/util.php:883
#, php-format
msgid "about %d hours ago"
msgstr "asi před %d hodinami"
-#: lib/util.php:887
+#: lib/util.php:885
msgid "about a day ago"
msgstr "asi přede dnem"
-#: lib/util.php:889
+#: lib/util.php:887
#, php-format
msgid "about %d days ago"
msgstr "před %d dny"
-#: lib/util.php:891
+#: lib/util.php:889
msgid "about a month ago"
msgstr "asi před měsícem"
-#: lib/util.php:893
+#: lib/util.php:891
#, php-format
msgid "about %d months ago"
msgstr "asi před %d mesíci"
-#: lib/util.php:895
+#: 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 d8572b244..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-13 22:04+0000\n"
-"PO-Revision-Date: 2010-01-13 22:04:57+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 (r61027); 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
@@ -54,8 +54,13 @@ msgstr "Seite nicht vorhanden"
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)."
@@ -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 ""
@@ -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"
@@ -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:237
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236
msgid "Send"
msgstr "Senden"
@@ -1832,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"
@@ -1895,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"
@@ -2005,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"
@@ -2022,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."
@@ -2036,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
@@ -2363,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"
@@ -2971,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."
@@ -3076,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"
@@ -4001,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"
@@ -4016,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 ""
@@ -4182,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"
@@ -4343,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."
@@ -4384,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"
@@ -4404,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"
@@ -4703,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."
@@ -5280,10 +5635,6 @@ msgid "Do not share my location"
msgstr "Konnte Tags nicht speichern."
#: lib/noticeform.php:216
-msgid "Hide this info"
-msgstr ""
-
-#: lib/noticeform.php:217
msgid ""
"Sorry, retrieving your geo location is taking longer than expected, please "
"try again later"
@@ -5654,47 +6005,47 @@ msgstr "Nachricht"
msgid "Moderate"
msgstr ""
-#: lib/util.php:877
+#: lib/util.php:875
msgid "a few seconds ago"
msgstr "vor wenigen Sekunden"
-#: lib/util.php:879
+#: lib/util.php:877
msgid "about a minute ago"
msgstr "vor einer Minute"
-#: lib/util.php:881
+#: lib/util.php:879
#, php-format
msgid "about %d minutes ago"
msgstr "vor %d Minuten"
-#: lib/util.php:883
+#: lib/util.php:881
msgid "about an hour ago"
msgstr "vor einer Stunde"
-#: lib/util.php:885
+#: lib/util.php:883
#, php-format
msgid "about %d hours ago"
msgstr "vor %d Stunden"
-#: lib/util.php:887
+#: lib/util.php:885
msgid "about a day ago"
msgstr "vor einem Tag"
-#: lib/util.php:889
+#: lib/util.php:887
#, php-format
msgid "about %d days ago"
msgstr "vor %d Tagen"
-#: lib/util.php:891
+#: lib/util.php:889
msgid "about a month ago"
msgstr "vor einem Monat"
-#: lib/util.php:893
+#: lib/util.php:891
#, php-format
msgid "about %d months ago"
msgstr "vor %d Monaten"
-#: lib/util.php:895
+#: 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 2f9257945..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-13 22:04+0000\n"
-"PO-Revision-Date: 2010-01-13 22:05:00+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 (r61027); 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
@@ -51,8 +51,13 @@ msgstr "Δεν υπάρχει τέτοιο σελίδα."
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 χαρακτ.)."
@@ -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 ""
@@ -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 "Ακύρωση"
@@ -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:237
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236
msgid "Send"
msgstr ""
@@ -1779,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 ""
@@ -1843,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 ""
@@ -1947,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 ""
@@ -1965,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 ""
@@ -1980,7 +2191,7 @@ msgstr ""
#: actions/othersettings.php:60
#, fuzzy
-msgid "Other Settings"
+msgid "Other settings"
msgstr "Ρυθμίσεις OpenID"
#: actions/othersettings.php:71
@@ -2304,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 "Αρχική σελίδα"
@@ -2893,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 ""
@@ -2999,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 "Δημιουργημένος"
@@ -3874,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"
@@ -3888,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 ""
@@ -4047,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 ""
@@ -4203,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 ""
@@ -4242,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 ""
@@ -4262,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 "Ο κωδικός αποθηκεύτηκε."
@@ -4564,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 ""
@@ -5068,10 +5405,6 @@ msgid "Do not share my location"
msgstr "Αδύνατη η αποθήκευση του προφίλ."
#: lib/noticeform.php:216
-msgid "Hide this info"
-msgstr ""
-
-#: lib/noticeform.php:217
msgid ""
"Sorry, retrieving your geo location is taking longer than expected, please "
"try again later"
@@ -5434,47 +5767,47 @@ msgstr "Μήνυμα"
msgid "Moderate"
msgstr ""
-#: lib/util.php:877
+#: lib/util.php:875
msgid "a few seconds ago"
msgstr ""
-#: lib/util.php:879
+#: lib/util.php:877
msgid "about a minute ago"
msgstr ""
-#: lib/util.php:881
+#: lib/util.php:879
#, php-format
msgid "about %d minutes ago"
msgstr ""
-#: lib/util.php:883
+#: lib/util.php:881
msgid "about an hour ago"
msgstr ""
-#: lib/util.php:885
+#: lib/util.php:883
#, php-format
msgid "about %d hours ago"
msgstr ""
-#: lib/util.php:887
+#: lib/util.php:885
msgid "about a day ago"
msgstr ""
-#: lib/util.php:889
+#: lib/util.php:887
#, php-format
msgid "about %d days ago"
msgstr ""
-#: lib/util.php:891
+#: lib/util.php:889
msgid "about a month ago"
msgstr ""
-#: lib/util.php:893
+#: lib/util.php:891
#, php-format
msgid "about %d months ago"
msgstr ""
-#: lib/util.php:895
+#: 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 407007fbf..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-13 22:04+0000\n"
-"PO-Revision-Date: 2010-01-13 22:05:04+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 (r61027); 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
@@ -52,8 +52,13 @@ msgstr "No such page"
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)"
@@ -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"
@@ -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"
@@ -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:237
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236
msgid "Send"
msgstr "Send"
@@ -1838,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"
@@ -1901,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"
@@ -2009,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"
@@ -2027,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."
@@ -2041,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
@@ -2368,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"
@@ -2972,6 +3194,84 @@ msgstr "You cannot sandbox users on this site."
msgid "User is already sandboxed."
msgstr "User is already sandboxed."
+#: actions/showapplication.php:82
+#, fuzzy
+msgid "You must be logged in to view an application."
+msgstr "You must be logged in to leave a group."
+
+#: actions/showapplication.php:158
+#, fuzzy
+msgid "Application profile"
+msgstr "Notice has no profile"
+
+#: actions/showapplication.php:160 lib/applicationeditform.php:182
+msgid "Icon"
+msgstr ""
+
+#: actions/showapplication.php:170 actions/version.php:195
+#: lib/applicationeditform.php:197
+#, fuzzy
+msgid "Name"
+msgstr "Nickname"
+
+#: actions/showapplication.php:179 lib/applicationeditform.php:224
+#, fuzzy
+msgid "Organization"
+msgstr "Pagination"
+
+#: actions/showapplication.php:188 actions/version.php:198
+#: lib/applicationeditform.php:211 lib/groupeditform.php:172
+msgid "Description"
+msgstr "Description"
+
+#: actions/showapplication.php:193 actions/showgroup.php:429
+#: lib/profileaction.php:174
+msgid "Statistics"
+msgstr "Statistics"
+
+#: actions/showapplication.php:204
+#, php-format
+msgid "created by %1$s - %2$s access by default - %3$d users"
+msgstr ""
+
+#: actions/showapplication.php:214
+msgid "Application actions"
+msgstr ""
+
+#: actions/showapplication.php:233
+msgid "Reset key & secret"
+msgstr ""
+
+#: actions/showapplication.php:241
+msgid "Application info"
+msgstr ""
+
+#: actions/showapplication.php:243
+msgid "Consumer key"
+msgstr ""
+
+#: actions/showapplication.php:248
+msgid "Consumer secret"
+msgstr ""
+
+#: actions/showapplication.php:253
+msgid "Request token URL"
+msgstr ""
+
+#: actions/showapplication.php:258
+msgid "Access token URL"
+msgstr ""
+
+#: actions/showapplication.php:263
+msgid "Authorize URL"
+msgstr ""
+
+#: actions/showapplication.php:268
+msgid ""
+"Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
+"signature method."
+msgstr ""
+
#: actions/showfavorites.php:132
msgid "Could not retrieve favorite notices."
msgstr "Could not retrieve favourite notices."
@@ -3077,10 +3377,6 @@ msgstr "(None)"
msgid "All members"
msgstr "All members"
-#: actions/showgroup.php:429 lib/profileaction.php:174
-msgid "Statistics"
-msgstr "Statistics"
-
#: actions/showgroup.php:432
msgid "Created"
msgstr "Created"
@@ -3986,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"
@@ -4000,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 ""
@@ -4163,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"
@@ -4322,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."
@@ -4365,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 ""
@@ -4386,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"
@@ -4687,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 ""
@@ -5211,10 +5565,6 @@ msgid "Do not share my location"
msgstr "Couldn't save tags."
#: lib/noticeform.php:216
-msgid "Hide this info"
-msgstr ""
-
-#: lib/noticeform.php:217
msgid ""
"Sorry, retrieving your geo location is taking longer than expected, please "
"try again later"
@@ -5577,47 +5927,47 @@ msgstr "Message"
msgid "Moderate"
msgstr ""
-#: lib/util.php:877
+#: lib/util.php:875
msgid "a few seconds ago"
msgstr "a few seconds ago"
-#: lib/util.php:879
+#: lib/util.php:877
msgid "about a minute ago"
msgstr "about a minute ago"
-#: lib/util.php:881
+#: lib/util.php:879
#, php-format
msgid "about %d minutes ago"
msgstr "about %d minutes ago"
-#: lib/util.php:883
+#: lib/util.php:881
msgid "about an hour ago"
msgstr "about an hour ago"
-#: lib/util.php:885
+#: lib/util.php:883
#, php-format
msgid "about %d hours ago"
msgstr "about %d hours ago"
-#: lib/util.php:887
+#: lib/util.php:885
msgid "about a day ago"
msgstr "about a day ago"
-#: lib/util.php:889
+#: lib/util.php:887
#, php-format
msgid "about %d days ago"
msgstr "about %d days ago"
-#: lib/util.php:891
+#: lib/util.php:889
msgid "about a month ago"
msgstr "about a month ago"
-#: lib/util.php:893
+#: lib/util.php:891
#, php-format
msgid "about %d months ago"
msgstr "about %d months ago"
-#: lib/util.php:895
+#: 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 76343bf66..c035fc281 100644
--- a/locale/es/LC_MESSAGES/statusnet.po
+++ b/locale/es/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-13 22:04+0000\n"
-"PO-Revision-Date: 2010-01-13 22:05:07+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 (r61027); 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"
@@ -37,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
@@ -54,8 +54,13 @@ msgstr "No existe tal página"
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"
@@ -107,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!"
@@ -129,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
@@ -149,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."
@@ -180,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 ""
@@ -327,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."
@@ -339,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)."
@@ -417,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"
@@ -448,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 ""
@@ -604,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"
@@ -765,7 +845,8 @@ msgid "Couldn't delete email confirmation."
msgstr "No se pudo eliminar la confirmación de correo electrónico."
#: actions/confirmaddress.php:144
-msgid "Confirm Address"
+#, fuzzy
+msgid "Confirm address"
msgstr "Confirmar la dirección"
#: actions/confirmaddress.php:159
@@ -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 "Guardar"
@@ -979,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"
@@ -1050,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"
@@ -1733,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:237
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236
msgid "Send"
msgstr "Enviar"
@@ -1844,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"
@@ -1910,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 "
@@ -2021,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"
@@ -2039,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"
@@ -2054,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
@@ -2393,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"
@@ -3003,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."
@@ -3111,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"
@@ -4034,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"
@@ -4048,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 ""
@@ -4215,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"
@@ -4373,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."
@@ -4417,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 ""
@@ -4437,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 "
@@ -4740,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 ""
@@ -5263,10 +5615,6 @@ msgid "Do not share my location"
msgstr "No se pudo guardar tags."
#: lib/noticeform.php:216
-msgid "Hide this info"
-msgstr ""
-
-#: lib/noticeform.php:217
msgid ""
"Sorry, retrieving your geo location is taking longer than expected, please "
"try again later"
@@ -5635,47 +5983,47 @@ msgstr "Mensaje"
msgid "Moderate"
msgstr "Moderar"
-#: lib/util.php:877
+#: lib/util.php:875
msgid "a few seconds ago"
msgstr "hace unos segundos"
-#: lib/util.php:879
+#: lib/util.php:877
msgid "about a minute ago"
msgstr "hace un minuto"
-#: lib/util.php:881
+#: lib/util.php:879
#, php-format
msgid "about %d minutes ago"
msgstr "hace %d minutos"
-#: lib/util.php:883
+#: lib/util.php:881
msgid "about an hour ago"
msgstr "hace una hora"
-#: lib/util.php:885
+#: lib/util.php:883
#, php-format
msgid "about %d hours ago"
msgstr "hace %d horas"
-#: lib/util.php:887
+#: lib/util.php:885
msgid "about a day ago"
msgstr "hace un día"
-#: lib/util.php:889
+#: lib/util.php:887
#, php-format
msgid "about %d days ago"
msgstr "hace %d días"
-#: lib/util.php:891
+#: lib/util.php:889
msgid "about a month ago"
msgstr "hace un mes"
-#: lib/util.php:893
+#: lib/util.php:891
#, php-format
msgid "about %d months ago"
msgstr "hace %d meses"
-#: lib/util.php:895
+#: 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 bd97b86b5..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-13 22:04+0000\n"
-"PO-Revision-Date: 2010-01-13 22:05:13+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 (r61027); 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
@@ -54,8 +54,13 @@ msgstr "چنین صفحه‌ای وجود ندارد"
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 حرف)."
@@ -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 "یک مربع از عکس خود را انتخاب کنید تا چهره‌ی شما باشد."
@@ -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 "انصراف"
@@ -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:237
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236
msgid "Send"
msgstr "فرستادن"
@@ -1788,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 "مرا به یاد بسپار"
@@ -1851,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 "گروه جدید"
@@ -1963,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 "ابن خبر ذخیره ای ندارد ."
@@ -1980,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 "یک قالب دادهٔ پشتیبانی‌شده نیست."
@@ -1994,7 +2211,8 @@ msgid "Notice Search"
msgstr "جست‌وجوی آگهی‌ها"
#: actions/othersettings.php:60
-msgid "Other Settings"
+#, fuzzy
+msgid "Other settings"
msgstr "تنظیمات دیگر"
#: actions/othersettings.php:71
@@ -2317,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 "صفحهٔ خانگی"
@@ -2881,6 +3099,85 @@ msgstr ""
msgid "User is already sandboxed."
msgstr ""
+#: actions/showapplication.php:82
+#, fuzzy
+msgid "You must be logged in to view an application."
+msgstr "برای ترک یک گروه، شما باید وارد شده باشید."
+
+#: actions/showapplication.php:158
+#, fuzzy
+msgid "Application profile"
+msgstr "ابن خبر ذخیره ای ندارد ."
+
+#: actions/showapplication.php:160 lib/applicationeditform.php:182
+msgid "Icon"
+msgstr ""
+
+#: actions/showapplication.php:170 actions/version.php:195
+#: lib/applicationeditform.php:197
+#, fuzzy
+msgid "Name"
+msgstr "نام کاربری"
+
+#: actions/showapplication.php:179 lib/applicationeditform.php:224
+#, fuzzy
+msgid "Organization"
+msgstr "صفحه بندى"
+
+#: actions/showapplication.php:188 actions/version.php:198
+#: lib/applicationeditform.php:211 lib/groupeditform.php:172
+msgid "Description"
+msgstr ""
+
+#: actions/showapplication.php:193 actions/showgroup.php:429
+#: lib/profileaction.php:174
+msgid "Statistics"
+msgstr "آمار"
+
+#: actions/showapplication.php:204
+#, php-format
+msgid "created by %1$s - %2$s access by default - %3$d users"
+msgstr ""
+
+#: actions/showapplication.php:214
+msgid "Application actions"
+msgstr ""
+
+#: actions/showapplication.php:233
+msgid "Reset key & secret"
+msgstr ""
+
+#: actions/showapplication.php:241
+msgid "Application info"
+msgstr ""
+
+#: actions/showapplication.php:243
+msgid "Consumer key"
+msgstr ""
+
+#: actions/showapplication.php:248
+msgid "Consumer secret"
+msgstr ""
+
+#: actions/showapplication.php:253
+msgid "Request token URL"
+msgstr ""
+
+#: actions/showapplication.php:258
+msgid "Access token URL"
+msgstr ""
+
+#: actions/showapplication.php:263
+#, fuzzy
+msgid "Authorize URL"
+msgstr "مؤلف"
+
+#: actions/showapplication.php:268
+msgid ""
+"Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
+"signature method."
+msgstr ""
+
#: actions/showfavorites.php:132
msgid "Could not retrieve favorite notices."
msgstr "ناتوان در بازیابی آگهی های محبوب."
@@ -2986,10 +3283,6 @@ msgstr "هیچ"
msgid "All members"
msgstr "همه ی اعضا"
-#: actions/showgroup.php:429 lib/profileaction.php:174
-msgid "Statistics"
-msgstr "آمار"
-
#: actions/showgroup.php:432
msgid "Created"
msgstr "ساخته شد"
@@ -3853,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"
@@ -3868,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 ""
@@ -4028,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 "آدرس ایمیل، آواتار، کلمه ی عبور، پروفایل خود را تغییر دهید"
@@ -4180,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 "شما نمی توانید در این سایت تغیری ایجاد کنید"
@@ -4217,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 "ضمائم"
@@ -4237,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 "تغییر گذرواژه"
@@ -4537,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 "خطای پایگاه داده"
@@ -5045,10 +5393,6 @@ msgid "Do not share my location"
msgstr "نمی‌توان تنظیمات مکانی را تنظیم کرد."
#: lib/noticeform.php:216
-msgid "Hide this info"
-msgstr ""
-
-#: lib/noticeform.php:217
msgid ""
"Sorry, retrieving your geo location is taking longer than expected, please "
"try again later"
@@ -5402,47 +5746,47 @@ msgstr "پیام"
msgid "Moderate"
msgstr ""
-#: lib/util.php:877
+#: lib/util.php:875
msgid "a few seconds ago"
msgstr "چند ثانیه پیش"
-#: lib/util.php:879
+#: lib/util.php:877
msgid "about a minute ago"
msgstr "حدود یک دقیقه پیش"
-#: lib/util.php:881
+#: lib/util.php:879
#, php-format
msgid "about %d minutes ago"
msgstr "حدود %d دقیقه پیش"
-#: lib/util.php:883
+#: lib/util.php:881
msgid "about an hour ago"
msgstr "حدود یک ساعت پیش"
-#: lib/util.php:885
+#: lib/util.php:883
#, php-format
msgid "about %d hours ago"
msgstr "حدود %d ساعت پیش"
-#: lib/util.php:887
+#: lib/util.php:885
msgid "about a day ago"
msgstr "حدود یک روز پیش"
-#: lib/util.php:889
+#: lib/util.php:887
#, php-format
msgid "about %d days ago"
msgstr "حدود %d روز پیش"
-#: lib/util.php:891
+#: lib/util.php:889
msgid "about a month ago"
msgstr "حدود یک ماه پیش"
-#: lib/util.php:893
+#: lib/util.php:891
#, php-format
msgid "about %d months ago"
msgstr "حدود %d ماه پیش"
-#: lib/util.php:895
+#: 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 e54b94b71..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-13 22:04+0000\n"
-"PO-Revision-Date: 2010-01-13 22:05:10+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 (r61027); 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
@@ -52,8 +52,13 @@ msgstr "Sivua ei ole."
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ä)."
@@ -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"
@@ -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"
@@ -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:237
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236
msgid "Send"
msgstr "Lähetä"
@@ -1842,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"
@@ -1908,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ä"
@@ -2018,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"
@@ -2036,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."
@@ -2050,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
@@ -2387,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"
@@ -2998,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ä."
@@ -3103,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"
@@ -4021,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"
@@ -4035,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 ""
@@ -4200,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"
@@ -4361,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."
@@ -4405,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 ""
@@ -4426,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"
@@ -4732,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"
@@ -5260,10 +5616,6 @@ msgid "Do not share my location"
msgstr "Tageja ei voitu tallentaa."
#: lib/noticeform.php:216
-msgid "Hide this info"
-msgstr ""
-
-#: lib/noticeform.php:217
msgid ""
"Sorry, retrieving your geo location is taking longer than expected, please "
"try again later"
@@ -5639,47 +5991,47 @@ msgstr "Viesti"
msgid "Moderate"
msgstr ""
-#: lib/util.php:877
+#: lib/util.php:875
msgid "a few seconds ago"
msgstr "muutama sekunti sitten"
-#: lib/util.php:879
+#: lib/util.php:877
msgid "about a minute ago"
msgstr "noin minuutti sitten"
-#: lib/util.php:881
+#: lib/util.php:879
#, php-format
msgid "about %d minutes ago"
msgstr "noin %d minuuttia sitten"
-#: lib/util.php:883
+#: lib/util.php:881
msgid "about an hour ago"
msgstr "noin tunti sitten"
-#: lib/util.php:885
+#: lib/util.php:883
#, php-format
msgid "about %d hours ago"
msgstr "noin %d tuntia sitten"
-#: lib/util.php:887
+#: lib/util.php:885
msgid "about a day ago"
msgstr "noin päivä sitten"
-#: lib/util.php:889
+#: lib/util.php:887
#, php-format
msgid "about %d days ago"
msgstr "noin %d päivää sitten"
-#: lib/util.php:891
+#: lib/util.php:889
msgid "about a month ago"
msgstr "noin kuukausi sitten"
-#: lib/util.php:893
+#: lib/util.php:891
#, php-format
msgid "about %d months ago"
msgstr "noin %d kuukautta sitten"
-#: lib/util.php:895
+#: 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 917a67ffc..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-13 22:04+0000\n"
-"PO-Revision-Date: 2010-01-13 22:05:16+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 (r61027); 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
@@ -54,8 +55,13 @@ msgstr "Page non trouvée"
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)."
@@ -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"
@@ -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"
@@ -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:237
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236
msgid "Send"
msgstr "Envoyer"
@@ -1850,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"
@@ -1919,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"
@@ -2033,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"
@@ -2050,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é."
@@ -2064,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
@@ -2384,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"
@@ -3002,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."
@@ -3115,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éé"
@@ -4053,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"
@@ -4065,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 ""
@@ -4089,19 +4377,16 @@ 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
-#, fuzzy
msgid "Group join failed."
-msgstr "Profil du groupe"
+msgstr "L'inscription au groupe a échoué."
#: classes/Group_member.php:53
-#, fuzzy
msgid "Not part of group."
-msgstr "Impossible de mettre à jour le groupe."
+msgstr "N'appartient pas au groupe."
#: classes/Group_member.php:60
-#, fuzzy
msgid "Group leave failed."
-msgstr "Profil du groupe"
+msgstr "La désinscription du groupe a échoué."
#: classes/Login_token.php:76
#, php-format
@@ -4229,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"
@@ -4386,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."
@@ -4422,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"
@@ -4442,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"
@@ -4784,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"
@@ -4979,9 +5333,9 @@ msgid "[%s]"
msgstr "[%s]"
#: lib/jabber.php:385
-#, fuzzy, php-format
+#, php-format
msgid "Unknown inbox source %d."
-msgstr "Langue « %s » inconnue."
+msgstr "Source %d inconnue pour la boîte de réception."
#: lib/joinform.php:114
msgid "Join"
@@ -5378,14 +5732,12 @@ msgid "Do not share my location"
msgstr "Ne pas partager ma localisation"
#: lib/noticeform.php:216
-msgid "Hide this info"
-msgstr "Masquer cette info"
-
-#: lib/noticeform.php:217
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
@@ -5734,47 +6086,47 @@ msgstr "Message"
msgid "Moderate"
msgstr "Modérer"
-#: lib/util.php:877
+#: lib/util.php:875
msgid "a few seconds ago"
msgstr "il y a quelques secondes"
-#: lib/util.php:879
+#: lib/util.php:877
msgid "about a minute ago"
msgstr "il y a 1 minute"
-#: lib/util.php:881
+#: lib/util.php:879
#, php-format
msgid "about %d minutes ago"
msgstr "il y a %d minutes"
-#: lib/util.php:883
+#: lib/util.php:881
msgid "about an hour ago"
msgstr "il y a 1 heure"
-#: lib/util.php:885
+#: lib/util.php:883
#, php-format
msgid "about %d hours ago"
msgstr "il y a %d heures"
-#: lib/util.php:887
+#: lib/util.php:885
msgid "about a day ago"
msgstr "il y a 1 jour"
-#: lib/util.php:889
+#: lib/util.php:887
#, php-format
msgid "about %d days ago"
msgstr "il y a %d jours"
-#: lib/util.php:891
+#: lib/util.php:889
msgid "about a month ago"
msgstr "il y a 1 mois"
-#: lib/util.php:893
+#: lib/util.php:891
#, php-format
msgid "about %d months ago"
msgstr "il y a %d mois"
-#: lib/util.php:895
+#: 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 4dc2de67a..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-13 22:04+0000\n"
-"PO-Revision-Date: 2010-01-13 22:05:19+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 (r61027); 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
@@ -52,8 +52,13 @@ msgstr "Non existe a etiqueta."
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.)."
@@ -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 ""
@@ -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"
@@ -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:237
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236
msgid "Send"
msgstr "Enviar"
@@ -1875,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"
@@ -1939,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 ""
@@ -2050,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"
@@ -2068,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."
@@ -2082,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
@@ -2419,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"
@@ -3035,6 +3259,85 @@ msgstr "Non podes enviar mensaxes a este usurio."
msgid "User is already sandboxed."
msgstr "O usuario bloqueoute."
+#: actions/showapplication.php:82
+#, fuzzy
+msgid "You must be logged in to view an application."
+msgstr "Debes estar logueado para invitar a outros usuarios a empregar %s"
+
+#: actions/showapplication.php:158
+#, fuzzy
+msgid "Application profile"
+msgstr "O chío non ten perfil"
+
+#: actions/showapplication.php:160 lib/applicationeditform.php:182
+msgid "Icon"
+msgstr ""
+
+#: actions/showapplication.php:170 actions/version.php:195
+#: lib/applicationeditform.php:197
+#, fuzzy
+msgid "Name"
+msgstr "Alcume"
+
+#: actions/showapplication.php:179 lib/applicationeditform.php:224
+#, fuzzy
+msgid "Organization"
+msgstr "Invitación(s) enviada(s)."
+
+#: actions/showapplication.php:188 actions/version.php:198
+#: lib/applicationeditform.php:211 lib/groupeditform.php:172
+#, fuzzy
+msgid "Description"
+msgstr "Subscricións"
+
+#: actions/showapplication.php:193 actions/showgroup.php:429
+#: lib/profileaction.php:174
+msgid "Statistics"
+msgstr "Estatísticas"
+
+#: actions/showapplication.php:204
+#, php-format
+msgid "created by %1$s - %2$s access by default - %3$d users"
+msgstr ""
+
+#: actions/showapplication.php:214
+msgid "Application actions"
+msgstr ""
+
+#: actions/showapplication.php:233
+msgid "Reset key & secret"
+msgstr ""
+
+#: actions/showapplication.php:241
+msgid "Application info"
+msgstr ""
+
+#: actions/showapplication.php:243
+msgid "Consumer key"
+msgstr ""
+
+#: actions/showapplication.php:248
+msgid "Consumer secret"
+msgstr ""
+
+#: actions/showapplication.php:253
+msgid "Request token URL"
+msgstr ""
+
+#: actions/showapplication.php:258
+msgid "Access token URL"
+msgstr ""
+
+#: actions/showapplication.php:263
+msgid "Authorize URL"
+msgstr ""
+
+#: actions/showapplication.php:268
+msgid ""
+"Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
+"signature method."
+msgstr ""
+
#: actions/showfavorites.php:132
msgid "Could not retrieve favorite notices."
msgstr "Non se pode "
@@ -3145,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"
@@ -4077,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"
@@ -4091,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 ""
@@ -4262,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"
@@ -4433,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."
@@ -4478,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 ""
@@ -4499,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."
@@ -4844,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 ""
@@ -5426,10 +5780,6 @@ msgid "Do not share my location"
msgstr "Non se puideron gardar as etiquetas."
#: lib/noticeform.php:216
-msgid "Hide this info"
-msgstr ""
-
-#: lib/noticeform.php:217
msgid ""
"Sorry, retrieving your geo location is taking longer than expected, please "
"try again later"
@@ -5819,47 +6169,47 @@ msgstr "Nova mensaxe"
msgid "Moderate"
msgstr ""
-#: lib/util.php:877
+#: lib/util.php:875
msgid "a few seconds ago"
msgstr "fai uns segundos"
-#: lib/util.php:879
+#: lib/util.php:877
msgid "about a minute ago"
msgstr "fai un minuto"
-#: lib/util.php:881
+#: lib/util.php:879
#, php-format
msgid "about %d minutes ago"
msgstr "fai %d minutos"
-#: lib/util.php:883
+#: lib/util.php:881
msgid "about an hour ago"
msgstr "fai unha hora"
-#: lib/util.php:885
+#: lib/util.php:883
#, php-format
msgid "about %d hours ago"
msgstr "fai %d horas"
-#: lib/util.php:887
+#: lib/util.php:885
msgid "about a day ago"
msgstr "fai un día"
-#: lib/util.php:889
+#: lib/util.php:887
#, php-format
msgid "about %d days ago"
msgstr "fai %d días"
-#: lib/util.php:891
+#: lib/util.php:889
msgid "about a month ago"
msgstr "fai un mes"
-#: lib/util.php:893
+#: lib/util.php:891
#, php-format
msgid "about %d months ago"
msgstr "fai %d meses"
-#: lib/util.php:895
+#: 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 c6e90c550..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-13 22:04+0000\n"
-"PO-Revision-Date: 2010-01-13 22:05:22+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 (r61027); 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
@@ -50,8 +50,13 @@ msgstr "אין הודעה כזו."
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 אותיות)"
@@ -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 ""
@@ -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 "בטל"
@@ -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:237
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236
msgid "Send"
msgstr "שלח"
@@ -1823,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 "זכור אותי"
@@ -1884,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 ""
@@ -1992,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 "להודעה אין פרופיל"
@@ -2010,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 ""
@@ -2025,7 +2238,7 @@ msgstr ""
#: actions/othersettings.php:60
#, fuzzy
-msgid "Other Settings"
+msgid "Other settings"
msgstr "הגדרות"
#: actions/othersettings.php:71
@@ -2358,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 "אתר בית"
@@ -2933,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 ""
@@ -3041,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"
@@ -3940,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"
@@ -3954,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 ""
@@ -4119,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 ""
@@ -4287,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 ""
@@ -4325,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 ""
@@ -4346,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 "הסיסמה נשמרה."
@@ -4653,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 ""
@@ -5173,10 +5516,6 @@ msgid "Do not share my location"
msgstr "שמירת הפרופיל נכשלה."
#: lib/noticeform.php:216
-msgid "Hide this info"
-msgstr ""
-
-#: lib/noticeform.php:217
msgid ""
"Sorry, retrieving your geo location is taking longer than expected, please "
"try again later"
@@ -5555,47 +5894,47 @@ msgstr "הודעה חדשה"
msgid "Moderate"
msgstr ""
-#: lib/util.php:877
+#: lib/util.php:875
msgid "a few seconds ago"
msgstr "לפני מספר שניות"
-#: lib/util.php:879
+#: lib/util.php:877
msgid "about a minute ago"
msgstr "לפני כדקה"
-#: lib/util.php:881
+#: lib/util.php:879
#, php-format
msgid "about %d minutes ago"
msgstr "לפני כ-%d דקות"
-#: lib/util.php:883
+#: lib/util.php:881
msgid "about an hour ago"
msgstr "לפני כשעה"
-#: lib/util.php:885
+#: lib/util.php:883
#, php-format
msgid "about %d hours ago"
msgstr "לפני כ-%d שעות"
-#: lib/util.php:887
+#: lib/util.php:885
msgid "about a day ago"
msgstr "לפני כיום"
-#: lib/util.php:889
+#: lib/util.php:887
#, php-format
msgid "about %d days ago"
msgstr "לפני כ-%d ימים"
-#: lib/util.php:891
+#: lib/util.php:889
msgid "about a month ago"
msgstr "לפני כחודש"
-#: lib/util.php:893
+#: lib/util.php:891
#, php-format
msgid "about %d months ago"
msgstr "לפני כ-%d חודשים"
-#: lib/util.php:895
+#: 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 8f548104d..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-13 22:04+0000\n"
-"PO-Revision-Date: 2010-01-13 22:05:25+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 (r61027); 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
@@ -52,8 +52,13 @@ msgstr "Strona njeeksistuje"
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)."
@@ -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 ""
@@ -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ć"
@@ -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:237
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236
msgid "Send"
msgstr "Pósłać"
@@ -1737,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ć"
@@ -1796,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"
@@ -1900,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"
@@ -1917,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."
@@ -1931,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
@@ -1963,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
@@ -2247,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"
@@ -2802,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 ""
@@ -2907,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"
@@ -3762,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"
@@ -3774,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 ""
@@ -3796,19 +4053,16 @@ 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 "Skupinski profil"
+msgstr "Přizamknjenje k skupinje je so njeporadźiło."
#: classes/Group_member.php:53
-#, fuzzy
msgid "Not part of group."
-msgstr "Skupina njeje so dała aktualizować."
+msgstr "Njeje dźěl skupiny."
#: classes/Group_member.php:60
-#, fuzzy
msgid "Group leave failed."
-msgstr "Skupinski profil"
+msgstr "Wopušćenje skupiny je so njeporadźiło."
#: classes/Login_token.php:76
#, php-format
@@ -3911,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"
@@ -3932,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 ""
@@ -4084,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 ""
@@ -4120,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 ""
@@ -4140,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"
@@ -4187,44 +4494,41 @@ msgid ""
msgstr ""
#: lib/command.php:152 lib/command.php:390 lib/command.php:451
-#, fuzzy
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:406 lib/command.php:467
#: lib/command.php:523
-#, fuzzy
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:231
-#, fuzzy, php-format
+#, 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:236
-#, fuzzy, php-format
+#, php-format
msgid "%s joined group %s"
-msgstr "Wužiwarske skupiny"
+msgstr "%s je so k skupinje %s přizamknył"
#: lib/command.php:275
-#, fuzzy, php-format
+#, 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:280
-#, fuzzy, php-format
+#, php-format
msgid "%s left group %s"
-msgstr "Wužiwarske skupiny"
+msgstr "%s je skupinu %s wopušćił"
#: lib/command.php:309
#, php-format
@@ -4252,18 +4556,17 @@ msgid "Message too long - maximum is %d characters, you sent %d"
msgstr ""
#: lib/command.php:367
-#, fuzzy, php-format
+#, 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:369
msgid "Error sending direct message."
msgstr ""
#: lib/command.php:413
-#, fuzzy
msgid "Cannot repeat your own notice"
-msgstr "Njemóžno twoju zdźělenku wospjetować."
+msgstr "Njemóžeš swójsku powěsć wospjetować"
#: lib/command.php:418
msgid "Already repeated that notice"
@@ -4284,9 +4587,9 @@ msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr ""
#: lib/command.php:491
-#, fuzzy, php-format
+#, 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:493
msgid "Error saving notice."
@@ -4444,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"
@@ -4632,9 +4943,9 @@ msgid "[%s]"
msgstr "[%s]"
#: lib/jabber.php:385
-#, fuzzy, php-format
+#, php-format
msgid "Unknown inbox source %d."
-msgstr "Njeznata rěč \"%s\"."
+msgstr "Njeznate žórło postoweho kašćika %d."
#: lib/joinform.php:114
msgid "Join"
@@ -4933,20 +5244,14 @@ 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:215
-#, fuzzy
msgid "Do not share my location"
-msgstr "Městno njedźělić."
+msgstr "Njedźěl moje městno"
#: lib/noticeform.php:216
-msgid "Hide this info"
-msgstr ""
-
-#: lib/noticeform.php:217
msgid ""
"Sorry, retrieving your geo location is taking longer than expected, please "
"try again later"
@@ -5299,47 +5604,47 @@ msgstr "Powěsć"
msgid "Moderate"
msgstr ""
-#: lib/util.php:877
+#: lib/util.php:875
msgid "a few seconds ago"
msgstr "před něšto sekundami"
-#: lib/util.php:879
+#: lib/util.php:877
msgid "about a minute ago"
msgstr "před něhdźe jednej mjeńšinu"
-#: lib/util.php:881
+#: lib/util.php:879
#, php-format
msgid "about %d minutes ago"
msgstr "před %d mjeńšinami"
-#: lib/util.php:883
+#: lib/util.php:881
msgid "about an hour ago"
msgstr "před něhdźe jednej hodźinu"
-#: lib/util.php:885
+#: lib/util.php:883
#, php-format
msgid "about %d hours ago"
msgstr "před něhdźe %d hodźinami"
-#: lib/util.php:887
+#: lib/util.php:885
msgid "about a day ago"
msgstr "před něhdźe jednym dnjom"
-#: lib/util.php:889
+#: lib/util.php:887
#, php-format
msgid "about %d days ago"
msgstr "před něhdźe %d dnjemi"
-#: lib/util.php:891
+#: lib/util.php:889
msgid "about a month ago"
msgstr "před něhdźe jednym měsacom"
-#: lib/util.php:893
+#: lib/util.php:891
#, php-format
msgid "about %d months ago"
msgstr "před něhdźe %d měsacami"
-#: lib/util.php:895
+#: 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 3115ed7ce..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-13 22:04+0000\n"
-"PO-Revision-Date: 2010-01-13 22:05:28+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 (r61027); 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
@@ -50,8 +50,13 @@ msgstr "Pagina non existe"
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)."
@@ -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"
@@ -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"
@@ -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:237
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236
msgid "Send"
msgstr "Inviar"
@@ -1837,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"
@@ -1902,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"
@@ -2017,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"
@@ -2034,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."
@@ -2048,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
@@ -2371,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"
@@ -2979,6 +3198,83 @@ msgstr "Tu non pote mitter usatores in le cassa de sablo in iste sito."
msgid "User is already sandboxed."
msgstr "Usator es ja in cassa de sablo."
+#: actions/showapplication.php:82
+#, fuzzy
+msgid "You must be logged in to view an application."
+msgstr "Tu debe aperir un session pro quitar un gruppo."
+
+#: actions/showapplication.php:158
+#, fuzzy
+msgid "Application profile"
+msgstr "Le nota ha nulle profilo"
+
+#: actions/showapplication.php:160 lib/applicationeditform.php:182
+msgid "Icon"
+msgstr ""
+
+#: actions/showapplication.php:170 actions/version.php:195
+#: lib/applicationeditform.php:197
+#, fuzzy
+msgid "Name"
+msgstr "Pseudonymo"
+
+#: actions/showapplication.php:179 lib/applicationeditform.php:224
+msgid "Organization"
+msgstr ""
+
+#: actions/showapplication.php:188 actions/version.php:198
+#: lib/applicationeditform.php:211 lib/groupeditform.php:172
+msgid "Description"
+msgstr ""
+
+#: actions/showapplication.php:193 actions/showgroup.php:429
+#: lib/profileaction.php:174
+msgid "Statistics"
+msgstr "Statisticas"
+
+#: actions/showapplication.php:204
+#, php-format
+msgid "created by %1$s - %2$s access by default - %3$d users"
+msgstr ""
+
+#: actions/showapplication.php:214
+msgid "Application actions"
+msgstr ""
+
+#: actions/showapplication.php:233
+msgid "Reset key & secret"
+msgstr ""
+
+#: actions/showapplication.php:241
+msgid "Application info"
+msgstr ""
+
+#: actions/showapplication.php:243
+msgid "Consumer key"
+msgstr ""
+
+#: actions/showapplication.php:248
+msgid "Consumer secret"
+msgstr ""
+
+#: actions/showapplication.php:253
+msgid "Request token URL"
+msgstr ""
+
+#: actions/showapplication.php:258
+msgid "Access token URL"
+msgstr ""
+
+#: actions/showapplication.php:263
+msgid "Authorize URL"
+msgstr ""
+
+#: actions/showapplication.php:268
+msgid ""
+"Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
+"signature method."
+msgstr ""
+
#: actions/showfavorites.php:132
msgid "Could not retrieve favorite notices."
msgstr "Non poteva recuperar notas favorite."
@@ -3092,10 +3388,6 @@ msgstr "(Nulle)"
msgid "All members"
msgstr "Tote le membros"
-#: actions/showgroup.php:429 lib/profileaction.php:174
-msgid "Statistics"
-msgstr "Statisticas"
-
#: actions/showgroup.php:432
msgid "Created"
msgstr "Create"
@@ -3984,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"
@@ -3998,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 ""
@@ -4156,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 ""
@@ -4308,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 ""
@@ -4345,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 ""
@@ -4365,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"
@@ -4663,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 ""
@@ -5163,10 +5510,6 @@ msgid "Do not share my location"
msgstr "Non poteva salveguardar le preferentias de loco."
#: lib/noticeform.php:216
-msgid "Hide this info"
-msgstr ""
-
-#: lib/noticeform.php:217
msgid ""
"Sorry, retrieving your geo location is taking longer than expected, please "
"try again later"
@@ -5522,47 +5865,47 @@ msgstr ""
msgid "Moderate"
msgstr ""
-#: lib/util.php:877
+#: lib/util.php:875
msgid "a few seconds ago"
msgstr ""
-#: lib/util.php:879
+#: lib/util.php:877
msgid "about a minute ago"
msgstr ""
-#: lib/util.php:881
+#: lib/util.php:879
#, php-format
msgid "about %d minutes ago"
msgstr ""
-#: lib/util.php:883
+#: lib/util.php:881
msgid "about an hour ago"
msgstr ""
-#: lib/util.php:885
+#: lib/util.php:883
#, php-format
msgid "about %d hours ago"
msgstr ""
-#: lib/util.php:887
+#: lib/util.php:885
msgid "about a day ago"
msgstr ""
-#: lib/util.php:889
+#: lib/util.php:887
#, php-format
msgid "about %d days ago"
msgstr ""
-#: lib/util.php:891
+#: lib/util.php:889
msgid "about a month ago"
msgstr ""
-#: lib/util.php:893
+#: lib/util.php:891
#, php-format
msgid "about %d months ago"
msgstr ""
-#: lib/util.php:895
+#: 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 beef92d12..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-13 22:04+0000\n"
-"PO-Revision-Date: 2010-01-13 22:05:31+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 (r61027); 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
@@ -53,8 +53,13 @@ msgstr "Ekkert þannig merki."
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)."
@@ -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 ""
@@ -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ð"
@@ -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:237
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236
msgid "Send"
msgstr "Senda"
@@ -1830,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"
@@ -1896,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"
@@ -2006,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"
@@ -2023,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ð."
@@ -2037,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
@@ -2370,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"
@@ -2969,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."
@@ -3074,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 ""
@@ -3979,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"
@@ -3993,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 ""
@@ -4154,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, "
@@ -4316,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."
@@ -4359,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 ""
@@ -4379,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"
@@ -4685,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 ""
@@ -5200,10 +5553,6 @@ msgid "Do not share my location"
msgstr "Gat ekki vistað merki."
#: lib/noticeform.php:216
-msgid "Hide this info"
-msgstr ""
-
-#: lib/noticeform.php:217
msgid ""
"Sorry, retrieving your geo location is taking longer than expected, please "
"try again later"
@@ -5573,47 +5922,47 @@ msgstr "Skilaboð"
msgid "Moderate"
msgstr ""
-#: lib/util.php:877
+#: lib/util.php:875
msgid "a few seconds ago"
msgstr "fyrir nokkrum sekúndum"
-#: lib/util.php:879
+#: lib/util.php:877
msgid "about a minute ago"
msgstr "fyrir um einni mínútu síðan"
-#: lib/util.php:881
+#: lib/util.php:879
#, php-format
msgid "about %d minutes ago"
msgstr "fyrir um %d mínútum síðan"
-#: lib/util.php:883
+#: lib/util.php:881
msgid "about an hour ago"
msgstr "fyrir um einum klukkutíma síðan"
-#: lib/util.php:885
+#: lib/util.php:883
#, php-format
msgid "about %d hours ago"
msgstr "fyrir um %d klukkutímum síðan"
-#: lib/util.php:887
+#: lib/util.php:885
msgid "about a day ago"
msgstr "fyrir um einum degi síðan"
-#: lib/util.php:889
+#: lib/util.php:887
#, php-format
msgid "about %d days ago"
msgstr "fyrir um %d dögum síðan"
-#: lib/util.php:891
+#: lib/util.php:889
msgid "about a month ago"
msgstr "fyrir um einum mánuði síðan"
-#: lib/util.php:893
+#: lib/util.php:891
#, php-format
msgid "about %d months ago"
msgstr "fyrir um %d mánuðum síðan"
-#: lib/util.php:895
+#: 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 81c1d1fe7..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-13 22:04+0000\n"
-"PO-Revision-Date: 2010-01-13 22:05:34+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 (r61027); 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
@@ -51,8 +51,13 @@ msgstr "Pagina inesistente."
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)."
@@ -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"
@@ -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"
@@ -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:237
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236
msgid "Send"
msgstr "Invia"
@@ -1833,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"
@@ -1897,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"
@@ -2009,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"
@@ -2026,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."
@@ -2040,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
@@ -2366,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"
@@ -2973,6 +3196,84 @@ msgstr "Non puoi mettere in \"sandbox\" gli utenti su questo sito."
msgid "User is already sandboxed."
msgstr "L'utente è già nella \"sandbox\"."
+#: actions/showapplication.php:82
+#, fuzzy
+msgid "You must be logged in to view an application."
+msgstr "Devi eseguire l'accesso per lasciare un gruppo."
+
+#: actions/showapplication.php:158
+#, fuzzy
+msgid "Application profile"
+msgstr "Il messaggio non ha un profilo"
+
+#: actions/showapplication.php:160 lib/applicationeditform.php:182
+msgid "Icon"
+msgstr ""
+
+#: actions/showapplication.php:170 actions/version.php:195
+#: lib/applicationeditform.php:197
+msgid "Name"
+msgstr "Nome"
+
+#: actions/showapplication.php:179 lib/applicationeditform.php:224
+#, fuzzy
+msgid "Organization"
+msgstr "Paginazione"
+
+#: actions/showapplication.php:188 actions/version.php:198
+#: lib/applicationeditform.php:211 lib/groupeditform.php:172
+msgid "Description"
+msgstr "Descrizione"
+
+#: actions/showapplication.php:193 actions/showgroup.php:429
+#: lib/profileaction.php:174
+msgid "Statistics"
+msgstr "Statistiche"
+
+#: actions/showapplication.php:204
+#, php-format
+msgid "created by %1$s - %2$s access by default - %3$d users"
+msgstr ""
+
+#: actions/showapplication.php:214
+msgid "Application actions"
+msgstr ""
+
+#: actions/showapplication.php:233
+msgid "Reset key & secret"
+msgstr ""
+
+#: actions/showapplication.php:241
+msgid "Application info"
+msgstr ""
+
+#: actions/showapplication.php:243
+msgid "Consumer key"
+msgstr ""
+
+#: actions/showapplication.php:248
+msgid "Consumer secret"
+msgstr ""
+
+#: actions/showapplication.php:253
+msgid "Request token URL"
+msgstr ""
+
+#: actions/showapplication.php:258
+msgid "Access token URL"
+msgstr ""
+
+#: actions/showapplication.php:263
+#, fuzzy
+msgid "Authorize URL"
+msgstr "Autore"
+
+#: actions/showapplication.php:268
+msgid ""
+"Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
+"signature method."
+msgstr ""
+
#: actions/showfavorites.php:132
msgid "Could not retrieve favorite notices."
msgstr "Impossibile recuperare i messaggi preferiti."
@@ -3085,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"
@@ -4012,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"
@@ -4024,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 ""
@@ -4190,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"
@@ -4347,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."
@@ -4383,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"
@@ -4403,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"
@@ -4743,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"
@@ -5334,10 +5690,6 @@ msgid "Do not share my location"
msgstr "Non condividere la mia posizione"
#: lib/noticeform.php:216
-msgid "Hide this info"
-msgstr "Nascondi info"
-
-#: lib/noticeform.php:217
msgid ""
"Sorry, retrieving your geo location is taking longer than expected, please "
"try again later"
@@ -5690,47 +6042,47 @@ msgstr "Messaggio"
msgid "Moderate"
msgstr "Modera"
-#: lib/util.php:877
+#: lib/util.php:875
msgid "a few seconds ago"
msgstr "pochi secondi fa"
-#: lib/util.php:879
+#: lib/util.php:877
msgid "about a minute ago"
msgstr "circa un minuto fa"
-#: lib/util.php:881
+#: lib/util.php:879
#, php-format
msgid "about %d minutes ago"
msgstr "circa %d minuti fa"
-#: lib/util.php:883
+#: lib/util.php:881
msgid "about an hour ago"
msgstr "circa un'ora fa"
-#: lib/util.php:885
+#: lib/util.php:883
#, php-format
msgid "about %d hours ago"
msgstr "circa %d ore fa"
-#: lib/util.php:887
+#: lib/util.php:885
msgid "about a day ago"
msgstr "circa un giorno fa"
-#: lib/util.php:889
+#: lib/util.php:887
#, php-format
msgid "about %d days ago"
msgstr "circa %d giorni fa"
-#: lib/util.php:891
+#: lib/util.php:889
msgid "about a month ago"
msgstr "circa un mese fa"
-#: lib/util.php:893
+#: lib/util.php:891
#, php-format
msgid "about %d months ago"
msgstr "circa %d mesi fa"
-#: lib/util.php:895
+#: 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 b3c04d2f4..792ff4d39 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-13 22:04+0000\n"
-"PO-Revision-Date: 2010-01-13 22:05:37+0000\n"
+"POT-Creation-Date: 2010-01-18 23:16+0000\n"
+"PO-Revision-Date: 2010-01-18 23:18:49+0000\n"
"Language-Team: Japanese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r61027); Translate extension (2010-01-04)\n"
+"X-Generator: MediaWiki 1.16alpha (r61218); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ja\n"
"X-Message-Group: out-statusnet\n"
@@ -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
@@ -53,8 +53,13 @@ msgstr "そのようなページはありません。"
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 "%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 ""
@@ -330,7 +336,8 @@ msgstr "そのニックネームは既に使用されています。他のもの
msgid "Not a valid nickname."
msgstr "有効なニックネームではありません。"
-#: actions/apigroupcreate.php:196 actions/editgroup.php:195
+#: actions/apigroupcreate.php:196 actions/editapplication.php:212
+#: actions/editgroup.php:195 actions/newapplication.php:200
#: actions/newgroup.php:139 actions/profilesettings.php:222
#: actions/register.php:217
msgid "Homepage is not a valid URL."
@@ -342,7 +349,8 @@ msgstr "ホームページのURLが不適切です。"
msgid "Full name is too long (max 255 chars)."
msgstr "フルネームが長すぎます。(255字まで)"
-#: actions/apigroupcreate.php:213
+#: actions/apigroupcreate.php:213 actions/editapplication.php:187
+#: actions/newapplication.php:169
#, php-format
msgid "Description is too long (max %d chars)."
msgstr "記述が長すぎます。(最長140字)"
@@ -419,6 +427,99 @@ msgstr "%s グループ"
msgid "groups on %s"
msgstr "%s 上のグループ"
+#: actions/apioauthauthorize.php:108 actions/apioauthauthorize.php:114
+msgid "Bad request."
+msgstr "悪い要求。"
+
+#: actions/apioauthauthorize.php:134 actions/avatarsettings.php:268
+#: actions/deletenotice.php:157 actions/disfavor.php:74
+#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:50
+#: actions/groupblock.php:66 actions/grouplogo.php:309
+#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
+#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:139
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/profilesettings.php:194 actions/recoverpassword.php:337
+#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/subscribe.php:46 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
+#: lib/designsettings.php:294
+msgid "There was a problem with your session token. Try again, please."
+msgstr "あなたのセッショントークンに問題がありました。再度お試しください。"
+
+#: actions/apioauthauthorize.php:146
+msgid "Invalid nickname / password!"
+msgstr "不正なユーザ名またはパスワード。"
+
+#: actions/apioauthauthorize.php:170
+msgid "DB error deleting OAuth app user."
+msgstr "OAuth アプリユーザの削除時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 が必要です。"
@@ -448,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 "長すぎます。つぶやきは最大 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 字までです。"
@@ -602,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 "あなたのアバターとなるイメージを正方形で指定"
@@ -762,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
@@ -950,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 "保存"
@@ -971,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"
@@ -1039,7 +1188,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 "中止"
@@ -1720,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:237
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236
msgid "Send"
msgstr "送る"
@@ -1829,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 "ログイン状態を保持"
@@ -1892,6 +2031,26 @@ msgstr "%1$s をグループ %2$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 "新しいグループ"
@@ -2004,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 "つぶやきにはプロファイルはありません。"
@@ -2021,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 "サポートされていないデータ形式。"
@@ -2035,7 +2238,7 @@ msgid "Notice Search"
msgstr "つぶやき検索"
#: actions/othersettings.php:60
-msgid "Other Settings"
+msgid "Other settings"
msgstr "その他の設定"
#: actions/othersettings.php:71
@@ -2354,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 "ホームページ"
@@ -2959,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 "お気に入りのつぶやきを検索できません。"
@@ -3072,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 "作成されました"
@@ -3989,10 +4264,6 @@ msgstr ""
msgid "Plugins"
msgstr "プラグイン"
-#: actions/version.php:195
-msgid "Name"
-msgstr "名前"
-
#: actions/version.php:196 lib/action.php:741
msgid "Version"
msgstr "バージョン"
@@ -4001,10 +4272,6 @@ msgstr "バージョン"
msgid "Author(s)"
msgstr "作者"
-#: actions/version.php:198 lib/groupeditform.php:172
-msgid "Description"
-msgstr "概要"
-
#: classes/File.php:144
#, php-format
msgid ""
@@ -4028,19 +4295,16 @@ msgstr ""
"これほど大きいファイルはあなたの%dバイトの毎月の割当てを超えているでしょう。"
#: classes/Group_member.php:41
-#, fuzzy
msgid "Group join failed."
-msgstr "グループプロファイル"
+msgstr "グループ参加に失敗しました。"
#: classes/Group_member.php:53
-#, fuzzy
msgid "Not part of group."
-msgstr "グループを更新できません。"
+msgstr "グループの一部ではありません。"
#: classes/Group_member.php:60
-#, fuzzy
msgid "Group leave failed."
-msgstr "グループプロファイル"
+msgstr "グループ脱退に失敗しました。"
#: classes/Login_token.php:76
#, php-format
@@ -4094,12 +4358,12 @@ msgstr "あなたはこのサイトでつぶやきを投稿するのが禁止さ
msgid "Problem saving notice."
msgstr "つぶやきを保存する際に問題が発生しました。"
-#: classes/Notice.php:1052
+#: classes/Notice.php:1059
#, php-format
msgid "DB error inserting reply: %s"
msgstr "返信を追加する際にデータベースエラー : %s"
-#: classes/Notice.php:1423
+#: classes/Notice.php:1441
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
@@ -4167,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 "メールアドレス、アバター、パスワード、プロパティの変更"
@@ -4324,10 +4584,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 "あなたはこのサイトへの変更を行うことができません。"
@@ -4360,6 +4616,72 @@ msgstr "デザイン設定"
msgid "Paths configuration"
msgstr "パス設定"
+#: lib/applicationeditform.php:186
+msgid "Icon for this application"
+msgstr "このアプリケーションのアイコン"
+
+#: lib/applicationeditform.php:206
+#, fuzzy, php-format
+msgid "Describe your application in %d characters"
+msgstr "グループやトピックを %d 字以内記述"
+
+#: lib/applicationeditform.php:209
+#, fuzzy
+msgid "Describe your application"
+msgstr "グループやトピックを記述"
+
+#: lib/applicationeditform.php:218
+#, fuzzy
+msgid "Source URL"
+msgstr "ソース"
+
+#: lib/applicationeditform.php:220
+#, fuzzy
+msgid "URL of the homepage of this application"
+msgstr "グループやトピックのホームページやブログの URL"
+
+#: lib/applicationeditform.php:226
+msgid "Organization responsible for this application"
+msgstr "このアプリケーションに責任がある組織"
+
+#: lib/applicationeditform.php:232
+msgid "URL for the homepage of the organization"
+msgstr "組織のホームページのURL"
+
+#: lib/applicationeditform.php:238
+msgid "URL to redirect to after authentication"
+msgstr "認証の後にリダイレクトするURL"
+
+#: lib/applicationeditform.php:260
+msgid "Browser"
+msgstr "ブラウザ"
+
+#: lib/applicationeditform.php:276
+msgid "Desktop"
+msgstr "デスクトップ"
+
+#: lib/applicationeditform.php:277
+msgid "Type of application, browser or desktop"
+msgstr "アプリケーション、ブラウザ、またはデスクトップのタイプ"
+
+#: lib/applicationeditform.php:299
+msgid "Read-only"
+msgstr "リードオンリー"
+
+#: lib/applicationeditform.php:317
+msgid "Read-write"
+msgstr "リードライト"
+
+#: lib/applicationeditform.php:318
+msgid "Default access for this application: read-only, or read-write"
+msgstr ""
+"このアプリケーションのためのデフォルトアクセス: リードオンリー、またはリード"
+"ライト"
+
+#: lib/applicationlist.php:154
+msgid "Revoke"
+msgstr "取消し"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr "添付"
@@ -4380,11 +4702,11 @@ msgstr "この添付が現れるつぶやき"
msgid "Tags for this attachment"
msgstr "この添付のタグ"
-#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187
+#: lib/authenticationplugin.php:214 lib/authenticationplugin.php:219
msgid "Password changing failed"
msgstr "パスワード変更に失敗しました"
-#: lib/authenticationplugin.php:197
+#: lib/authenticationplugin.php:229
msgid "Password changing is not allowed"
msgstr "パスワード変更は許可されていません"
@@ -4676,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 "データベースエラー"
@@ -4866,9 +5196,9 @@ msgid "[%s]"
msgstr ""
#: lib/jabber.php:385
-#, fuzzy, php-format
+#, php-format
msgid "Unknown inbox source %d."
-msgstr "不明な言語 \"%s\""
+msgstr "不明な受信箱のソース %d。"
#: lib/joinform.php:114
msgid "Join"
@@ -5266,10 +5596,6 @@ msgid "Do not share my location"
msgstr "あなたの場所を共有しない"
#: lib/noticeform.php:216
-msgid "Hide this info"
-msgstr "この情報を隠す"
-
-#: lib/noticeform.php:217
msgid ""
"Sorry, retrieving your geo location is taking longer than expected, please "
"try again later"
@@ -5627,47 +5953,47 @@ msgstr "メッセージ"
msgid "Moderate"
msgstr "司会"
-#: lib/util.php:877
+#: lib/util.php:875
msgid "a few seconds ago"
msgstr "数秒前"
-#: lib/util.php:879
+#: lib/util.php:877
msgid "about a minute ago"
msgstr "約 1 分前"
-#: lib/util.php:881
+#: lib/util.php:879
#, php-format
msgid "about %d minutes ago"
msgstr "約 %d 分前"
-#: lib/util.php:883
+#: lib/util.php:881
msgid "about an hour ago"
msgstr "約 1 時間前"
-#: lib/util.php:885
+#: lib/util.php:883
#, php-format
msgid "about %d hours ago"
msgstr "約 %d 時間前"
-#: lib/util.php:887
+#: lib/util.php:885
msgid "about a day ago"
msgstr "約 1 日前"
-#: lib/util.php:889
+#: lib/util.php:887
#, php-format
msgid "about %d days ago"
msgstr "約 %d 日前"
-#: lib/util.php:891
+#: lib/util.php:889
msgid "about a month ago"
msgstr "約 1 ヵ月前"
-#: lib/util.php:893
+#: lib/util.php:891
#, php-format
msgid "about %d months ago"
msgstr "約 %d ヵ月前"
-#: lib/util.php:895
+#: lib/util.php:893
msgid "about a year ago"
msgstr "約 1 年前"
diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po
index f37715eca..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-13 22:04+0000\n"
-"PO-Revision-Date: 2010-01-13 22:05:40+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 (r61027); 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
@@ -50,8 +50,13 @@ msgstr "그러한 태그가 없습니다."
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글자)"
@@ -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 "당신의 아바타가 될 이미지영역을 지정하세요."
@@ -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 "취소"
@@ -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:237
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236
msgid "Send"
msgstr "보내기"
@@ -1850,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 "자동 로그인"
@@ -1913,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 "새로운 그룹"
@@ -2022,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 "통지에 프로필이 없습니다."
@@ -2040,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 "지원하는 형식의 데이터가 아닙니다."
@@ -2054,7 +2274,8 @@ msgid "Notice Search"
msgstr "통지 검색"
#: actions/othersettings.php:60
-msgid "Other Settings"
+#, fuzzy
+msgid "Other settings"
msgstr "기타 설정"
#: actions/othersettings.php:71
@@ -2387,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 "홈페이지"
@@ -2984,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 "좋아하는 게시글을 복구할 수 없습니다."
@@ -3089,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"
@@ -4000,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"
@@ -4014,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 ""
@@ -4180,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 "당신의 이메일, 아바타, 비밀 번호, 프로필을 변경하세요."
@@ -4341,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."
@@ -4385,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 ""
@@ -4406,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 "비밀번호 변경"
@@ -4709,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 ""
@@ -5223,10 +5576,6 @@ msgid "Do not share my location"
msgstr "태그를 저장할 수 없습니다."
#: lib/noticeform.php:216
-msgid "Hide this info"
-msgstr ""
-
-#: lib/noticeform.php:217
msgid ""
"Sorry, retrieving your geo location is taking longer than expected, please "
"try again later"
@@ -5602,47 +5951,47 @@ msgstr "메시지"
msgid "Moderate"
msgstr ""
-#: lib/util.php:877
+#: lib/util.php:875
msgid "a few seconds ago"
msgstr "몇 초 전"
-#: lib/util.php:879
+#: lib/util.php:877
msgid "about a minute ago"
msgstr "1분 전"
-#: lib/util.php:881
+#: lib/util.php:879
#, php-format
msgid "about %d minutes ago"
msgstr "%d분 전"
-#: lib/util.php:883
+#: lib/util.php:881
msgid "about an hour ago"
msgstr "1시간 전"
-#: lib/util.php:885
+#: lib/util.php:883
#, php-format
msgid "about %d hours ago"
msgstr "%d시간 전"
-#: lib/util.php:887
+#: lib/util.php:885
msgid "about a day ago"
msgstr "하루 전"
-#: lib/util.php:889
+#: lib/util.php:887
#, php-format
msgid "about %d days ago"
msgstr "%d일 전"
-#: lib/util.php:891
+#: lib/util.php:889
msgid "about a month ago"
msgstr "1달 전"
-#: lib/util.php:893
+#: lib/util.php:891
#, php-format
msgid "about %d months ago"
msgstr "%d달 전"
-#: lib/util.php:895
+#: 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 4bda795f0..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-13 22:04+0000\n"
-"PO-Revision-Date: 2010-01-13 22:05:43+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 (r61027); 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
@@ -51,8 +51,13 @@ msgstr "Нема таква страница"
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 знаци)."
@@ -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 "Одберете квадратна површина од сликата за аватар"
@@ -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 "Откажи"
@@ -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:237
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236
msgid "Send"
msgstr "Испрати"
@@ -1839,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 "Запамети ме"
@@ -1903,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 "Нова група"
@@ -2018,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 "Забелешката нема профил"
@@ -2035,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 "Ова не е поддржан формат на податотека."
@@ -2049,7 +2251,7 @@ msgid "Notice Search"
msgstr "Пребарување на забелешки"
#: actions/othersettings.php:60
-msgid "Other Settings"
+msgid "Other settings"
msgstr "Други нагодувања"
#: actions/othersettings.php:71
@@ -2108,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
@@ -2370,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 "Домашна страница"
@@ -2982,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 "Не можев да ги вратам омилените забелешки."
@@ -3095,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 "Создадено"
@@ -3501,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."
@@ -3525,7 +3799,7 @@ msgstr "Ова е погрешен потврден број."
#: actions/smssettings.php:405
msgid "That is not your phone number."
-msgstr "Тоа не е вашиот телефонски број."
+msgstr "Тоа не е Вашиот телефонски број."
#: actions/smssettings.php:465
msgid "Mobile carrier"
@@ -4027,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 "Верзија"
@@ -4039,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 ""
@@ -4064,19 +4330,16 @@ 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 "Профил на група"
+msgstr "Зачленувањето во групата не успеа."
#: classes/Group_member.php:53
-#, fuzzy
msgid "Not part of group."
-msgstr "Не можев да ја подновам групата."
+msgstr "Не е дел од групата."
#: classes/Group_member.php:60
-#, fuzzy
msgid "Group leave failed."
-msgstr "Профил на група"
+msgstr "Напуштањето на групата не успеа."
#: classes/Login_token.php:76
#, php-format
@@ -4204,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 "Промена на е-пошта, аватар, лозинка, профил"
@@ -4361,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 "Не можете да ја менувате оваа веб-страница."
@@ -4397,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 "Прилози"
@@ -4417,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 "Менувањето на лозинка не е дозволено"
@@ -4754,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 "Грешка во базата на податоци"
@@ -4946,9 +5271,9 @@ msgid "[%s]"
msgstr "[%s]"
#: lib/jabber.php:385
-#, fuzzy, php-format
+#, php-format
msgid "Unknown inbox source %d."
-msgstr "Непознат јазик „%s“"
+msgstr "Непознат извор на приемна пошта %d."
#: lib/joinform.php:114
msgid "Join"
@@ -5349,14 +5674,12 @@ msgid "Do not share my location"
msgstr "Не ја прикажувај мојата локација"
#: lib/noticeform.php:216
-msgid "Hide this info"
-msgstr "Сокриј го ова инфо"
-
-#: lib/noticeform.php:217
msgid ""
"Sorry, retrieving your geo location is taking longer than expected, please "
"try again later"
msgstr ""
+"Жалиме, но добивањето на Вашата местоположба трае подолго од очекуваното. "
+"Обидете се подоцна."
#: lib/noticelist.php:428
#, php-format
@@ -5706,47 +6029,47 @@ msgstr "Порака"
msgid "Moderate"
msgstr "Модерирај"
-#: lib/util.php:877
+#: lib/util.php:875
msgid "a few seconds ago"
msgstr "пред неколку секунди"
-#: lib/util.php:879
+#: lib/util.php:877
msgid "about a minute ago"
msgstr "пред една минута"
-#: lib/util.php:881
+#: lib/util.php:879
#, php-format
msgid "about %d minutes ago"
msgstr "пред %d минути"
-#: lib/util.php:883
+#: lib/util.php:881
msgid "about an hour ago"
msgstr "пред еден час"
-#: lib/util.php:885
+#: lib/util.php:883
#, php-format
msgid "about %d hours ago"
msgstr "пред %d часа"
-#: lib/util.php:887
+#: lib/util.php:885
msgid "about a day ago"
msgstr "пред еден ден"
-#: lib/util.php:889
+#: lib/util.php:887
#, php-format
msgid "about %d days ago"
msgstr "пред %d денови"
-#: lib/util.php:891
+#: lib/util.php:889
msgid "about a month ago"
msgstr "пред еден месец"
-#: lib/util.php:893
+#: lib/util.php:891
#, php-format
msgid "about %d months ago"
msgstr "пред %d месеца"
-#: lib/util.php:895
+#: 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 5fe48460e..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-13 22:04+0000\n"
-"PO-Revision-Date: 2010-01-13 22:05:46+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 (r61027); 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
@@ -50,8 +50,13 @@ msgstr "Ingen slik side"
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)."
@@ -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 ""
@@ -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"
@@ -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:237
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236
msgid "Send"
msgstr "Send"
@@ -1819,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"
@@ -1879,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 ""
@@ -1983,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 ""
@@ -2000,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 ""
@@ -2015,7 +2227,7 @@ msgstr ""
#: actions/othersettings.php:60
#, fuzzy
-msgid "Other Settings"
+msgid "Other settings"
msgstr "Innstillinger for IM"
#: actions/othersettings.php:71
@@ -2339,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"
@@ -2929,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 ""
@@ -3036,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"
@@ -3920,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"
@@ -3934,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 ""
@@ -4096,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 ""
@@ -4254,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 ""
@@ -4290,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 ""
@@ -4311,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"
@@ -4614,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 ""
@@ -5133,10 +5474,6 @@ msgid "Do not share my location"
msgstr "Klarte ikke å lagre profil."
#: lib/noticeform.php:216
-msgid "Hide this info"
-msgstr ""
-
-#: lib/noticeform.php:217
msgid ""
"Sorry, retrieving your geo location is taking longer than expected, please "
"try again later"
@@ -5507,47 +5844,47 @@ msgstr ""
msgid "Moderate"
msgstr ""
-#: lib/util.php:877
+#: lib/util.php:875
msgid "a few seconds ago"
msgstr "noen få sekunder siden"
-#: lib/util.php:879
+#: lib/util.php:877
msgid "about a minute ago"
msgstr "omtrent ett minutt siden"
-#: lib/util.php:881
+#: lib/util.php:879
#, php-format
msgid "about %d minutes ago"
msgstr "omtrent %d minutter siden"
-#: lib/util.php:883
+#: lib/util.php:881
msgid "about an hour ago"
msgstr "omtrent én time siden"
-#: lib/util.php:885
+#: lib/util.php:883
#, php-format
msgid "about %d hours ago"
msgstr "omtrent %d timer siden"
-#: lib/util.php:887
+#: lib/util.php:885
msgid "about a day ago"
msgstr "omtrent én dag siden"
-#: lib/util.php:889
+#: lib/util.php:887
#, php-format
msgid "about %d days ago"
msgstr "omtrent %d dager siden"
-#: lib/util.php:891
+#: lib/util.php:889
msgid "about a month ago"
msgstr "omtrent én måned siden"
-#: lib/util.php:893
+#: lib/util.php:891
#, php-format
msgid "about %d months ago"
msgstr "omtrent %d måneder siden"
-#: lib/util.php:895
+#: 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 ade4434a5..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-13 22:04+0000\n"
-"PO-Revision-Date: 2010-01-13 22:05:52+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 (r61027); 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
@@ -52,8 +52,13 @@ msgstr "Deze pagina bestaat niet"
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)."
@@ -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 ""
@@ -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"
@@ -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:237
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236
msgid "Send"
msgstr "Verzenden"
@@ -1855,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"
@@ -1918,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"
@@ -2031,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"
@@ -2048,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."
@@ -2062,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
@@ -2381,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"
@@ -2997,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."
@@ -3111,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"
@@ -4047,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"
@@ -4059,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 ""
@@ -4085,19 +4360,16 @@ msgstr ""
"Een bestand van deze grootte overschijdt uw maandelijkse quota van %d bytes."
#: classes/Group_member.php:41
-#, fuzzy
msgid "Group join failed."
-msgstr "Groepsprofiel"
+msgstr "Groepslidmaatschap toevoegen is mislukt."
#: classes/Group_member.php:53
-#, fuzzy
msgid "Not part of group."
-msgstr "Het was niet mogelijk de groep bij te werken."
+msgstr "Geen lid van groep."
#: classes/Group_member.php:60
-#, fuzzy
msgid "Group leave failed."
-msgstr "Groepsprofiel"
+msgstr "Groepslidmaatschap opzeggen is mislukt."
#: classes/Login_token.php:76
#, php-format
@@ -4231,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"
@@ -4388,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."
@@ -4424,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"
@@ -4444,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"
@@ -4788,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"
@@ -4980,9 +5314,9 @@ msgid "[%s]"
msgstr "[%s]"
#: lib/jabber.php:385
-#, fuzzy, php-format
+#, php-format
msgid "Unknown inbox source %d."
-msgstr "De taal \"%s\" is niet bekend."
+msgstr "Onbekende bron Postvak IN %d."
#: lib/joinform.php:114
msgid "Join"
@@ -5382,14 +5716,12 @@ msgid "Do not share my location"
msgstr "Mijn locatie niet bekend maken"
#: lib/noticeform.php:216
-msgid "Hide this info"
-msgstr "Deze informatie verbergen"
-
-#: lib/noticeform.php:217
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
@@ -5739,47 +6071,47 @@ msgstr "Bericht"
msgid "Moderate"
msgstr "Modereren"
-#: lib/util.php:877
+#: lib/util.php:875
msgid "a few seconds ago"
msgstr "een paar seconden geleden"
-#: lib/util.php:879
+#: lib/util.php:877
msgid "about a minute ago"
msgstr "ongeveer een minuut geleden"
-#: lib/util.php:881
+#: lib/util.php:879
#, php-format
msgid "about %d minutes ago"
msgstr "ongeveer %d minuten geleden"
-#: lib/util.php:883
+#: lib/util.php:881
msgid "about an hour ago"
msgstr "ongeveer een uur geleden"
-#: lib/util.php:885
+#: lib/util.php:883
#, php-format
msgid "about %d hours ago"
msgstr "ongeveer %d uur geleden"
-#: lib/util.php:887
+#: lib/util.php:885
msgid "about a day ago"
msgstr "ongeveer een dag geleden"
-#: lib/util.php:889
+#: lib/util.php:887
#, php-format
msgid "about %d days ago"
msgstr "ongeveer %d dagen geleden"
-#: lib/util.php:891
+#: lib/util.php:889
msgid "about a month ago"
msgstr "ongeveer een maand geleden"
-#: lib/util.php:893
+#: lib/util.php:891
#, php-format
msgid "about %d months ago"
msgstr "ongeveer %d maanden geleden"
-#: lib/util.php:895
+#: 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 5bba0e8b0..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-13 22:04+0000\n"
-"PO-Revision-Date: 2010-01-13 22:05:49+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 (r61027); 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
@@ -50,8 +50,13 @@ msgstr "Dette emneord finst ikkje."
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)."
@@ -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."
@@ -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"
@@ -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:237
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236
msgid "Send"
msgstr "Send"
@@ -1852,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"
@@ -1916,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"
@@ -2027,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"
@@ -2045,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."
@@ -2059,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
@@ -2393,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"
@@ -2997,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."
@@ -3102,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"
@@ -4019,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"
@@ -4033,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 ""
@@ -4197,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"
@@ -4358,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."
@@ -4402,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 ""
@@ -4423,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"
@@ -4729,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 ""
@@ -5250,10 +5603,6 @@ msgid "Do not share my location"
msgstr "Kan ikkje lagra merkelapp."
#: lib/noticeform.php:216
-msgid "Hide this info"
-msgstr ""
-
-#: lib/noticeform.php:217
msgid ""
"Sorry, retrieving your geo location is taking longer than expected, please "
"try again later"
@@ -5629,47 +5978,47 @@ msgstr "Melding"
msgid "Moderate"
msgstr ""
-#: lib/util.php:877
+#: lib/util.php:875
msgid "a few seconds ago"
msgstr "eit par sekund sidan"
-#: lib/util.php:879
+#: lib/util.php:877
msgid "about a minute ago"
msgstr "omtrent eitt minutt sidan"
-#: lib/util.php:881
+#: lib/util.php:879
#, php-format
msgid "about %d minutes ago"
msgstr "~%d minutt sidan"
-#: lib/util.php:883
+#: lib/util.php:881
msgid "about an hour ago"
msgstr "omtrent ein time sidan"
-#: lib/util.php:885
+#: lib/util.php:883
#, php-format
msgid "about %d hours ago"
msgstr "~%d timar sidan"
-#: lib/util.php:887
+#: lib/util.php:885
msgid "about a day ago"
msgstr "omtrent ein dag sidan"
-#: lib/util.php:889
+#: lib/util.php:887
#, php-format
msgid "about %d days ago"
msgstr "~%d dagar sidan"
-#: lib/util.php:891
+#: lib/util.php:889
msgid "about a month ago"
msgstr "omtrent ein månad sidan"
-#: lib/util.php:893
+#: lib/util.php:891
#, php-format
msgid "about %d months ago"
msgstr "~%d månadar sidan"
-#: lib/util.php:895
+#: 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 9e8414dc1..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-13 22:04+0000\n"
-"PO-Revision-Date: 2010-01-13 22:05:55+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 (r61027); 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
@@ -55,8 +55,13 @@ msgstr "Nie ma takiej strony"
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)."
@@ -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"
@@ -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"
@@ -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:237
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236
msgid "Send"
msgstr "Wyślij"
@@ -1825,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"
@@ -1890,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"
@@ -2003,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"
@@ -2020,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."
@@ -2034,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
@@ -2351,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"
@@ -2959,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."
@@ -3072,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"
@@ -4000,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"
@@ -4012,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 ""
@@ -4039,19 +4303,16 @@ msgstr ""
"d bajty."
#: classes/Group_member.php:41
-#, fuzzy
msgid "Group join failed."
-msgstr "Profil grupy"
+msgstr "Dołączenie do grupy nie powiodło się."
#: classes/Group_member.php:53
-#, fuzzy
msgid "Not part of group."
-msgstr "Nie można zaktualizować grupy."
+msgstr "Nie jest częścią grupy."
#: classes/Group_member.php:60
-#, fuzzy
msgid "Group leave failed."
-msgstr "Profil grupy"
+msgstr "Opuszczenie grupy nie powiodło się."
#: classes/Login_token.php:76
#, php-format
@@ -4179,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"
@@ -4336,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."
@@ -4372,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"
@@ -4392,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"
@@ -4733,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"
@@ -4925,9 +5248,9 @@ msgid "[%s]"
msgstr "[%s]"
#: lib/jabber.php:385
-#, fuzzy, php-format
+#, php-format
msgid "Unknown inbox source %d."
-msgstr "Nieznany język \"%s\"."
+msgstr "Nieznane źródło skrzynki odbiorczej %d."
#: lib/joinform.php:114
msgid "Join"
@@ -5322,14 +5645,12 @@ msgid "Do not share my location"
msgstr "Nie ujawniaj położenia"
#: lib/noticeform.php:216
-msgid "Hide this info"
-msgstr "Ukryj tę informację"
-
-#: lib/noticeform.php:217
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
@@ -5678,47 +5999,47 @@ msgstr "Wiadomość"
msgid "Moderate"
msgstr "Moderuj"
-#: lib/util.php:877
+#: lib/util.php:875
msgid "a few seconds ago"
msgstr "kilka sekund temu"
-#: lib/util.php:879
+#: lib/util.php:877
msgid "about a minute ago"
msgstr "około minutę temu"
-#: lib/util.php:881
+#: lib/util.php:879
#, php-format
msgid "about %d minutes ago"
msgstr "około %d minut temu"
-#: lib/util.php:883
+#: lib/util.php:881
msgid "about an hour ago"
msgstr "około godzinę temu"
-#: lib/util.php:885
+#: lib/util.php:883
#, php-format
msgid "about %d hours ago"
msgstr "około %d godzin temu"
-#: lib/util.php:887
+#: lib/util.php:885
msgid "about a day ago"
msgstr "blisko dzień temu"
-#: lib/util.php:889
+#: lib/util.php:887
#, php-format
msgid "about %d days ago"
msgstr "około %d dni temu"
-#: lib/util.php:891
+#: lib/util.php:889
msgid "about a month ago"
msgstr "około miesiąc temu"
-#: lib/util.php:893
+#: lib/util.php:891
#, php-format
msgid "about %d months ago"
msgstr "około %d miesięcy temu"
-#: lib/util.php:895
+#: 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 f635266d1..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-13 22:04+0000\n"
-"PO-Revision-Date: 2010-01-13 22:05:58+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 (r61027); 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
@@ -51,8 +51,13 @@ msgstr "Página não encontrada."
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)."
@@ -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"
@@ -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"
@@ -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:237
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236
msgid "Send"
msgstr "Enviar"
@@ -1827,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"
@@ -1892,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"
@@ -2004,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"
@@ -2021,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."
@@ -2035,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
@@ -2359,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"
@@ -2969,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."
@@ -3082,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"
@@ -4007,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"
@@ -4019,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 ""
@@ -4184,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"
@@ -4341,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."
@@ -4377,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"
@@ -4397,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"
@@ -4733,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"
@@ -5324,10 +5680,6 @@ msgid "Do not share my location"
msgstr "Não partilhar a minha localização."
#: lib/noticeform.php:216
-msgid "Hide this info"
-msgstr "Ocultar esta informação"
-
-#: lib/noticeform.php:217
msgid ""
"Sorry, retrieving your geo location is taking longer than expected, please "
"try again later"
@@ -5680,47 +6032,47 @@ msgstr "Mensagem"
msgid "Moderate"
msgstr "Moderar"
-#: lib/util.php:877
+#: lib/util.php:875
msgid "a few seconds ago"
msgstr "há alguns segundos"
-#: lib/util.php:879
+#: lib/util.php:877
msgid "about a minute ago"
msgstr "há cerca de um minuto"
-#: lib/util.php:881
+#: lib/util.php:879
#, php-format
msgid "about %d minutes ago"
msgstr "há cerca de %d minutos"
-#: lib/util.php:883
+#: lib/util.php:881
msgid "about an hour ago"
msgstr "há cerca de uma hora"
-#: lib/util.php:885
+#: lib/util.php:883
#, php-format
msgid "about %d hours ago"
msgstr "há cerca de %d horas"
-#: lib/util.php:887
+#: lib/util.php:885
msgid "about a day ago"
msgstr "há cerca de um dia"
-#: lib/util.php:889
+#: lib/util.php:887
#, php-format
msgid "about %d days ago"
msgstr "há cerca de %d dias"
-#: lib/util.php:891
+#: lib/util.php:889
msgid "about a month ago"
msgstr "há cerca de um mês"
-#: lib/util.php:893
+#: lib/util.php:891
#, php-format
msgid "about %d months ago"
msgstr "há cerca de %d meses"
-#: lib/util.php:895
+#: 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 cd0bdedd7..3b07494f2 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-13 22:04+0000\n"
-"PO-Revision-Date: 2010-01-13 22:06:02+0000\n"
+"POT-Creation-Date: 2010-01-18 23:16+0000\n"
+"PO-Revision-Date: 2010-01-18 23:19:44+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 (r61027); Translate extension (2010-01-04)\n"
+"X-Generator: MediaWiki 1.16alpha (r61218); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: pt-br\n"
"X-Message-Group: out-statusnet\n"
@@ -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
@@ -52,8 +52,13 @@ msgstr "Esta página não existe."
msgid "No such user."
msgstr "Este usuário não existe."
+#: actions/all.php:84
+#, php-format
+msgid "%1$s and friends, page %2$d"
+msgstr "%1$s e amigos, 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)."
@@ -397,18 +402,18 @@ 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:124
-#, fuzzy, php-format
+#, 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:119
-#, fuzzy, php-format
+#, 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"
@@ -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"
@@ -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:237
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236
msgid "Send"
msgstr "Enviar"
@@ -1811,9 +1954,9 @@ msgid "You must be logged in to join a group."
msgstr "Você deve estar autenticado para se associar a um grupo."
#: actions/joingroup.php:131
-#, fuzzy, php-format
+#, 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."
@@ -1824,9 +1967,9 @@ msgid "You are not a member of that group."
msgstr "Você não é um membro desse grupo."
#: actions/leavegroup.php:127
-#, fuzzy, php-format
+#, 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."
@@ -1850,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"
@@ -1899,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"
@@ -1954,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"
@@ -1984,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
@@ -2032,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"
@@ -2049,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."
@@ -2063,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
@@ -2095,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
@@ -2318,7 +2509,6 @@ msgid "When to use SSL"
msgstr "Quando usar SSL"
#: actions/pathsadminpanel.php:308
-#, fuzzy
msgid "SSL server"
msgstr "Servidor SSL"
@@ -2349,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"
@@ -2389,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"
@@ -2817,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"
@@ -2834,10 +3024,10 @@ msgid ""
"\n"
"Thanks for signing up and we hope you enjoy using this service."
msgstr ""
-"Parabéns, %s! E bem-vindo(a) a %%%%site.name%%%%. A partir daqui, você "
+"Parabéns, %1$s! E bem-vindo(a) a %%%%site.name%%%%. A partir daqui, você "
"pode...\n"
"\n"
-"* Acessar [seu perfil](%s) e publicar sua primeira mensagem.\n"
+"* Acessar [seu perfil](%2$s) e publicar sua primeira mensagem.\n"
"* Adicionar um [endereço de Jabber/GTalk](%%%%action.imsettings%%%%) para "
"que você possa publicar via mensagens instantâneas.\n"
"* [Procurar pessoas](%%%%action.peoplesearch%%%%) que você conheça ou que "
@@ -2961,13 +3151,13 @@ msgid "Replies feed for %s (Atom)"
msgstr "Fonte de respostas para %s (Atom)"
#: actions/replies.php:198
-#, fuzzy, php-format
+#, php-format
msgid ""
"This is the timeline showing replies to %1$s but %2$s hasn't received a "
"notice to his attention yet."
msgstr ""
-"Esse é o fluxo de mensagens de resposta para %s, mas %s ainda não recebeu "
-"nenhuma mensagem direcionada a ele(a)."
+"Esse é o fluxo de mensagens de resposta para %1$s, mas %2$s ainda não "
+"recebeu nenhuma mensagem direcionada a ele(a)."
#: actions/replies.php:203
#, php-format
@@ -2979,13 +3169,14 @@ msgstr ""
"pessoas ou [associe-se a grupos](%%action.groups%%)."
#: actions/replies.php:205
-#, fuzzy, php-format
+#, php-format
msgid ""
"You can try to [nudge %1$s](../%2$s) or [post something to his or her "
"attention](%%%%action.newnotice%%%%?status_textarea=%3$s)."
msgstr ""
-"Você pode tentar [chamar a atenção de %s](../%s) ou [publicar alguma coisa "
-"que desperte seu interesse](%%%%action.newnotice%%%%?status_textarea=%s)."
+"Você pode tentar [chamar a atenção de %1$s](../%2$s) ou [publicar alguma "
+"coisa que desperte seu interesse](%%%%action.newnotice%%%%?status_textarea=%3"
+"$s)."
#: actions/repliesrss.php:72
#, php-format
@@ -3000,6 +3191,82 @@ msgstr "Você não pode colocar usuários deste site em isolamento."
msgid "User is already sandboxed."
msgstr "O usuário já está em isolamento."
+#: actions/showapplication.php:82
+msgid "You must be logged in to view an application."
+msgstr "Você deve estar autenticado para visualizar uma aplicação."
+
+#: actions/showapplication.php:158
+msgid "Application profile"
+msgstr "Perfil da aplicação"
+
+#: actions/showapplication.php:160 lib/applicationeditform.php:182
+msgid "Icon"
+msgstr "Ícone"
+
+#: actions/showapplication.php:170 actions/version.php:195
+#: lib/applicationeditform.php:197
+msgid "Name"
+msgstr "Nome"
+
+#: actions/showapplication.php:179 lib/applicationeditform.php:224
+msgid "Organization"
+msgstr "Organização"
+
+#: actions/showapplication.php:188 actions/version.php:198
+#: lib/applicationeditform.php:211 lib/groupeditform.php:172
+msgid "Description"
+msgstr "Descrição"
+
+#: actions/showapplication.php:193 actions/showgroup.php:429
+#: lib/profileaction.php:174
+msgid "Statistics"
+msgstr "Estatísticas"
+
+#: actions/showapplication.php:204
+#, php-format
+msgid "created by %1$s - %2$s access by default - %3$d users"
+msgstr "criado por %1$s - %2$s acessa por padrão - %3$d usuários"
+
+#: actions/showapplication.php:214
+msgid "Application actions"
+msgstr "Ações da aplicação"
+
+#: actions/showapplication.php:233
+msgid "Reset key & secret"
+msgstr "Restaurar a chave e o segredo"
+
+#: actions/showapplication.php:241
+msgid "Application info"
+msgstr "Informação da aplicação"
+
+#: actions/showapplication.php:243
+msgid "Consumer key"
+msgstr "Chave do consumidor"
+
+#: actions/showapplication.php:248
+msgid "Consumer secret"
+msgstr "Segredo do consumidor"
+
+#: actions/showapplication.php:253
+msgid "Request token URL"
+msgstr "URL do token de requisição"
+
+#: actions/showapplication.php:258
+msgid "Access token URL"
+msgstr "URL do token de acesso"
+
+#: actions/showapplication.php:263
+msgid "Authorize URL"
+msgstr "Autorizar a URL"
+
+#: actions/showapplication.php:268
+msgid ""
+"Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
+"signature method."
+msgstr ""
+"Nota: Nós suportamos assinaturas HMAC-SHA1. Nós não suportamos o método de "
+"assinatura em texto plano."
+
#: actions/showfavorites.php:132
msgid "Could not retrieve favorite notices."
msgstr "Não foi possível recuperar as mensagens favoritas."
@@ -3113,10 +3380,6 @@ msgstr "(Nenhum)"
msgid "All members"
msgstr "Todos os membros"
-#: actions/showgroup.php:429 lib/profileaction.php:174
-msgid "Statistics"
-msgstr "Estatísticas"
-
#: actions/showgroup.php:432
msgid "Created"
msgstr "Criado"
@@ -3182,9 +3445,9 @@ msgid " tagged %s"
msgstr " etiquetada %s"
#: actions/showstream.php:122
-#, fuzzy, php-format
+#, php-format
msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
-msgstr "Fonte de mensagens de %s etiquetada %s (RSS 1.0)"
+msgstr "Fonte de mensagens de %1$s etiquetada como %2$s (RSS 1.0)"
#: actions/showstream.php:129
#, php-format
@@ -3207,10 +3470,11 @@ msgid "FOAF for %s"
msgstr "FOAF de %s"
#: actions/showstream.php:191
-#, fuzzy, php-format
+#, php-format
msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
msgstr ""
-"Este é o fluxo público de mensagens de %s, mas %s não publicou nada ainda."
+"Este é o fluxo público de mensagens de %1$s, mas %2$s não publicou nada "
+"ainda."
#: actions/showstream.php:196
msgid ""
@@ -3221,13 +3485,13 @@ msgstr ""
"mensagem. Que tal começar agora? :)"
#: actions/showstream.php:198
-#, fuzzy, php-format
+#, php-format
msgid ""
"You can try to nudge %1$s or [post something to his or her attention](%%%%"
"action.newnotice%%%%?status_textarea=%2$s)."
msgstr ""
-"Você pode tentar chamar a atenção de %s ou [publicar alguma coisa que "
-"desperte seu interesse](%%%%action.newnotice%%%%?status_textarea=%s)."
+"Você pode tentar chamar a atenção de %1$s ou [publicar alguma coisa que "
+"desperte seu interesse](%%%%action.newnotice%%%%?status_textarea=%2$s)."
#: actions/showstream.php:234
#, php-format
@@ -3276,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."
@@ -3464,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
@@ -3494,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"
@@ -3585,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."
@@ -3626,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."
@@ -3756,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
@@ -3919,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
@@ -3986,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
@@ -3996,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 ""
@@ -4013,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 ""
@@ -4021,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
@@ -4028,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
@@ -4072,19 +4333,16 @@ 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
-#, fuzzy
msgid "Group join failed."
-msgstr "Perfil do grupo"
+msgstr "Não foi possível se unir ao grupo."
#: classes/Group_member.php:53
-#, fuzzy
msgid "Not part of group."
-msgstr "Não foi possível atualizar o grupo."
+msgstr "Não é parte de um grupo."
#: classes/Group_member.php:60
-#, fuzzy
msgid "Group leave failed."
-msgstr "Perfil do grupo"
+msgstr "Não foi possível deixar o grupo."
#: classes/Login_token.php:76
#, php-format
@@ -4139,12 +4397,12 @@ msgstr "Você está proibido de publicar mensagens neste site."
msgid "Problem saving notice."
msgstr "Problema no salvamento da mensagem."
-#: classes/Notice.php:1052
+#: classes/Notice.php:1059
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Erro no banco de dados na inserção da reposta: %s"
-#: classes/Notice.php:1423
+#: classes/Notice.php:1441
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -4191,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"
@@ -4212,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"
@@ -4369,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."
@@ -4406,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"
@@ -4426,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"
@@ -4767,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"
@@ -4959,9 +5276,9 @@ msgid "[%s]"
msgstr "[%s]"
#: lib/jabber.php:385
-#, fuzzy, php-format
+#, php-format
msgid "Unknown inbox source %d."
-msgstr "Idioma desconhecido \"%s\""
+msgstr "Fonte da caixa de entrada desconhecida %d."
#: lib/joinform.php:114
msgid "Join"
@@ -5043,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
@@ -5261,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."
@@ -5302,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
@@ -5321,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."
@@ -5355,24 +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:215
-#, fuzzy
msgid "Do not share my location"
-msgstr "Indique a sua localização"
+msgstr "Não divulgar minha localização"
#: lib/noticeform.php:216
-msgid "Hide this info"
-msgstr ""
-
-#: lib/noticeform.php:217
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
@@ -5489,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"
@@ -5722,47 +6030,47 @@ msgstr "Mensagem"
msgid "Moderate"
msgstr "Moderar"
-#: lib/util.php:877
+#: lib/util.php:875
msgid "a few seconds ago"
msgstr "alguns segundos atrás"
-#: lib/util.php:879
+#: lib/util.php:877
msgid "about a minute ago"
msgstr "cerca de 1 minuto atrás"
-#: lib/util.php:881
+#: lib/util.php:879
#, php-format
msgid "about %d minutes ago"
msgstr "cerca de %d minutos atrás"
-#: lib/util.php:883
+#: lib/util.php:881
msgid "about an hour ago"
msgstr "cerca de 1 hora atrás"
-#: lib/util.php:885
+#: lib/util.php:883
#, php-format
msgid "about %d hours ago"
msgstr "cerca de %d horas atrás"
-#: lib/util.php:887
+#: lib/util.php:885
msgid "about a day ago"
msgstr "cerca de 1 dia atrás"
-#: lib/util.php:889
+#: lib/util.php:887
#, php-format
msgid "about %d days ago"
msgstr "cerca de %d dias atrás"
-#: lib/util.php:891
+#: lib/util.php:889
msgid "about a month ago"
msgstr "cerca de 1 mês atrás"
-#: lib/util.php:893
+#: lib/util.php:891
#, php-format
msgid "about %d months ago"
msgstr "cerca de %d meses atrás"
-#: lib/util.php:895
+#: lib/util.php:893
msgid "about a year ago"
msgstr "cerca de 1 ano atrás"
@@ -5777,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 f727147b9..505325bae 100644
--- a/locale/ru/LC_MESSAGES/statusnet.po
+++ b/locale/ru/LC_MESSAGES/statusnet.po
@@ -2,6 +2,7 @@
#
# Author@translatewiki.net: Brion
# Author@translatewiki.net: Lockal
+# Author@translatewiki.net: Rubin
# Author@translatewiki.net: Александр Сигачёв
# --
# This file is distributed under the same license as the StatusNet package.
@@ -10,12 +11,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-13 22:04+0000\n"
-"PO-Revision-Date: 2010-01-13 22:06:06+0000\n"
+"POT-Creation-Date: 2010-01-18 23:16+0000\n"
+"PO-Revision-Date: 2010-01-18 23:19:49+0000\n"
"Language-Team: Russian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r61027); Translate extension (2010-01-04)\n"
+"X-Generator: MediaWiki 1.16alpha (r61218); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ru\n"
"X-Message-Group: out-statusnet\n"
@@ -36,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
@@ -53,8 +54,13 @@ msgstr "Нет такой страницы"
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 +119,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 +141,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 +160,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 +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 ""
@@ -333,7 +340,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 +353,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 символов)"
@@ -422,6 +431,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
+#, 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 "Подберите нужный квадратный участок для вашей аватары"
@@ -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 "Отменить"
@@ -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:237
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236
msgid "Send"
msgstr "ОК"
@@ -1841,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 "Запомнить меня"
@@ -1905,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 "Новая группа"
@@ -2017,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 "Запись без профиля"
@@ -2034,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 "Неподдерживаемый формат данных."
@@ -2048,7 +2264,8 @@ msgid "Notice Search"
msgstr "Поиск в записях"
#: actions/othersettings.php:60
-msgid "Other Settings"
+#, fuzzy
+msgid "Other settings"
msgstr "Другие настройки"
#: actions/othersettings.php:71
@@ -2080,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
@@ -2371,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 "Главная"
@@ -2978,6 +3194,83 @@ msgstr ""
msgid "User is already sandboxed."
msgstr "Пользователь уже в режиме песочницы."
+#: actions/showapplication.php:82
+#, fuzzy
+msgid "You must be logged in to view an application."
+msgstr "Вы должны авторизоваться, чтобы покинуть группу."
+
+#: actions/showapplication.php:158
+#, fuzzy
+msgid "Application profile"
+msgstr "Запись без профиля"
+
+#: actions/showapplication.php:160 lib/applicationeditform.php:182
+msgid "Icon"
+msgstr ""
+
+#: actions/showapplication.php:170 actions/version.php:195
+#: lib/applicationeditform.php:197
+msgid "Name"
+msgstr "Имя"
+
+#: actions/showapplication.php:179 lib/applicationeditform.php:224
+msgid "Organization"
+msgstr "Организация"
+
+#: actions/showapplication.php:188 actions/version.php:198
+#: lib/applicationeditform.php:211 lib/groupeditform.php:172
+msgid "Description"
+msgstr "Описание"
+
+#: actions/showapplication.php:193 actions/showgroup.php:429
+#: lib/profileaction.php:174
+msgid "Statistics"
+msgstr "Статистика"
+
+#: actions/showapplication.php:204
+#, php-format
+msgid "created by %1$s - %2$s access by default - %3$d users"
+msgstr ""
+
+#: actions/showapplication.php:214
+msgid "Application actions"
+msgstr ""
+
+#: actions/showapplication.php:233
+msgid "Reset key & secret"
+msgstr ""
+
+#: actions/showapplication.php:241
+msgid "Application info"
+msgstr ""
+
+#: actions/showapplication.php:243
+msgid "Consumer key"
+msgstr ""
+
+#: actions/showapplication.php:248
+msgid "Consumer secret"
+msgstr ""
+
+#: actions/showapplication.php:253
+msgid "Request token URL"
+msgstr ""
+
+#: actions/showapplication.php:258
+msgid "Access token URL"
+msgstr ""
+
+#: actions/showapplication.php:263
+#, fuzzy
+msgid "Authorize URL"
+msgstr "Автор"
+
+#: actions/showapplication.php:268
+msgid ""
+"Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
+"signature method."
+msgstr ""
+
#: actions/showfavorites.php:132
msgid "Could not retrieve favorite notices."
msgstr "Не удаётся восстановить любимые записи."
@@ -3090,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 "Создано"
@@ -4022,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 "Версия"
@@ -4034,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 ""
@@ -4125,12 +4406,12 @@ msgstr "Вам запрещено поститься на этом сайте (
msgid "Problem saving notice."
msgstr "Проблемы с сохранением записи."
-#: classes/Notice.php:1052
+#: classes/Notice.php:1059
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Ошибка баз данных при вставке ответа для %s"
-#: classes/Notice.php:1423
+#: classes/Notice.php:1441
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -4198,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, аватару, пароль, профиль"
@@ -4356,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 "Вы не можете изменять этот сайт."
@@ -4392,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 "Вложения"
@@ -4412,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 "Смена пароля не разрешена"
@@ -4749,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 "Ошибка базы данных"
@@ -5335,15 +5683,10 @@ msgid "Share my location"
msgstr "Поделиться своим местоположением."
#: lib/noticeform.php:215
-#, fuzzy
msgid "Do not share my location"
-msgstr "Не публиковать своё местоположение."
+msgstr "Не публиковать своё местоположение"
#: lib/noticeform.php:216
-msgid "Hide this info"
-msgstr "Скрыть эту информацию"
-
-#: lib/noticeform.php:217
msgid ""
"Sorry, retrieving your geo location is taking longer than expected, please "
"try again later"
@@ -5696,47 +6039,47 @@ msgstr "Сообщение"
msgid "Moderate"
msgstr "Модерировать"
-#: lib/util.php:877
+#: lib/util.php:875
msgid "a few seconds ago"
msgstr "пару секунд назад"
-#: lib/util.php:879
+#: lib/util.php:877
msgid "about a minute ago"
msgstr "около минуты назад"
-#: lib/util.php:881
+#: lib/util.php:879
#, php-format
msgid "about %d minutes ago"
msgstr "около %d минут(ы) назад"
-#: lib/util.php:883
+#: lib/util.php:881
msgid "about an hour ago"
msgstr "около часа назад"
-#: lib/util.php:885
+#: lib/util.php:883
#, php-format
msgid "about %d hours ago"
msgstr "около %d часа(ов) назад"
-#: lib/util.php:887
+#: lib/util.php:885
msgid "about a day ago"
msgstr "около дня назад"
-#: lib/util.php:889
+#: lib/util.php:887
#, php-format
msgid "about %d days ago"
msgstr "около %d дня(ей) назад"
-#: lib/util.php:891
+#: lib/util.php:889
msgid "about a month ago"
msgstr "около месяца назад"
-#: lib/util.php:893
+#: lib/util.php:891
#, php-format
msgid "about %d months ago"
msgstr "около %d месяца(ев) назад"
-#: lib/util.php:895
+#: lib/util.php:893
msgid "about a year ago"
msgstr "около года назад"
diff --git a/locale/statusnet.po b/locale/statusnet.po
index fb8fd0ad6..9c28de802 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-13 22:04+0000\n"
+"POT-Creation-Date: 2010-01-19 23:52+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
@@ -48,8 +48,13 @@ msgstr ""
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 ""
@@ -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 ""
@@ -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 ""
@@ -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:237
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236
msgid "Send"
msgstr ""
@@ -1727,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 ""
@@ -1786,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 ""
@@ -1890,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 ""
@@ -1907,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 ""
@@ -1921,7 +2120,7 @@ msgid "Notice Search"
msgstr ""
#: actions/othersettings.php:60
-msgid "Other Settings"
+msgid "Other settings"
msgstr ""
#: actions/othersettings.php:71
@@ -2233,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 ""
@@ -2787,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 ""
@@ -2892,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 ""
@@ -3747,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 ""
@@ -3759,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 ""
@@ -3841,12 +4102,12 @@ msgstr ""
msgid "Problem saving notice."
msgstr ""
-#: classes/Notice.php:1052
+#: classes/Notice.php:1059
#, php-format
msgid "DB error inserting reply: %s"
msgstr ""
-#: classes/Notice.php:1423
+#: classes/Notice.php:1441
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
@@ -3914,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 ""
@@ -4066,10 +4323,6 @@ msgstr ""
msgid "Before"
msgstr ""
-#: lib/action.php:1167
-msgid "There was a problem with your session token."
-msgstr ""
-
#: lib/adminpanelaction.php:96
msgid "You cannot make changes to this site."
msgstr ""
@@ -4102,6 +4355,67 @@ msgstr ""
msgid "Paths configuration"
msgstr ""
+#: lib/applicationeditform.php:186
+msgid "Icon for this application"
+msgstr ""
+
+#: lib/applicationeditform.php:206
+#, php-format
+msgid "Describe your application in %d characters"
+msgstr ""
+
+#: lib/applicationeditform.php:209
+msgid "Describe your application"
+msgstr ""
+
+#: lib/applicationeditform.php:218
+msgid "Source URL"
+msgstr ""
+
+#: lib/applicationeditform.php:220
+msgid "URL of the homepage of this application"
+msgstr ""
+
+#: lib/applicationeditform.php:226
+msgid "Organization responsible for this application"
+msgstr ""
+
+#: lib/applicationeditform.php:232
+msgid "URL for the homepage of the organization"
+msgstr ""
+
+#: lib/applicationeditform.php:238
+msgid "URL to redirect to after authentication"
+msgstr ""
+
+#: lib/applicationeditform.php:260
+msgid "Browser"
+msgstr ""
+
+#: lib/applicationeditform.php:276
+msgid "Desktop"
+msgstr ""
+
+#: lib/applicationeditform.php:277
+msgid "Type of application, browser or desktop"
+msgstr ""
+
+#: lib/applicationeditform.php:299
+msgid "Read-only"
+msgstr ""
+
+#: lib/applicationeditform.php:317
+msgid "Read-write"
+msgstr ""
+
+#: lib/applicationeditform.php:318
+msgid "Default access for this application: read-only, or read-write"
+msgstr ""
+
+#: lib/applicationlist.php:154
+msgid "Revoke"
+msgstr ""
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr ""
@@ -4122,11 +4436,11 @@ msgstr ""
msgid "Tags for this attachment"
msgstr ""
-#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187
+#: lib/authenticationplugin.php:214 lib/authenticationplugin.php:219
msgid "Password changing failed"
msgstr ""
-#: lib/authenticationplugin.php:197
+#: lib/authenticationplugin.php:229
msgid "Password changing is not allowed"
msgstr ""
@@ -4416,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 ""
@@ -4913,10 +5235,6 @@ msgid "Do not share my location"
msgstr ""
#: lib/noticeform.php:216
-msgid "Hide this info"
-msgstr ""
-
-#: lib/noticeform.php:217
msgid ""
"Sorry, retrieving your geo location is taking longer than expected, please "
"try again later"
@@ -5269,47 +5587,47 @@ msgstr ""
msgid "Moderate"
msgstr ""
-#: lib/util.php:877
+#: lib/util.php:875
msgid "a few seconds ago"
msgstr ""
-#: lib/util.php:879
+#: lib/util.php:877
msgid "about a minute ago"
msgstr ""
-#: lib/util.php:881
+#: lib/util.php:879
#, php-format
msgid "about %d minutes ago"
msgstr ""
-#: lib/util.php:883
+#: lib/util.php:881
msgid "about an hour ago"
msgstr ""
-#: lib/util.php:885
+#: lib/util.php:883
#, php-format
msgid "about %d hours ago"
msgstr ""
-#: lib/util.php:887
+#: lib/util.php:885
msgid "about a day ago"
msgstr ""
-#: lib/util.php:889
+#: lib/util.php:887
#, php-format
msgid "about %d days ago"
msgstr ""
-#: lib/util.php:891
+#: lib/util.php:889
msgid "about a month ago"
msgstr ""
-#: lib/util.php:893
+#: lib/util.php:891
#, php-format
msgid "about %d months ago"
msgstr ""
-#: lib/util.php:895
+#: 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 aab154caf..d7e0f19c9 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-13 22:04+0000\n"
-"PO-Revision-Date: 2010-01-13 22:06:09+0000\n"
+"POT-Creation-Date: 2010-01-18 23:16+0000\n"
+"PO-Revision-Date: 2010-01-19 23:55:02+0000\n"
"Language-Team: Swedish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r61027); Translate extension (2010-01-04)\n"
+"X-Generator: MediaWiki 1.16alpha (r61275); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: sv\n"
"X-Message-Group: out-statusnet\n"
@@ -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
@@ -51,8 +51,13 @@ msgstr "Ingen sådan sida"
msgid "No such user."
msgstr "Ingen sådan användare."
+#: actions/all.php:84
+#, php-format
+msgid "%1$s and friends, page %2$d"
+msgstr "%1$s blockerade profiler, sida %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"
@@ -77,7 +82,7 @@ msgstr "Flöden för %ss vänner (Atom)"
#, php-format
msgid ""
"This is the timeline for %s and friends but no one has posted anything yet."
-msgstr "Detta är tidslinjen för %s och vänner men ingen har postat något än."
+msgstr "Detta är tidslinjen för %s och vänner, men ingen har skrivit något än."
#: actions/all.php:132
#, php-format
@@ -86,17 +91,17 @@ msgid ""
"something yourself."
msgstr ""
"Prova att prenumerera på fler personer, [gå med i en grupp](%%action.groups%"
-"%) eller posta något själv."
+"%) eller skriv något själv."
#: 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 ""
-"Du kan prova att [knuffa %s](../%s) från dennes profil eller [posta "
+"Du kan prova att [knuffa %1$s](../%2$s) från dennes profil eller [skriva "
"någonting för hans eller hennes uppmärksamhet](%%%%action.newnotice%%%%?"
-"status_textarea=%s)."
+"status_textarea=%3$s)."
#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
#, php-format
@@ -105,13 +110,13 @@ msgid ""
"post a notice to his or her attention."
msgstr ""
"Varför inte [registrera ett konto](%%%%action.register%%%%) och sedan knuffa "
-"%s eller posta en notis för hans eller hennes uppmärksamhet."
+"%s eller skriva en notis för hans eller hennes uppmärksamhet."
#: actions/all.php:165
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,14 +138,14 @@ 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
#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141
#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
msgid "API method not found."
-msgstr "API-metoden hittades inte"
+msgstr "API-metod hittades inte."
#: actions/apiaccountupdatedeliverydevice.php:85
#: actions/apiaccountupdateprofile.php:89
@@ -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 ""
@@ -262,18 +268,16 @@ msgid "No status found with that ID."
msgstr "Ingen status hittad med det ID:t."
#: actions/apifavoritecreate.php:119
-#, fuzzy
msgid "This status is already a favorite."
-msgstr "Denna status är redan en favorit!"
+msgstr "Denna status är redan en favorit."
#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176
msgid "Could not create favorite."
msgstr "Kunde inte skapa favorit."
#: actions/apifavoritedestroy.php:122
-#, fuzzy
msgid "That status is not a favorite."
-msgstr "Denna status är inte en favorit!"
+msgstr "Denna status är inte en favorit."
#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
msgid "Could not delete favorite."
@@ -293,9 +297,8 @@ msgid "Could not unfollow user: User not found."
msgstr "Kunde inte sluta följa användaren: användaren hittades inte."
#: actions/apifriendshipsdestroy.php:120
-#, fuzzy
msgid "You cannot unfollow yourself."
-msgstr "Du kan inte sluta följa dig själv!"
+msgstr "Du kan inte sluta följa dig själv."
#: actions/apifriendshipsexists.php:94
msgid "Two user ids or screen_names must be supplied."
@@ -303,11 +306,11 @@ msgstr "Två användar-ID:n eller screen_names måste tillhandahållas."
#: actions/apifriendshipsshow.php:135
msgid "Could not determine source user."
-msgstr ""
+msgstr "Kunde inte fastställa användare hos källan."
#: actions/apifriendshipsshow.php:143
msgid "Could not find target user."
-msgstr ""
+msgstr "Kunde inte hitta målanvändare."
#: actions/apigroupcreate.php:164 actions/editgroup.php:182
#: actions/newgroup.php:126 actions/profilesettings.php:215
@@ -328,7 +331,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,10 +344,11 @@ 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)"
+msgstr "Beskrivning är för lång (max 140 tecken)."
#: actions/apigroupcreate.php:224 actions/editgroup.php:204
#: actions/newgroup.php:148 actions/profilesettings.php:232
@@ -389,18 +394,18 @@ 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:124
-#, fuzzy, php-format
+#, php-format
msgid "Could not join user %1$s to group %2$s."
-msgstr "Kunde inte ansluta användare % till grupp %s."
+msgstr "Kunde inte ansluta användare %1$s till grupp %2$s."
#: actions/apigroupleave.php:114
msgid "You are not a member of this group."
msgstr "Du är inte en medlem i denna grupp."
#: actions/apigroupleave.php:124 actions/leavegroup.php:119
-#, fuzzy, php-format
+#, 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."
+msgstr "Kunde inte ta bort användare %1$s från grupp %2$s."
#: actions/apigrouplist.php:95
#, php-format
@@ -417,6 +422,97 @@ msgstr "%s grupper"
msgid "groups on %s"
msgstr "grupper på %s"
+#: actions/apioauthauthorize.php:108 actions/apioauthauthorize.php:114
+msgid "Bad request."
+msgstr "Dålig förfrågan."
+
+#: 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
+msgid "Invalid nickname / password!"
+msgstr "Ogiltigt smeknamn / lösenord!"
+
+#: actions/apioauthauthorize.php:170
+msgid "DB error deleting OAuth app user."
+msgstr "Databasfel vid borttagning av OAuth-applikationsanvändare."
+
+#: actions/apioauthauthorize.php:196
+msgid "DB error inserting OAuth app user."
+msgstr "Databasfel vid infogning av OAuth-applikationsanvändare."
+
+#: actions/apioauthauthorize.php:231
+#, php-format
+msgid ""
+"The request token %s has been authorized. Please exchange it for an access "
+"token."
+msgstr "Begäran-token %s har godkänts. Byt ut den mot en åtkomst-token."
+
+#: actions/apioauthauthorize.php:241
+#, php-format
+msgid "The request token %s has been denied."
+msgstr "Begäran-token %s har nekats."
+
+#: 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 "En applikation skulle vilja ansluta till ditt konto"
+
+#: actions/apioauthauthorize.php:290
+msgid "Allow or deny access"
+msgstr "Tillåt eller neka åtkomst"
+
+#: 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
+msgid "Deny"
+msgstr "Neka"
+
+#: actions/apioauthauthorize.php:344
+msgid "Allow"
+msgstr "Tillåt"
+
+#: actions/apioauthauthorize.php:361
+msgid "Allow or deny access to your account information."
+msgstr "Tillåt eller neka åtkomst till din kontoinformation."
+
#: actions/apistatusesdestroy.php:107
msgid "This method requires a POST or DELETE."
msgstr "Denna metod kräver en POST eller en DELETE."
@@ -446,34 +542,34 @@ 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."
+msgstr "Maximal notisstorlek är %d tecken, inklusive URL för bilaga."
#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
msgid "Unsupported format."
msgstr "Format som inte stödjs."
#: actions/apitimelinefavorites.php:108
-#, fuzzy, php-format
+#, php-format
msgid "%1$s / Favorites from %2$s"
-msgstr "%s / Favoriter från %s"
+msgstr "%1$s / Favoriter från %2$s"
#: actions/apitimelinefavorites.php:120
-#, fuzzy, php-format
+#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
-msgstr "%s uppdateringar markerade som favorit av %s / %s."
+msgstr "%1$s uppdateringar markerade som favorit av %2$s / %2$s."
#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118
#: actions/grouprss.php:131 actions/userrss.php:90
@@ -601,29 +697,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"
@@ -701,9 +774,9 @@ msgid "%s blocked profiles"
msgstr "%s blockerade profiler"
#: actions/blockedfromgroup.php:93
-#, fuzzy, php-format
+#, php-format
msgid "%1$s blocked profiles, page %2$d"
-msgstr "%s blockerade profiler, sida %d"
+msgstr "%1$s blockerade profiler, sida %2$d"
#: actions/blockedfromgroup.php:108
msgid "A list of the users blocked from joining this group."
@@ -761,7 +834,7 @@ msgid "Couldn't delete email confirmation."
msgstr "Kunde inte ta bort e-postbekräftelse."
#: actions/confirmaddress.php:144
-msgid "Confirm Address"
+msgid "Confirm address"
msgstr "Bekräfta adress"
#: actions/confirmaddress.php:159
@@ -949,7 +1022,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 +1044,76 @@ 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 "Redigera applikation"
+
+#: actions/editapplication.php:66
+msgid "You must be logged in to edit an application."
+msgstr "Du måste vara inloggad för att redigera en applikation."
+
+#: actions/editapplication.php:77 actions/showapplication.php:94
+msgid "You are not the owner of this application."
+msgstr "Du är inte ägaren av denna applikation."
+
+#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:163
+#: actions/showapplication.php:87
+msgid "No such application."
+msgstr "Ingen sådan applikation."
+
+#: 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
+msgid "Use this form to edit your application."
+msgstr "Använd detta formulär för att redigera din applikation."
+
+#: actions/editapplication.php:177 actions/newapplication.php:159
+msgid "Name is required."
+msgstr "Namn krävs."
+
+#: actions/editapplication.php:180 actions/newapplication.php:162
+msgid "Name is too long (max 255 chars)."
+msgstr "Namnet är för långt (max 255 tecken)."
+
+#: actions/editapplication.php:183 actions/newapplication.php:165
+msgid "Description is required."
+msgstr "Beskrivning krävs."
+
+#: actions/editapplication.php:191
+msgid "Source URL is too long."
+msgstr "URL till källa är för lång."
+
+#: actions/editapplication.php:197 actions/newapplication.php:182
+msgid "Source URL is not valid."
+msgstr "URL till källa är inte giltig."
+
+#: actions/editapplication.php:200 actions/newapplication.php:185
+msgid "Organization is required."
+msgstr "Organisation krävs."
+
+#: actions/editapplication.php:203 actions/newapplication.php:188
+msgid "Organization is too long (max 255 chars)."
+msgstr "Organisation är för lång (max 255 tecken)."
+
+#: actions/editapplication.php:206 actions/newapplication.php:191
+msgid "Organization homepage is required."
+msgstr "Hemsida för organisation krävs."
+
+#: actions/editapplication.php:215 actions/newapplication.php:203
+msgid "Callback is too long."
+msgstr "Anrop är för lång."
+
+#: actions/editapplication.php:222 actions/newapplication.php:212
+msgid "Callback URL is not valid."
+msgstr "URL för anrop är inte giltig."
+
+#: actions/editapplication.php:255
+msgid "Could not update application."
+msgstr "Kunde inte uppdatera applikation."
+
#: actions/editgroup.php:56
#, php-format
msgid "Edit %s group"
@@ -981,9 +1125,8 @@ msgstr "Du måste vara inloggad för att skapa en grupp."
#: actions/editgroup.php:103 actions/editgroup.php:168
#: actions/groupdesignsettings.php:104 actions/grouplogo.php:106
-#, fuzzy
msgid "You must be an admin to edit the group."
-msgstr "Du måste vara inloggad för att redigera gruppen"
+msgstr "Du måste vara en administratör för att redigera gruppen."
#: actions/editgroup.php:154
msgid "Use this form to edit the group."
@@ -1007,7 +1150,6 @@ msgid "Options saved."
msgstr "Alternativ sparade."
#: actions/emailsettings.php:60
-#, fuzzy
msgid "Email settings"
msgstr "E-postinställningar"
@@ -1040,14 +1182,14 @@ msgstr ""
"skräppostkorg!) efter ett meddelande med vidare instruktioner."
#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126
+#: actions/smssettings.php:126 lib/applicationeditform.php:333
+#: lib/applicationeditform.php:334
msgid "Cancel"
msgstr "Avbryt"
#: actions/emailsettings.php:121
-#, fuzzy
msgid "Email address"
-msgstr "E-postadresser"
+msgstr "E-postadress"
#: actions/emailsettings.php:123
msgid "Email address, like \"UserName@example.org\""
@@ -1128,7 +1270,7 @@ msgstr "Inte en giltig e-postadress."
#: actions/emailsettings.php:334
msgid "That is already your email address."
-msgstr "Detta är redan din e-postadress."
+msgstr "Det är redan din e-postadress."
#: actions/emailsettings.php:337
msgid "That email address already belongs to another user."
@@ -1164,7 +1306,7 @@ msgstr "Bekräftelse avbruten."
#: actions/emailsettings.php:413
msgid "That is not your email address."
-msgstr "Detta är inte din e-postadress."
+msgstr "Det är inte din e-postadress."
#: actions/emailsettings.php:432 actions/imsettings.php:408
#: actions/smssettings.php:425
@@ -1221,8 +1363,8 @@ msgid ""
"Be the first to add a notice to your favorites by clicking the fave button "
"next to any notice you like."
msgstr ""
-"Bli först att lägga en notis till dina favoriter genom att klicka på favorit-"
-"knappen bredvid någon notis du gillar."
+"Var den första att lägga en notis till dina favoriter genom att klicka på "
+"favorit-knappen bredvid någon notis du gillar."
#: actions/favorited.php:156
#, php-format
@@ -1230,8 +1372,8 @@ msgid ""
"Why not [register an account](%%action.register%%) and be the first to add a "
"notice to your favorites!"
msgstr ""
-"Varför inte [registrera ett konto](%%action.register%%) och bli först att "
-"lägga en notis till dina favoriter!"
+"Varför inte [registrera ett konto](%%action.register%%) och vara först med "
+"att lägga en notis till dina favoriter!"
#: actions/favoritesrss.php:111 actions/showfavorites.php:77
#: lib/personalgroupnav.php:115
@@ -1297,7 +1439,7 @@ msgstr "Du har inte tillstånd."
#: actions/finishremotesubscribe.php:113
msgid "Could not convert request token to access token."
-msgstr "Kunde inte konvertera förfrågnings-token till access-token."
+msgstr "Kunde inte konvertera token för begäran till token för åtkomst."
#: actions/finishremotesubscribe.php:118
msgid "Remote service uses unknown version of OMB protocol."
@@ -1349,15 +1491,15 @@ msgid "Block user from group"
msgstr "Blockera användare från grupp"
#: 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 ""
-"Är du säker på att du vill blockera användare \"%s\" från gruppen \"%s\"? De "
-"kommer bli borttagna från gruppen, inte kunna posta och inte kunna "
-"prenumerera på gruppen i framtiden."
+"Är du säker på att du vill blockera användare \"%1$s\" från gruppen \"%2$s"
+"\"? De kommer bli borttagna från gruppen, inte kunna skriva till och inte "
+"kunna prenumerera på gruppen i framtiden."
#: actions/groupblock.php:178
msgid "Do not block this user from this group"
@@ -1412,9 +1554,8 @@ msgstr ""
"s."
#: actions/grouplogo.php:178
-#, fuzzy
msgid "User without matching profile."
-msgstr "Användare utan matchande profil"
+msgstr "Användare utan matchande profil."
#: actions/grouplogo.php:362
msgid "Pick a square area of the image to be the logo."
@@ -1434,9 +1575,9 @@ msgid "%s group members"
msgstr "%s gruppmedlemmar"
#: actions/groupmembers.php:96
-#, fuzzy, php-format
+#, php-format
msgid "%1$s group members, page %2$d"
-msgstr "%s gruppmedlemmar, sida %d"
+msgstr "%1$s gruppmedlemmar, sida %2$d"
#: actions/groupmembers.php:111
msgid "A list of the users in this group."
@@ -1486,9 +1627,9 @@ msgid ""
"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
"%%%%)"
msgstr ""
-"%%%%site.name%%%% grupper låter dig hitta och prata med personer med "
+"%%%%site.name%%%% grupper låter dig hitta och samtala med personer med "
"liknande intressen. Efter att ha gått med i en grupp kan du skicka "
-"meddelanden till alla andra medlemmar mha. syntaxen \"!gruppnamn\". Ser du "
+"meddelanden till alla andra medlemmar mha syntaxen \"!gruppnamn\". Ser du "
"inte någon grupp du gillar? Prova att [söka efter en](%%%%action.groupsearch%"
"%%%) eller [starta din egen!](%%%%action.newgroup%%%%)"
@@ -1546,9 +1687,8 @@ msgid "Error removing the block."
msgstr "Fel vid hävning av blockering."
#: actions/imsettings.php:59
-#, fuzzy
msgid "IM settings"
-msgstr "IM-inställningar"
+msgstr "Inställningar för snabbmeddelanden"
#: actions/imsettings.php:70
#, php-format
@@ -1556,7 +1696,7 @@ msgid ""
"You can send and receive notices through Jabber/GTalk [instant messages](%%"
"doc.im%%). Configure your address and settings below."
msgstr ""
-"Du kan skicka och ta emot notiser genom Jabber/GTalk [snabbmeddelanden](%%"
+"Du kan skicka och ta emot notiser genom Jabber/GTalk-[snabbmeddelanden](%%"
"doc.im%%). Konfigurera din adress och dina inställningar nedan."
#: actions/imsettings.php:89
@@ -1573,13 +1713,12 @@ msgid ""
"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
"message with further instructions. (Did you add %s to your buddy list?)"
msgstr ""
-"Väntar bekräftelse av denna adress. Kontrollera ditt Jabber/GTalk-konto för "
-"vidare instruktioner. (La du till %s i din kompislista?)"
+"Väntar på bekräftelse för denna adress. Kontrollera ditt Jabber/GTalk-konto "
+"för vidare instruktioner. (La du till %s i din kompislista?)"
#: actions/imsettings.php:124
-#, fuzzy
msgid "IM address"
-msgstr "IM-adress"
+msgstr "Adress för snabbmeddelanden"
#: actions/imsettings.php:126
#, php-format
@@ -1587,8 +1726,8 @@ msgid ""
"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
"add %s to your buddy list in your IM client or on GTalk."
msgstr ""
-"Jabber- eller GTalk-adress liknande \"användarnamn@example.org\". Se först "
-"till att lägga till %s i din kompislista i din IM-klient eller hos GTalk."
+"Jabber- eller GTalk-adress, som \"användarnamn@example.org\". Se först till "
+"att lägga till %s i din kompislista i din IM-klient eller hos GTalk."
#: actions/imsettings.php:143
msgid "Send me notices through Jabber/GTalk."
@@ -1634,8 +1773,8 @@ msgid ""
"A confirmation code was sent to the IM address you added. You must approve %"
"s for sending messages to you."
msgstr ""
-"En bekräftelsekod har skickats till den IM-adress du angav. Du måste "
-"godkänna att %s får skicka meddelanden till dig."
+"En bekräftelsekod skickades till den IM-adress du angav. Du måste godkänna "
+"att %s får skicka meddelanden till dig."
#: actions/imsettings.php:387
msgid "That is not your Jabber ID."
@@ -1705,8 +1844,8 @@ msgstr ""
msgid ""
"Use this form to invite your friends and colleagues to use this service."
msgstr ""
-"Använd detta formulär för att bjuda in dina vänner och kollegor till denna "
-"webbplats."
+"Använd detta formulär för att bjuda in dina vänner och kollegor att använda "
+"denna tjänst."
#: actions/invite.php:187
msgid "Email addresses"
@@ -1724,7 +1863,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:237
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236
msgid "Send"
msgstr "Skicka"
@@ -1769,9 +1908,9 @@ 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:131
-#, fuzzy, php-format
+#, php-format
msgid "%1$s joined group %2$s"
-msgstr "%s gick med i grupp %s"
+msgstr "%1$s gick med i grupp %2$s"
#: actions/leavegroup.php:60
msgid "You must be logged in to leave a group."
@@ -1782,9 +1921,9 @@ msgid "You are not a member of that group."
msgstr "Du är inte en medlem i den gruppen."
#: actions/leavegroup.php:127
-#, fuzzy, php-format
+#, php-format
msgid "%1$s left group %2$s"
-msgstr "%s lämnade grupp %s"
+msgstr "%1$s lämnade grupp %2$s"
#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
msgid "Already logged in."
@@ -1807,17 +1946,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"
@@ -1852,24 +1980,44 @@ msgid "Only an admin can make another user an admin."
msgstr "Bara en administratör kan göra en annan användare till administratör."
#: actions/makeadmin.php:95
-#, fuzzy, php-format
+#, php-format
msgid "%1$s is already an admin for group \"%2$s\"."
-msgstr "%s är redan en administratör för grupp \"%s\"."
+msgstr "%1$s är redan en administratör för grupp \"%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 "Kan inte hämta uppgift om medlemskap för %s i grupp %s"
+msgstr "Kan inte hämta uppgift om medlemskap för %1$s i grupp %2$s."
#: actions/makeadmin.php:145
-#, fuzzy, php-format
+#, php-format
msgid "Can't make %1$s an admin for group %2$s."
-msgstr "Kan inte göra %s till en administratör för grupp %s"
+msgstr "Kan inte göra %1$s till en administratör för grupp %2$s."
#: actions/microsummary.php:69
msgid "No current status"
msgstr "Ingen aktuell status"
+#: actions/newapplication.php:52
+msgid "New application"
+msgstr "Ny applikation"
+
+#: actions/newapplication.php:64
+msgid "You must be logged in to register an application."
+msgstr "Du måste vara inloggad för att registrera en applikation."
+
+#: actions/newapplication.php:143
+msgid "Use this form to register a new application."
+msgstr "Använd detta formulär för att registrera en ny applikation."
+
+#: actions/newapplication.php:173
+msgid "Source URL is required."
+msgstr "URL till källa krävs."
+
+#: actions/newapplication.php:255 actions/newapplication.php:264
+msgid "Could not create application."
+msgstr "Kunde inte skapa applikation."
+
#: actions/newgroup.php:53
msgid "New group"
msgstr "Ny grupp"
@@ -1907,9 +2055,9 @@ msgid "Message sent"
msgstr "Meddelande skickat"
#: actions/newmessage.php:185
-#, fuzzy, php-format
+#, php-format
msgid "Direct message to %s sent."
-msgstr "Direktmeddelande till %s skickat"
+msgstr "Direktmeddelande till %s skickat."
#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
msgid "Ajax Error"
@@ -1937,9 +2085,9 @@ msgid "Text search"
msgstr "Textsökning"
#: actions/noticesearch.php:91
-#, fuzzy, php-format
+#, php-format
msgid "Search results for \"%1$s\" on %2$s"
-msgstr "Sökresultat för \"%s\" på %s"
+msgstr "Sökresultat för \"%1$s\" på %2$s"
#: actions/noticesearch.php:121
#, php-format
@@ -1947,8 +2095,8 @@ msgid ""
"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
"status_textarea=%s)!"
msgstr ""
-"Bli först att [posta i detta ämne](%%%%action.newnotice%%%%?status_textarea=%"
-"s)!"
+"Var den första att [skriva i detta ämne](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
#: actions/noticesearch.php:124
#, php-format
@@ -1956,8 +2104,8 @@ msgid ""
"Why not [register an account](%%%%action.register%%%%) and be the first to "
"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
msgstr ""
-"Varför inte [registrera ett konto](%%%%action.register%%%%) och bli först "
-"att [posta i detta ämne](%%%%action.newnotice%%%%?status_textarea=%s)!"
+"Varför inte [registrera ett konto](%%%%action.register%%%%) och vara först "
+"med att [skriva i detta ämne](%%%%action.newnotice%%%%?status_textarea=%s)!"
#: actions/noticesearchrss.php:96
#, php-format
@@ -1984,6 +2132,49 @@ msgstr "Knuff sänd"
msgid "Nudge sent!"
msgstr "Knuff sänd!"
+#: actions/oauthappssettings.php:59
+msgid "You must be logged in to list your applications."
+msgstr "Du måste vara inloggad för att lista dina applikationer."
+
+#: actions/oauthappssettings.php:74
+msgid "OAuth applications"
+msgstr "OAuth-applikationer"
+
+#: actions/oauthappssettings.php:85
+msgid "Applications you have registered"
+msgstr "Applikationer du har registrerat"
+
+#: actions/oauthappssettings.php:135
+#, php-format
+msgid "You have not registered any applications yet."
+msgstr "Du har inte registrerat några applikationer än."
+
+#: actions/oauthconnectionssettings.php:71
+msgid "Connected applications"
+msgstr "Anslutna applikationer"
+
+#: actions/oauthconnectionssettings.php:87
+msgid "You have allowed the following applications to access you account."
+msgstr "Du har tillåtit följande applikationer att komma åt ditt konto."
+
+#: actions/oauthconnectionssettings.php:170
+msgid "You are not a user of that application."
+msgstr "Du är inte en användare av den applikationen."
+
+#: actions/oauthconnectionssettings.php:180
+msgid "Unable to revoke access for app: "
+msgstr "Kunde inte återkalla åtkomst för applikation: "
+
+#: actions/oauthconnectionssettings.php:192
+#, php-format
+msgid "You have not authorized any applications to use your account."
+msgstr "Du har inte tillåtit några applikationer att använda ditt konto."
+
+#: actions/oauthconnectionssettings.php:205
+msgid "Developers can edit the registration settings for their applications "
+msgstr ""
+"Utvecklare kan redigera registreringsinställningarna för sina applikationer "
+
#: actions/oembed.php:79 actions/shownotice.php:100
msgid "Notice has no profile"
msgstr "Notisen har ingen profil"
@@ -2001,8 +2192,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"
@@ -2015,7 +2206,7 @@ msgid "Notice Search"
msgstr "Notissökning"
#: actions/othersettings.php:60
-msgid "Other Settings"
+msgid "Other settings"
msgstr "Övriga inställningar"
#: actions/othersettings.php:71
@@ -2047,29 +2238,24 @@ msgid "URL shortening service is too long (max 50 chars)."
msgstr "Namnet på URL-förkortningstjänsen är för långt (max 50 tecken)."
#: actions/otp.php:69
-#, fuzzy
msgid "No user ID specified."
-msgstr "Ingen grupp angiven."
+msgstr "Ingen användar-ID angiven."
#: actions/otp.php:83
-#, fuzzy
msgid "No login token specified."
-msgstr "Ingen notis angiven."
+msgstr "Ingen inloggnings-token angiven."
#: actions/otp.php:90
-#, fuzzy
msgid "No login token requested."
-msgstr "Ingen profil-ID i begäran."
+msgstr "Ingen token för inloggning begärd."
#: actions/otp.php:95
-#, fuzzy
msgid "Invalid login token specified."
-msgstr "Ogiltig eller utgången token."
+msgstr "Ogiltig inloggnings-token angiven."
#: actions/otp.php:104
-#, fuzzy
msgid "Login token expired."
-msgstr "Logga in på webbplatsen"
+msgstr "Inloggnings-token förfallen."
#: actions/outbox.php:61
#, php-format
@@ -2267,13 +2453,12 @@ msgid "When to use SSL"
msgstr "När SSL skall användas"
#: actions/pathsadminpanel.php:308
-#, fuzzy
msgid "SSL server"
msgstr "SSL-server"
#: actions/pathsadminpanel.php:309
msgid "Server to direct SSL requests to"
-msgstr "Server att dirigera SSL-förfrågningar till"
+msgstr "Server att dirigera SSL-begäran till"
#: actions/pathsadminpanel.php:325
msgid "Save paths"
@@ -2298,18 +2483,18 @@ msgid "Not a valid people tag: %s"
msgstr "Inte en giltig persontagg: %s"
#: actions/peopletag.php:144
-#, fuzzy, php-format
+#, php-format
msgid "Users self-tagged with %1$s - page %2$d"
-msgstr "Användare som taggat sig själv med %s - sida %d"
+msgstr "Användare som taggat sig själv med %1$s - sida %2$d"
#: actions/postnotice.php:84
msgid "Invalid notice content"
msgstr "Ogiltigt notisinnehåll"
#: actions/postnotice.php:90
-#, fuzzy, php-format
+#, php-format
msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
-msgstr "Licensen för notiser ‘%s’ är inte förenlig webbplatslicensen ‘%s’."
+msgstr "Licensen för notiser ‘%1$s’ är inte förenlig webbplatslicensen ‘%2$s’."
#: actions/profilesettings.php:60
msgid "Profile settings"
@@ -2319,8 +2504,8 @@ msgstr "Profilinställningar"
msgid ""
"You can update your personal profile info here so people know more about you."
msgstr ""
-"Du kan uppdatera din personliga profilinformation här så personer får veta "
-"mer om dig."
+"Du kan uppdatera din personliga profilinformation här så att folk vet mer om "
+"dig."
#: actions/profilesettings.php:99
msgid "Profile information"
@@ -2337,7 +2522,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"
@@ -2406,7 +2591,8 @@ msgstr "I vilken tidszon befinner du dig normalt?"
msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr ""
-"Prenumerera automatiskt på den prenumererar på mig (bäst för icke-människa) "
+"Prenumerera automatiskt på den som prenumererar på mig (bäst för icke-"
+"människa) "
#: actions/profilesettings.php:228 actions/register.php:223
#, php-format
@@ -2505,8 +2691,8 @@ msgid ""
"tool. [Join now](%%action.register%%) to share notices about yourself with "
"friends, family, and colleagues! ([Read more](%%doc.help%%))"
msgstr ""
-"Detta är %%site.name%%, en [mikroblogg](http://en.wikipedia.org/wiki/Micro-"
-"blogging)-tjänst baserad på den fria programvaran [StatusNet](http://status."
+"Detta är %%site.name%%, en [mikroblogg](http://sv.wikipedia.org/wiki/"
+"Mikroblogg)tjänst baserad på den fria programvaran [StatusNet](http://status."
"net/). [Gå med nu](%%action.register%%) för att dela notiser om dig själv "
"med vänner, familj och kollegor! ([Läs mer](%%doc.help%%))"
@@ -2517,8 +2703,8 @@ msgid ""
"blogging) service based on the Free Software [StatusNet](http://status.net/) "
"tool."
msgstr ""
-"Detta är %%site.name%%, en [mikroblogg](http://en.wikipedia.org/wiki/Micro-"
-"blogging)-tjänst baserad på den fria programvaran [StatusNet](http://status."
+"Detta är %%site.name%%, en [mikroblogg](http://sv.wikipedia.org/wiki/"
+"Mikroblogg)tjänst baserad på den fria programvaran [StatusNet](http://status."
"net/)."
#: actions/publictagcloud.php:57
@@ -2679,11 +2865,11 @@ msgstr "Nya lösenordet sparat. Du är nu inloggad."
#: actions/register.php:85 actions/register.php:189 actions/register.php:405
msgid "Sorry, only invited people can register."
-msgstr "Ledsen, bara inbjudna personer kan registrera sig."
+msgstr "Tyvärr, bara inbjudna personer kan registrera sig."
#: actions/register.php:92
msgid "Sorry, invalid invitation code."
-msgstr "Ledsen, ogiltig inbjudningskod."
+msgstr "Tyvärr, ogiltig inbjudningskod."
#: actions/register.php:112
msgid "Registration successful"
@@ -2847,7 +3033,7 @@ msgstr "Det där är en lokal profil! Logga in för att prenumerera."
#: actions/remotesubscribe.php:183
msgid "Couldn’t get a request token."
-msgstr "Kunde inte få en förfrågnings-token."
+msgstr "Kunde inte få en token för begäran."
#: actions/repeat.php:57
msgid "Only logged-in users can repeat notices."
@@ -2895,12 +3081,12 @@ msgid "Replies feed for %s (Atom)"
msgstr "Flöde med svar för %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 ""
-"Detta är tidslinjen som visar svar till %s men %s har inte tagit emot en "
+"Detta är tidslinjen som visar svar till %s1$ men %2$s har inte tagit emot en "
"notis för dennes uppmärksamhet än."
#: actions/replies.php:203
@@ -2913,13 +3099,13 @@ msgstr ""
"personer eller [gå med i grupper](%%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 ""
-"Du kan prova att [knuffa %s](../%s) eller [posta någonting för hans eller "
-"hennes uppmärksamhet](%%%%action.newnotice%%%%?status_textarea=%s)."
+"Du kan prova att [knuffa %1$s](../%2$s) eller [posta någonting för hans "
+"eller hennes uppmärksamhet](%%%%action.newnotice%%%%?status_textarea=%3$s)."
#: actions/repliesrss.php:72
#, php-format
@@ -2934,6 +3120,82 @@ 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
+msgid "You must be logged in to view an application."
+msgstr "Du måste vara inloggad för att se en applikation."
+
+#: actions/showapplication.php:158
+msgid "Application profile"
+msgstr "Applikationsprofil"
+
+#: actions/showapplication.php:160 lib/applicationeditform.php:182
+msgid "Icon"
+msgstr "Ikon"
+
+#: actions/showapplication.php:170 actions/version.php:195
+#: lib/applicationeditform.php:197
+msgid "Name"
+msgstr "Namn"
+
+#: actions/showapplication.php:179 lib/applicationeditform.php:224
+msgid "Organization"
+msgstr "Organisation"
+
+#: 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 "skapad av %1$s - %2$s standardåtkomst - %3$d användare"
+
+#: actions/showapplication.php:214
+msgid "Application actions"
+msgstr "Åtgärder för applikation"
+
+#: actions/showapplication.php:233
+msgid "Reset key & secret"
+msgstr "Återställ nyckel & hemlighet"
+
+#: actions/showapplication.php:241
+msgid "Application info"
+msgstr "Information om applikation"
+
+#: actions/showapplication.php:243
+msgid "Consumer key"
+msgstr "Nyckel för konsument"
+
+#: actions/showapplication.php:248
+msgid "Consumer secret"
+msgstr "Hemlighet för konsument"
+
+#: actions/showapplication.php:253
+msgid "Request token URL"
+msgstr "URL för begäran-token"
+
+#: actions/showapplication.php:258
+msgid "Access token URL"
+msgstr "URL för åtkomst-token"
+
+#: actions/showapplication.php:263
+msgid "Authorize URL"
+msgstr "Tillåt URL"
+
+#: actions/showapplication.php:268
+msgid ""
+"Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
+"signature method."
+msgstr ""
+"Notera: Vi stöjder HMAC-SHA1-signaturer. Vi stödjer inte metoden med "
+"klartextsignatur."
+
#: actions/showfavorites.php:132
msgid "Could not retrieve favorite notices."
msgstr "Kunde inte hämta favoritnotiser."
@@ -2958,6 +3220,9 @@ msgid ""
"You haven't chosen any favorite notices yet. Click the fave button on "
"notices you like to bookmark them for later or shed a spotlight on them."
msgstr ""
+"Du har inte valt några favoritnotiser ännu. Klicka på favorit-knappen "
+"bredvid någon notis du skulle vilja bokmärka för senare tillfälle eller för "
+"att sätta strålkastarljuset på."
#: actions/showfavorites.php:207
#, php-format
@@ -2965,6 +3230,8 @@ msgid ""
"%s hasn't added any notices to his favorites yet. Post something interesting "
"they would add to their favorites :)"
msgstr ""
+"%s har inte lagt till några notiser till sina favoriter ännu. Posta något "
+"intressant de skulle lägga till sina favoriter :)"
#: actions/showfavorites.php:211
#, php-format
@@ -2973,10 +3240,13 @@ msgid ""
"account](%%%%action.register%%%%) and then post something interesting they "
"would add to their favorites :)"
msgstr ""
+"%s har inte lagt till några notiser till sina favoriter ännu. Varför inte "
+"[registrera ett konto](%%%%action.register%%%%) och posta något intressant "
+"de skulle lägga till sina favoriter :)"
#: actions/showfavorites.php:242
msgid "This is a way to share what you like."
-msgstr "Detta är ett sätt att dela vad du gillar."
+msgstr "Detta är ett sätt att dela med av det du gillar."
#: actions/showgroup.php:82 lib/groupnav.php:86
#, php-format
@@ -3003,7 +3273,7 @@ msgstr "Alias"
#: actions/showgroup.php:293
msgid "Group actions"
-msgstr "Gruppåtgärder"
+msgstr "Åtgärder för grupp"
#: actions/showgroup.php:328
#, php-format
@@ -3039,10 +3309,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"
@@ -3056,8 +3322,8 @@ msgid ""
"their life and interests. [Join now](%%%%action.register%%%%) to become part "
"of this group and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
-"**%s** är en användargrupp på %%%%site.name%%%%, en [mikroblogg](http://en."
-"wikipedia.org/wiki/Micro-blogging)-tjänst baserad den fria programvaran "
+"**%s** är en användargrupp på %%%%site.name%%%%, en [mikroblogg](http://sv."
+"wikipedia.org/wiki/Mikroblogg)tjänst baserad den fria programvaran "
"[StatusNet](http://status.net/). Dess medlemmar delar korta meddelande om "
"sina liv och intressen. [Gå med nu](%%%%action.register%%%%) för att bli en "
"del av denna grupp och många fler! ([Läs mer](%%%%doc.help%%%%))"
@@ -3071,7 +3337,7 @@ msgid ""
"their life and interests. "
msgstr ""
"**%s** är en användargrupp på %%%%site.name%%%%, en [mikroblogg](http://en."
-"wikipedia.org/wiki/Micro-blogging)-tjänst baserad den fria programvaran "
+"wikipedia.org/wiki/Micro-blogging)tjänst baserad den fria programvaran "
"[StatusNet](http://status.net/). Dess medlemmar delar korta meddelande om "
"sina liv och intressen. "
@@ -3107,9 +3373,9 @@ msgid " tagged %s"
msgstr "taggade %s"
#: actions/showstream.php:122
-#, fuzzy, php-format
+#, php-format
msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
-msgstr "Flöde av notiser för %s taggade %s (RSS 1.0)"
+msgstr "Flöde av notiser för %1$s taggade %2$s (RSS 1.0)"
#: actions/showstream.php:129
#, php-format
@@ -3132,9 +3398,9 @@ msgid "FOAF for %s"
msgstr "FOAF för %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 "Detta är tidslinjen för %s men %s har inte postat något än."
+msgstr "Detta är tidslinjen för %1$s men %2$s har inte postat något än."
#: actions/showstream.php:196
msgid ""
@@ -3145,13 +3411,13 @@ msgstr ""
"inte börja nu?"
#: 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 ""
-"Du kan prova att knuffa %s eller [posta något för hans eller hennes "
-"uppmärksamhet](%%%%action.newnotice%%%%?status_textarea=%s)."
+"Du kan prova att knuffa %1$s eller [posta något för hans eller hennes "
+"uppmärksamhet](%%%%action.newnotice%%%%?status_textarea=%2$s)."
#: actions/showstream.php:234
#, php-format
@@ -3162,7 +3428,7 @@ msgid ""
"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
"**%s** har ett konto på %%%%site.name%%%%, en [mikroblogg](http://en."
-"wikipedia.org/wiki/Micro-blogging)-tjänst baserad på den fria programvaran "
+"wikipedia.org/wiki/Micro-blogging)tjänst baserad på den fria programvaran "
"[StatusNet](http://status.net/). [Gå med nu](%%%%action.register%%%%) för "
"att följa **%s**s notiser och många fler! ([Läs mer](%%%%doc.help%%%%))"
@@ -3174,7 +3440,7 @@ msgid ""
"[StatusNet](http://status.net/) tool. "
msgstr ""
"**%s** har ett konto på %%%%site.name%%%%, en [mikroblogg](http://en."
-"wikipedia.org/wiki/Micro-blogging)-tjänst baserad på den fria programvaran "
+"wikipedia.org/wiki/Micro-blogging)tjänst baserad på den fria programvaran "
"[StatusNet](http://status.net/). "
#: actions/showstream.php:313
@@ -3199,14 +3465,13 @@ msgid "Site name must have non-zero length."
msgstr "Webbplatsnamnet måste vara minst ett tecken långt."
#: actions/siteadminpanel.php:154
-#, fuzzy
msgid "You must have a valid contact email address."
-msgstr "Du måste ha en giltig kontakte-postadress"
+msgstr "Du måste ha en giltig e-postadress."
#: actions/siteadminpanel.php:172
-#, fuzzy, php-format
+#, php-format
msgid "Unknown language \"%s\"."
-msgstr "Okänt språk \"%s\""
+msgstr "Okänt språk \"%s\"."
#: actions/siteadminpanel.php:179
msgid "Invalid snapshot report URL."
@@ -3356,7 +3621,7 @@ msgstr "Ögonblicksbild kommer skickas var N:te webbträff"
#: actions/siteadminpanel.php:359
msgid "Report URL"
-msgstr "Rapport-URL"
+msgstr "URL för rapport"
#: actions/siteadminpanel.php:360
msgid "Snapshots will be sent to this URL"
@@ -3388,14 +3653,13 @@ msgid "Save site settings"
msgstr "Spara webbplatsinställningar"
#: actions/smssettings.php:58
-#, fuzzy
msgid "SMS settings"
-msgstr "SMS-inställningar"
+msgstr "Inställningar för SMS"
#: actions/smssettings.php:69
#, php-format
msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr "Du kan ta emot SMS-meddelande genom e-post från %%site.name%%."
+msgstr "Du kan ta emot SMS-meddelanden genom e-post från %%site.name%%."
#: actions/smssettings.php:91
msgid "SMS is not available."
@@ -3418,7 +3682,6 @@ msgid "Enter the code you received on your phone."
msgstr "Fyll i koden du mottog i din telefon."
#: actions/smssettings.php:138
-#, fuzzy
msgid "SMS phone number"
msgstr "Telefonnummer för SMS"
@@ -3510,9 +3773,9 @@ msgid "%s subscribers"
msgstr "%s prenumeranter"
#: actions/subscribers.php:52
-#, fuzzy, php-format
+#, php-format
msgid "%1$s subscribers, page %2$d"
-msgstr "%s prenumeranter, sida %d"
+msgstr "%1$s prenumeranter, sida %2$d"
#: actions/subscribers.php:63
msgid "These are the people who listen to your notices."
@@ -3551,18 +3814,18 @@ msgid "%s subscriptions"
msgstr "%s prenumerationer"
#: actions/subscriptions.php:54
-#, fuzzy, php-format
+#, php-format
msgid "%1$s subscriptions, page %2$d"
-msgstr "%s prenumerationer, sida %d"
+msgstr "%1$s prenumerationer, sida %2$d"
#: actions/subscriptions.php:65
msgid "These are the people whose notices you listen to."
-msgstr "Dessa är de personer vars notiser du lyssnar på."
+msgstr "Det är dessa personer vars meddelanden du lyssnar på."
#: actions/subscriptions.php:69
#, php-format
msgid "These are the people whose notices %s listens to."
-msgstr "Dessa är de personer vars notiser %s lyssnar på."
+msgstr "Det är dessa personer vars notiser %s lyssnar på."
#: actions/subscriptions.php:121
#, php-format
@@ -3573,6 +3836,12 @@ msgid ""
"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
"automatically subscribe to people you already follow there."
msgstr ""
+"Du lyssnar inte på någons notiser just nu. Prova att prenumerera på personer "
+"du känner. Prova [personsökning] (%%action.peoplesearch%%), leta bland "
+"medlemmar i grupper som intresserad dig och bland våra [profilerade "
+"användare] (%%action.featured%%). Om du är en [Twitter-användare] (%%action."
+"twittersettings%%) kan du prenumerera automatiskt på personer som du redan "
+"följer där."
#: actions/subscriptions.php:123 actions/subscriptions.php:127
#, php-format
@@ -3676,12 +3945,12 @@ msgid "Unsubscribed"
msgstr "Prenumeration avslutad"
#: 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 ""
-"Licensen för lyssnarströmmen '%s' är inte förenlig med webbplatslicensen '%"
-"s'."
+"Licensen för lyssnarströmmen '%1$s' är inte förenlig med webbplatslicensen '%"
+"2$s'."
#: actions/useradminpanel.php:58 lib/adminpanelaction.php:321
#: lib/personalgroupnav.php:115
@@ -3809,7 +4078,7 @@ msgstr "Avvisa denna prenumeration"
#: actions/userauthorization.php:225
msgid "No authorization request!"
-msgstr "Ingen auktoriseringsförfrågan!"
+msgstr "Ingen begäran om godkännande!"
#: actions/userauthorization.php:247
msgid "Subscription authorized"
@@ -3821,7 +4090,7 @@ msgid ""
"with the site’s instructions for details on how to authorize the "
"subscription. Your subscription token is:"
msgstr ""
-"Prenumerationen har blivit bekräftad, men ingen URL har gått igenom. Kolla "
+"Prenumerationen har godkänts, men ingen anrops-URL har gått igenom. Kolla "
"med webbplatsens instruktioner hur du bekräftar en prenumeration. Din "
"prenumerations-token är:"
@@ -3840,9 +4109,9 @@ msgstr ""
"prenumerationen."
#: actions/userauthorization.php:296
-#, fuzzy, php-format
+#, php-format
msgid "Listener URI ‘%s’ not found here."
-msgstr "Lyssnar-URI '%s' hittades inte här"
+msgstr "URI för lyssnare '%s' hittades inte här."
#: actions/userauthorization.php:301
#, php-format
@@ -3905,9 +4174,9 @@ msgstr ""
"Prova att [söka efter grupper](%%action.groupsearch%%) och gå med i dem."
#: actions/version.php:73
-#, fuzzy, php-format
+#, php-format
msgid "StatusNet %s"
-msgstr "Statistik"
+msgstr "StatusNet %s"
#: actions/version.php:153
#, php-format
@@ -3915,15 +4184,16 @@ msgid ""
"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
"Inc. and contributors."
msgstr ""
+"Denna webbplats drivs med %1$s version %2$s, Copyright 2008-2010 StatusNet, "
+"Inc. och medarbetare."
#: actions/version.php:157
-#, fuzzy
msgid "StatusNet"
-msgstr "Status borttagen."
+msgstr "StatusNet"
#: actions/version.php:161
msgid "Contributors"
-msgstr ""
+msgstr "Medarbetare"
#: actions/version.php:168
msgid ""
@@ -3932,6 +4202,10 @@ msgid ""
"Software Foundation, either version 3 of the License, or (at your option) "
"any later version. "
msgstr ""
+"StatusNet är fri programvara: du kan distribuera det och/eller modifiera den "
+"under GNU Affero General Public License såsom publicerad av Free Software "
+"Foundation, antingen version 3 av licensen, eller (utifrån ditt val) någon "
+"senare version. "
#: actions/version.php:174
msgid ""
@@ -3940,6 +4214,10 @@ msgid ""
"FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License "
"for more details. "
msgstr ""
+"Detta program distribueras i hopp om att det kommer att vara användbart, men "
+"UTAN NÅGRA GARANTIER; även utan underförstådda garantier om SÄLJBARHET eller "
+"LÄMPLIGHET FÖR ETT SÄRSKILT ÄNDAMÅL. Se GNU Affero General Public License "
+"för mer information. "
#: actions/version.php:180
#, php-format
@@ -3947,30 +4225,21 @@ msgid ""
"You should have received a copy of the GNU Affero General Public License "
"along with this program. If not, see %s."
msgstr ""
+"Du bör ha fått en kopia av GNU Affero General Public License tillsammans med "
+"detta program. Om inte, se% s."
#: actions/version.php:189
msgid "Plugins"
-msgstr ""
-
-#: actions/version.php:195
-#, fuzzy
-msgid "Name"
-msgstr "Smeknamn"
+msgstr "Insticksmoduler"
#: actions/version.php:196 lib/action.php:741
-#, fuzzy
msgid "Version"
-msgstr "Sessioner"
+msgstr "Version"
#: actions/version.php:197
-#, fuzzy
msgid "Author(s)"
msgstr "Författare"
-#: actions/version.php:198 lib/groupeditform.php:172
-msgid "Description"
-msgstr "Beskrivning"
-
#: classes/File.php:144
#, php-format
msgid ""
@@ -3991,19 +4260,16 @@ 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"
+msgstr "Gruppanslutning misslyckades."
#: classes/Group_member.php:53
-#, fuzzy
msgid "Not part of group."
-msgstr "Kunde inte uppdatera grupp."
+msgstr "Inte med i grupp."
#: classes/Group_member.php:60
-#, fuzzy
msgid "Group leave failed."
-msgstr "Grupprofil"
+msgstr "Grupputträde misslyckades."
#: classes/Login_token.php:76
#, php-format
@@ -4058,12 +4324,12 @@ msgstr "Du är utestängd från att posta notiser på denna webbplats."
msgid "Problem saving notice."
msgstr "Problem med att spara notis."
-#: classes/Notice.php:1052
+#: classes/Notice.php:1059
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Databasfel vid infogning av svar: %s"
-#: classes/Notice.php:1423
+#: classes/Notice.php:1441
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -4110,9 +4376,9 @@ msgid "Other options"
msgstr "Övriga alternativ"
#: 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"
@@ -4131,10 +4397,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"
@@ -4246,7 +4508,7 @@ msgid ""
"broughtby%%](%%site.broughtbyurl%%). "
msgstr ""
"**%%site.name%%** är en mikrobloggtjänst tillhandahållen av [%%site.broughtby"
-"%%](%%site.broughtbyurl%%)"
+"%%](%%site.broughtbyurl%%). "
#: lib/action.php:778
#, php-format
@@ -4260,7 +4522,7 @@ msgid ""
"s, available under the [GNU Affero General Public License](http://www.fsf."
"org/licensing/licenses/agpl-3.0.html)."
msgstr ""
-"Den drivs med mikroblogg-programvaran [StatusNet](http://status.net/), "
+"Den drivs med mikrobloggprogramvaran [StatusNet](http://status.net/), "
"version %s, tillgänglig under [GNU Affero General Public License](http://www."
"fsf.org/licensing/licenses/agpl-3.0.html)."
@@ -4288,18 +4550,13 @@ 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."
#: lib/adminpanelaction.php:107
-#, fuzzy
msgid "Changes to that panel are not allowed."
-msgstr "Registrering inte tillåten."
+msgstr "Ändringar av den panelen tillåts inte."
#: lib/adminpanelaction.php:206
msgid "showForm() not implemented."
@@ -4325,6 +4582,68 @@ msgstr "Konfiguration av utseende"
msgid "Paths configuration"
msgstr "Konfiguration av sökvägar"
+#: lib/applicationeditform.php:186
+msgid "Icon for this application"
+msgstr "Ikon för denna applikation"
+
+#: lib/applicationeditform.php:206
+#, php-format
+msgid "Describe your application in %d characters"
+msgstr "Beskriv din applikation med högst %d tecken"
+
+#: lib/applicationeditform.php:209
+msgid "Describe your application"
+msgstr "Beskriv din applikation"
+
+#: lib/applicationeditform.php:218
+msgid "Source URL"
+msgstr "URL för källa"
+
+#: lib/applicationeditform.php:220
+msgid "URL of the homepage of this application"
+msgstr "URL till hemsidan för denna applikation"
+
+#: lib/applicationeditform.php:226
+msgid "Organization responsible for this application"
+msgstr "Organisation som ansvarar för denna applikation"
+
+#: lib/applicationeditform.php:232
+msgid "URL for the homepage of the organization"
+msgstr "URL till organisationens hemsidan"
+
+#: lib/applicationeditform.php:238
+msgid "URL to redirect to after authentication"
+msgstr "URL att omdirigera till efter autentisering"
+
+#: lib/applicationeditform.php:260
+msgid "Browser"
+msgstr "Webbläsare"
+
+#: lib/applicationeditform.php:276
+msgid "Desktop"
+msgstr "Skrivbord"
+
+#: lib/applicationeditform.php:277
+msgid "Type of application, browser or desktop"
+msgstr "Typ av applikation, webbläsare eller skrivbord"
+
+#: lib/applicationeditform.php:299
+msgid "Read-only"
+msgstr "Skrivskyddad"
+
+#: lib/applicationeditform.php:317
+msgid "Read-write"
+msgstr "Läs och skriv"
+
+#: lib/applicationeditform.php:318
+msgid "Default access for this application: read-only, or read-write"
+msgstr ""
+"Standardåtkomst för denna applikation: skrivskyddad, eller läs och skriv"
+
+#: lib/applicationlist.php:154
+msgid "Revoke"
+msgstr "Återkalla"
+
#: lib/attachmentlist.php:87
msgid "Attachments"
msgstr "Bilagor"
@@ -4345,11 +4664,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"
@@ -4367,7 +4686,7 @@ msgstr "Kommando misslyckades"
#: lib/command.php:44
msgid "Sorry, this command is not yet implemented."
-msgstr "Ledsen, detta kommando är inte implementerat än."
+msgstr "Tyvärr, detta kommando är inte implementerat än."
#: lib/command.php:88
#, php-format
@@ -4643,6 +4962,14 @@ msgstr "Uppdateringar via snabbmeddelande (IM)"
msgid "Updates by SMS"
msgstr "Uppdateringar via SMS"
+#: lib/connectsettingsaction.php:120
+msgid "Connections"
+msgstr "Anslutningar"
+
+#: lib/connectsettingsaction.php:121
+msgid "Authorized connected applications"
+msgstr "Tillåt anslutna applikationer"
+
#: lib/dberroraction.php:60
msgid "Database error"
msgstr "Databasfel"
@@ -4833,9 +5160,9 @@ msgid "[%s]"
msgstr "[%s]"
#: lib/jabber.php:385
-#, fuzzy, php-format
+#, php-format
msgid "Unknown inbox source %d."
-msgstr "Okänt språk \"%s\""
+msgstr "Okänd källa för inkorg %d."
#: lib/joinform.php:114
msgid "Join"
@@ -4895,11 +5222,9 @@ msgid ""
msgstr ""
#: lib/mail.php:258
-#, fuzzy, php-format
+#, php-format
msgid "Bio: %s"
-msgstr ""
-"Biografi: %s\n"
-"\n"
+msgstr "Biografi: %s"
#: lib/mail.php:286
#, php-format
@@ -5054,16 +5379,16 @@ msgstr "Inte en registrerad användare."
#: lib/mailhandler.php:46
msgid "Sorry, that is not your incoming email address."
-msgstr "Ledsen, det är inte din inkommande e-postadress."
+msgstr "Tyvärr, det är inte din inkommande e-postadress."
#: lib/mailhandler.php:50
msgid "Sorry, no incoming email allowed."
-msgstr "Ledsen, ingen inkommande e-post tillåts."
+msgstr "Tyvärr, ingen inkommande e-post tillåts."
#: lib/mailhandler.php:228
-#, fuzzy, php-format
+#, php-format
msgid "Unsupported message type: %s"
-msgstr "Bildfilens format stödjs inte."
+msgstr "Formatet %s för meddelande stödjs inte."
#: lib/mediafile.php:98 lib/mediafile.php:123
msgid "There was a database error while saving your file. Please try again."
@@ -5100,18 +5425,16 @@ msgid "File upload stopped by extension."
msgstr "Filuppladdningen stoppad pga filändelse"
#: lib/mediafile.php:179 lib/mediafile.php:216
-#, fuzzy
msgid "File exceeds user's quota."
-msgstr "Fil överstiger användaren kvot!"
+msgstr "Fil överstiger användaren kvot."
#: lib/mediafile.php:196 lib/mediafile.php:233
msgid "File could not be moved to destination directory."
msgstr "Fil kunde inte flyttas till destinationskatalog."
#: lib/mediafile.php:201 lib/mediafile.php:237
-#, fuzzy
msgid "Could not determine file's MIME type."
-msgstr "Kunde inte fastställa filens MIME-typ!"
+msgstr "Kunde inte fastställa filens MIME-typ."
#: lib/mediafile.php:270
#, php-format
@@ -5119,13 +5442,13 @@ msgid " Try using another %s format."
msgstr "Försök använda ett annat %s-format."
#: lib/mediafile.php:275
-#, fuzzy, php-format
+#, php-format
msgid "%s is not a supported file type on this server."
msgstr "%s är en filtyp som saknar stöd på denna server."
#: lib/messageform.php:120
msgid "Send a direct notice"
-msgstr "Skicka ett direktinlägg"
+msgstr "Skicka en direktnotis"
#: lib/messageform.php:146
msgid "To"
@@ -5137,7 +5460,7 @@ msgstr "Tillgängliga tecken"
#: lib/noticeform.php:160
msgid "Send a notice"
-msgstr "Skicka ett inlägg"
+msgstr "Skicka en notis"
#: lib/noticeform.php:173
#, php-format
@@ -5153,24 +5476,20 @@ msgid "Attach a file"
msgstr "Bifoga en fil"
#: lib/noticeform.php:212
-#, fuzzy
msgid "Share my location"
-msgstr "Dela din plats"
+msgstr "Dela min plats"
#: lib/noticeform.php:215
-#, fuzzy
msgid "Do not share my location"
-msgstr "Dela din plats"
+msgstr "Dela inte min plats"
#: lib/noticeform.php:216
-msgid "Hide this info"
-msgstr ""
-
-#: lib/noticeform.php:217
msgid ""
"Sorry, retrieving your geo location is taking longer than expected, please "
"try again later"
msgstr ""
+"Tyvärr, hämtning av din geografiska plats tar längre tid än förväntat, var "
+"god försök igen senare"
#: lib/noticelist.php:428
#, php-format
@@ -5207,7 +5526,7 @@ msgstr "Upprepad av"
#: lib/noticelist.php:585
msgid "Reply to this notice"
-msgstr "Svara på detta inlägg"
+msgstr "Svara på denna notis"
#: lib/noticelist.php:586
msgid "Reply"
@@ -5227,7 +5546,7 @@ msgstr "Knuffa"
#: lib/nudgeform.php:128
msgid "Send a nudge to this user"
-msgstr "Skicka en knuff till den användaren."
+msgstr "Skicka en knuff till denna användare"
#: lib/oauthstore.php:283
msgid "Error inserting new profile"
@@ -5243,7 +5562,7 @@ msgstr "Fel vid infogning av fjärrprofilen"
#: lib/oauthstore.php:345
msgid "Duplicate notice"
-msgstr "Duplicera notis"
+msgstr "Duplicerad notis"
#: lib/oauthstore.php:466 lib/subs.php:48
msgid "You have been banned from subscribing."
@@ -5255,7 +5574,7 @@ msgstr "Kunde inte infoga ny prenumeration."
#: lib/personalgroupnav.php:99
msgid "Personal"
-msgstr "Personlig"
+msgstr "Personligt"
#: lib/personalgroupnav.php:104
msgid "Replies"
@@ -5287,9 +5606,8 @@ msgid "Tags in %s's notices"
msgstr "Taggar i %ss notiser"
#: lib/plugin.php:114
-#, fuzzy
msgid "Unknown"
-msgstr "Okänd funktion"
+msgstr "Okänd"
#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82
msgid "Subscriptions"
@@ -5329,7 +5647,7 @@ msgstr "Inte implementerad metod."
#: lib/publicgroupnav.php:78
msgid "Public"
-msgstr "Publik"
+msgstr "Publikt"
#: lib/publicgroupnav.php:82
msgid "User groups"
@@ -5353,7 +5671,7 @@ msgstr "Upprepa denna notis?"
#: lib/repeatform.php:132
msgid "Repeat this notice"
-msgstr "Upprepa detta inlägg"
+msgstr "Upprepa denna notis"
#: lib/sandboxform.php:67
msgid "Sandbox"
@@ -5453,12 +5771,12 @@ msgstr "Kunde inte ta bort prenumeration."
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
-msgstr ""
+msgstr "Taggmoln för person, såsom taggat själv"
#: lib/subscriberspeopletagcloudsection.php:48
#: lib/subscriptionspeopletagcloudsection.php:48
msgid "People Tagcloud as tagged"
-msgstr ""
+msgstr "Taggmoln för person, såsom taggats"
#: lib/tagcloudsection.php:56
msgid "None"
@@ -5498,7 +5816,7 @@ msgstr "Redigera avatar"
#: lib/userprofile.php:236
msgid "User actions"
-msgstr "Användaråtgärd"
+msgstr "Åtgärder för användare"
#: lib/userprofile.php:248
msgid "Edit profile settings"
@@ -5520,47 +5838,47 @@ msgstr "Meddelande"
msgid "Moderate"
msgstr "Moderera"
-#: lib/util.php:877
+#: lib/util.php:875
msgid "a few seconds ago"
msgstr "ett par sekunder sedan"
-#: lib/util.php:879
+#: lib/util.php:877
msgid "about a minute ago"
msgstr "för nån minut sedan"
-#: lib/util.php:881
+#: lib/util.php:879
#, php-format
msgid "about %d minutes ago"
msgstr "för %d minuter sedan"
-#: lib/util.php:883
+#: lib/util.php:881
msgid "about an hour ago"
msgstr "för en timma sedan"
-#: lib/util.php:885
+#: lib/util.php:883
#, php-format
msgid "about %d hours ago"
msgstr "för %d timmar sedan"
-#: lib/util.php:887
+#: lib/util.php:885
msgid "about a day ago"
msgstr "för en dag sedan"
-#: lib/util.php:889
+#: lib/util.php:887
#, php-format
msgid "about %d days ago"
msgstr "för %d dagar sedan"
-#: lib/util.php:891
+#: lib/util.php:889
msgid "about a month ago"
msgstr "för en månad sedan"
-#: lib/util.php:893
+#: lib/util.php:891
#, php-format
msgid "about %d months ago"
msgstr "för %d månader sedan"
-#: lib/util.php:895
+#: lib/util.php:893
msgid "about a year ago"
msgstr "för ett år sedan"
@@ -5575,6 +5893,6 @@ msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr "%s är inte en giltig färg! Använd 3 eller 6 hexadecimala tecken."
#: scripts/xmppdaemon.php:301
-#, fuzzy, php-format
+#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr "Meddelande för långt - maximum är %d tecken, du skickade %d"
+msgstr "Meddelande för långt - maximum är %1$d tecken, du skickade %2$d."
diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po
index 72ed8daaf..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-13 22:04+0000\n"
-"PO-Revision-Date: 2010-01-13 22:06:12+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 (r61027); 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
@@ -50,8 +50,13 @@ msgstr "అటువంటి పేజీ లేదు"
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 అక్షరాలు గరిష్ఠం)."
@@ -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 "మీ అవతారానికి గానూ ఈ చిత్రం నుండి ఒక చతురస్రపు ప్రదేశాన్ని ఎంచుకోండి"
@@ -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"
@@ -1027,7 +1182,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 "రద్దుచేయి"
@@ -1669,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:237
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236
msgid "Send"
msgstr "పంపించు"
@@ -1752,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 "నన్ను గుర్తుంచుకో"
@@ -1814,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 "కొత్త గుంపు"
@@ -1921,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 ""
@@ -1938,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 ""
@@ -1952,7 +2165,7 @@ msgid "Notice Search"
msgstr "నోటీసుల అన్వేషణ"
#: actions/othersettings.php:60
-msgid "Other Settings"
+msgid "Other settings"
msgstr "ఇతర అమరికలు"
#: actions/othersettings.php:71
@@ -2279,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 "హోమ్ పేజీ"
@@ -2552,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!"
@@ -2847,6 +3060,82 @@ msgstr "మీరు ఇప్పటికే లోనికి ప్రవే
msgid "User is already sandboxed."
msgstr "వాడుకరిని ఇప్పటికే గుంపునుండి నిరోధించారు."
+#: actions/showapplication.php:82
+#, fuzzy
+msgid "You must be logged in to view an application."
+msgstr "గుంపుని వదిలివెళ్ళడానికి మీరు ప్రవేశించి ఉండాలి."
+
+#: actions/showapplication.php:158
+msgid "Application profile"
+msgstr ""
+
+#: actions/showapplication.php:160 lib/applicationeditform.php:182
+msgid "Icon"
+msgstr "ప్రతీకం"
+
+#: actions/showapplication.php:170 actions/version.php:195
+#: lib/applicationeditform.php:197
+msgid "Name"
+msgstr "పేరు"
+
+#: actions/showapplication.php:179 lib/applicationeditform.php:224
+msgid "Organization"
+msgstr "సంస్ధ"
+
+#: actions/showapplication.php:188 actions/version.php:198
+#: lib/applicationeditform.php:211 lib/groupeditform.php:172
+msgid "Description"
+msgstr "వివరణ"
+
+#: actions/showapplication.php:193 actions/showgroup.php:429
+#: lib/profileaction.php:174
+msgid "Statistics"
+msgstr "గణాంకాలు"
+
+#: actions/showapplication.php:204
+#, php-format
+msgid "created by %1$s - %2$s access by default - %3$d users"
+msgstr ""
+
+#: actions/showapplication.php:214
+msgid "Application actions"
+msgstr ""
+
+#: actions/showapplication.php:233
+msgid "Reset key & secret"
+msgstr ""
+
+#: actions/showapplication.php:241
+msgid "Application info"
+msgstr ""
+
+#: actions/showapplication.php:243
+msgid "Consumer key"
+msgstr ""
+
+#: actions/showapplication.php:248
+msgid "Consumer secret"
+msgstr ""
+
+#: actions/showapplication.php:253
+msgid "Request token URL"
+msgstr ""
+
+#: actions/showapplication.php:258
+msgid "Access token URL"
+msgstr ""
+
+#: actions/showapplication.php:263
+#, fuzzy
+msgid "Authorize URL"
+msgstr "రచయిత"
+
+#: actions/showapplication.php:268
+msgid ""
+"Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
+"signature method."
+msgstr ""
+
#: actions/showfavorites.php:132
msgid "Could not retrieve favorite notices."
msgstr ""
@@ -2952,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 "సృష్టితం"
@@ -3090,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."
@@ -3156,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"
@@ -3285,7 +3567,6 @@ msgid "Save site settings"
msgstr "సైటు అమరికలను భద్రపరచు"
#: actions/smssettings.php:58
-#, fuzzy
msgid "SMS settings"
msgstr "SMS అమరికలు"
@@ -3781,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
@@ -3793,9 +4074,8 @@ msgid ""
msgstr ""
#: actions/version.php:157
-#, fuzzy
msgid "StatusNet"
-msgstr "స్థితిని తొలగించాం."
+msgstr "స్టేటస్‌నెట్"
#: actions/version.php:161
msgid "Contributors"
@@ -3828,23 +4108,14 @@ msgstr ""
msgid "Plugins"
msgstr ""
-#: actions/version.php:195
-msgid "Name"
-msgstr "పేరు"
-
#: actions/version.php:196 lib/action.php:741
-#, fuzzy
msgid "Version"
-msgstr "వ్యక్తిగత"
+msgstr "సంచిక"
#: actions/version.php:197
msgid "Author(s)"
msgstr "రచయిత(లు)"
-#: actions/version.php:198 lib/groupeditform.php:172
-msgid "Description"
-msgstr "వివరణ"
-
#: classes/File.php:144
#, php-format
msgid ""
@@ -3863,9 +4134,8 @@ 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 "గుంపు ప్రొఫైలు"
+msgstr "గుంపులో చేరడం విఫలమైంది."
#: classes/Group_member.php:53
#, fuzzy
@@ -3873,9 +4143,8 @@ msgid "Not part of group."
msgstr "గుంపుని తాజాకరించలేకున్నాం."
#: classes/Group_member.php:60
-#, fuzzy
msgid "Group leave failed."
-msgstr "గుంపు ప్రొఫైలు"
+msgstr "గుంపు నుండి వైదొలగడం విఫలమైంది."
#: classes/Login_token.php:76
#, fuzzy, php-format
@@ -4003,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 "మీ ఈమెయిలు, అవతారం, సంకేతపదం మరియు ప్రౌఫైళ్ళను మార్చుకోండి"
@@ -4165,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 "ఈ సైటుకి మీరు మార్పులు చేయలేరు."
@@ -4203,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 "జోడింపులు"
@@ -4224,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 "సంకేతపదం మార్పు"
@@ -4385,7 +4712,7 @@ msgstr "సందేశాన్ని భద్రపరచడంలో పొ
#: lib/command.php:547
msgid "Specify the name of the user to subscribe to"
-msgstr ""
+msgstr "ఏవరికి చందా చేరాలనుకుంటున్నారో ఆ వాడుకరి పేరు తెలియజేయండి"
#: lib/command.php:554
#, php-format
@@ -4394,12 +4721,12 @@ msgstr "%sకి చందా చేరారు"
#: lib/command.php:575
msgid "Specify the name of the user to unsubscribe from"
-msgstr ""
+msgstr "ఎవరి నుండి చందా విరమించాలనుకుంటున్నారో ఆ వాడుకరి పేరు తెలియజేయండి"
#: lib/command.php:582
#, php-format
msgid "Unsubscribed from %s"
-msgstr ""
+msgstr "%s నుండి చందా విరమించారు"
#: lib/command.php:600 lib/command.php:623
msgid "Command not yet implemented."
@@ -4530,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 ""
@@ -4539,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."
@@ -4616,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
@@ -5041,10 +5375,6 @@ msgid "Do not share my location"
msgstr "ట్యాగులని భద్రపరచలేకున్నాం."
#: lib/noticeform.php:216
-msgid "Hide this info"
-msgstr ""
-
-#: lib/noticeform.php:217
msgid ""
"Sorry, retrieving your geo location is taking longer than expected, please "
"try again later"
@@ -5412,47 +5742,47 @@ msgstr "సందేశం"
msgid "Moderate"
msgstr ""
-#: lib/util.php:877
+#: lib/util.php:875
msgid "a few seconds ago"
msgstr "కొన్ని క్షణాల క్రితం"
-#: lib/util.php:879
+#: lib/util.php:877
msgid "about a minute ago"
msgstr "ఓ నిమిషం క్రితం"
-#: lib/util.php:881
+#: lib/util.php:879
#, php-format
msgid "about %d minutes ago"
msgstr "%d నిమిషాల క్రితం"
-#: lib/util.php:883
+#: lib/util.php:881
msgid "about an hour ago"
msgstr "ఒక గంట క్రితం"
-#: lib/util.php:885
+#: lib/util.php:883
#, php-format
msgid "about %d hours ago"
msgstr "%d గంటల క్రితం"
-#: lib/util.php:887
+#: lib/util.php:885
msgid "about a day ago"
msgstr "ఓ రోజు క్రితం"
-#: lib/util.php:889
+#: lib/util.php:887
#, php-format
msgid "about %d days ago"
msgstr "%d రోజుల క్రితం"
-#: lib/util.php:891
+#: lib/util.php:889
msgid "about a month ago"
msgstr "ఓ నెల క్రితం"
-#: lib/util.php:893
+#: lib/util.php:891
#, php-format
msgid "about %d months ago"
msgstr "%d నెలల క్రితం"
-#: lib/util.php:895
+#: lib/util.php:893
msgid "about a year ago"
msgstr "ఒక సంవత్సరం క్రితం"
@@ -5467,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 c45612030..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-13 22:04+0000\n"
-"PO-Revision-Date: 2010-01-13 22:06:15+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 (r61027); 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
@@ -51,8 +51,13 @@ msgstr "Böyle bir durum mesajı yok."
msgid "No such user."
msgstr "Böyle bir kullanıcı yok."
+#: actions/all.php:84
+#, fuzzy, php-format
+msgid "%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)."
@@ -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 ""
@@ -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"
@@ -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:237
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236
msgid "Send"
msgstr "Gönder"
@@ -1825,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"
@@ -1890,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 ""
@@ -1997,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"
@@ -2015,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 ""
@@ -2030,7 +2243,7 @@ msgstr ""
#: actions/othersettings.php:60
#, fuzzy
-msgid "Other Settings"
+msgid "Other settings"
msgstr "Ayarlar"
#: actions/othersettings.php:71
@@ -2367,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ı"
@@ -2945,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 ""
@@ -3053,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"
@@ -3948,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"
@@ -3962,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 ""
@@ -4127,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 ""
@@ -4295,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 ""
@@ -4334,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 ""
@@ -4355,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."
@@ -4658,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 ""
@@ -5182,10 +5527,6 @@ msgid "Do not share my location"
msgstr "Profil kaydedilemedi."
#: lib/noticeform.php:216
-msgid "Hide this info"
-msgstr ""
-
-#: lib/noticeform.php:217
msgid ""
"Sorry, retrieving your geo location is taking longer than expected, please "
"try again later"
@@ -5560,47 +5901,47 @@ msgstr ""
msgid "Moderate"
msgstr ""
-#: lib/util.php:877
+#: lib/util.php:875
msgid "a few seconds ago"
msgstr "birkaç saniye önce"
-#: lib/util.php:879
+#: lib/util.php:877
msgid "about a minute ago"
msgstr "yaklaşık bir dakika önce"
-#: lib/util.php:881
+#: lib/util.php:879
#, php-format
msgid "about %d minutes ago"
msgstr "yaklaşık %d dakika önce"
-#: lib/util.php:883
+#: lib/util.php:881
msgid "about an hour ago"
msgstr "yaklaşık bir saat önce"
-#: lib/util.php:885
+#: lib/util.php:883
#, php-format
msgid "about %d hours ago"
msgstr "yaklaşık %d saat önce"
-#: lib/util.php:887
+#: lib/util.php:885
msgid "about a day ago"
msgstr "yaklaşık bir gün önce"
-#: lib/util.php:889
+#: lib/util.php:887
#, php-format
msgid "about %d days ago"
msgstr "yaklaşık %d gün önce"
-#: lib/util.php:891
+#: lib/util.php:889
msgid "about a month ago"
msgstr "yaklaşık bir ay önce"
-#: lib/util.php:893
+#: lib/util.php:891
#, php-format
msgid "about %d months ago"
msgstr "yaklaşık %d ay önce"
-#: lib/util.php:895
+#: 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 49e8ae309..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-13 22:04+0000\n"
-"PO-Revision-Date: 2010-01-13 22:06:18+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 (r61027); 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
@@ -53,8 +53,13 @@ msgstr "Немає такої сторінки"
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 знаків максимум)."
@@ -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 "Оберіть квадратну ділянку зображення, яка й буде Вашою автарою."
@@ -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 "Скасувати"
@@ -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:237
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236
msgid "Send"
msgstr "Так!"
@@ -1827,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 "Пам’ятати мене"
@@ -1893,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 "Нова група"
@@ -2006,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 "Допис не має профілю"
@@ -2023,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 "Такий формат даних не підтримується."
@@ -2037,7 +2239,7 @@ msgid "Notice Search"
msgstr "Пошук дописів"
#: actions/othersettings.php:60
-msgid "Other Settings"
+msgid "Other settings"
msgstr "Інші опції"
#: actions/othersettings.php:71
@@ -2356,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 "Веб-сторінка"
@@ -2964,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 "Не можна відновити обрані дописи."
@@ -3077,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 "Створено"
@@ -4005,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 "Версія"
@@ -4017,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 ""
@@ -4041,19 +4307,16 @@ 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 "Профіль групи"
+msgstr "Не вдалося приєднатись до групи."
#: classes/Group_member.php:53
-#, fuzzy
msgid "Not part of group."
-msgstr "Не вдалося оновити групу."
+msgstr "Не є частиною групи."
#: classes/Group_member.php:60
-#, fuzzy
msgid "Group leave failed."
-msgstr "Профіль групи"
+msgstr "Не вдалося залишити групу."
#: classes/Login_token.php:76
#, php-format
@@ -4181,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 "Змінити електронну адресу, аватару, пароль, профіль"
@@ -4338,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 "Ви не можете щось змінювати на цьому сайті."
@@ -4374,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 "Вкладення"
@@ -4394,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 "Змінювати пароль не дозволено"
@@ -4730,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 "Помилка бази даних"
@@ -4921,9 +5246,9 @@ msgid "[%s]"
msgstr "[%s]"
#: lib/jabber.php:385
-#, fuzzy, php-format
+#, php-format
msgid "Unknown inbox source %d."
-msgstr "Невідома мова «%s»."
+msgstr "Невідоме джерело вхідного повідомлення %d."
#: lib/joinform.php:114
msgid "Join"
@@ -5319,14 +5644,12 @@ msgid "Do not share my location"
msgstr "Приховувати мою локацію"
#: lib/noticeform.php:216
-msgid "Hide this info"
-msgstr "Сховати інформацію"
-
-#: lib/noticeform.php:217
msgid ""
"Sorry, retrieving your geo location is taking longer than expected, please "
"try again later"
msgstr ""
+"На жаль, отримання інформації щодо Вашого місцезнаходження займе більше "
+"часу, ніж очікувалось; будь ласка, спробуйте пізніше"
#: lib/noticelist.php:428
#, php-format
@@ -5675,47 +5998,47 @@ msgstr "Повідомлення"
msgid "Moderate"
msgstr "Модерувати"
-#: lib/util.php:877
+#: lib/util.php:875
msgid "a few seconds ago"
msgstr "мить тому"
-#: lib/util.php:879
+#: lib/util.php:877
msgid "about a minute ago"
msgstr "хвилину тому"
-#: lib/util.php:881
+#: lib/util.php:879
#, php-format
msgid "about %d minutes ago"
msgstr "близько %d хвилин тому"
-#: lib/util.php:883
+#: lib/util.php:881
msgid "about an hour ago"
msgstr "годину тому"
-#: lib/util.php:885
+#: lib/util.php:883
#, php-format
msgid "about %d hours ago"
msgstr "близько %d годин тому"
-#: lib/util.php:887
+#: lib/util.php:885
msgid "about a day ago"
msgstr "день тому"
-#: lib/util.php:889
+#: lib/util.php:887
#, php-format
msgid "about %d days ago"
msgstr "близько %d днів тому"
-#: lib/util.php:891
+#: lib/util.php:889
msgid "about a month ago"
msgstr "місяць тому"
-#: lib/util.php:893
+#: lib/util.php:891
#, php-format
msgid "about %d months ago"
msgstr "близько %d місяців тому"
-#: lib/util.php:895
+#: 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 82d4d2037..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-13 22:04+0000\n"
-"PO-Revision-Date: 2010-01-13 22:06:21+0000\n"
+"POT-Creation-Date: 2010-01-15 19:15+0000\n"
+"PO-Revision-Date: 2010-01-15 19:18:14+0000\n"
"Language-Team: Vietnamese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r61027); 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
@@ -50,8 +50,13 @@ msgstr "Không có tin nhắn nào."
msgid "No such user."
msgstr "Không có user nào."
+#: actions/all.php:84
+#, fuzzy, php-format
+msgid "%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ự)"
@@ -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 ""
@@ -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"
@@ -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:237
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236
msgid "Send"
msgstr "Gửi"
@@ -1903,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"
@@ -1967,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"
@@ -2081,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"
@@ -2099,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."
@@ -2115,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
@@ -2458,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"
@@ -3058,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"
@@ -3167,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"
@@ -4091,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"
@@ -4105,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 ""
@@ -4274,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"
@@ -4445,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."
@@ -4488,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 ""
@@ -4509,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."
@@ -4819,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 ""
@@ -5403,10 +5751,6 @@ msgid "Do not share my location"
msgstr "Không thể lưu hồ sơ cá nhân."
#: lib/noticeform.php:216
-msgid "Hide this info"
-msgstr ""
-
-#: lib/noticeform.php:217
msgid ""
"Sorry, retrieving your geo location is taking longer than expected, please "
"try again later"
@@ -5798,47 +6142,47 @@ msgstr "Tin mới nhất"
msgid "Moderate"
msgstr ""
-#: lib/util.php:877
+#: lib/util.php:875
msgid "a few seconds ago"
msgstr "vài giây trước"
-#: lib/util.php:879
+#: lib/util.php:877
msgid "about a minute ago"
msgstr "1 phút trước"
-#: lib/util.php:881
+#: lib/util.php:879
#, php-format
msgid "about %d minutes ago"
msgstr "%d phút trước"
-#: lib/util.php:883
+#: lib/util.php:881
msgid "about an hour ago"
msgstr "1 giờ trước"
-#: lib/util.php:885
+#: lib/util.php:883
#, php-format
msgid "about %d hours ago"
msgstr "%d giờ trước"
-#: lib/util.php:887
+#: lib/util.php:885
msgid "about a day ago"
msgstr "1 ngày trước"
-#: lib/util.php:889
+#: lib/util.php:887
#, php-format
msgid "about %d days ago"
msgstr "%d ngày trước"
-#: lib/util.php:891
+#: lib/util.php:889
msgid "about a month ago"
msgstr "1 tháng trước"
-#: lib/util.php:893
+#: lib/util.php:891
#, php-format
msgid "about %d months ago"
msgstr "%d tháng trước"
-#: lib/util.php:895
+#: 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 32adff438..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-13 22:04+0000\n"
-"PO-Revision-Date: 2010-01-13 22:06:24+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 (r61027); 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
@@ -52,8 +52,13 @@ msgstr "没有该页面"
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字符)。"
@@ -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 "请选择一块方形区域作为你的头像"
@@ -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 "取消"
@@ -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:237
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236
msgid "Send"
msgstr "发送"
@@ -1860,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 "记住登录状态"
@@ -1921,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 "新组"
@@ -2028,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 "通告没有关联个人信息"
@@ -2046,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 "不支持的数据格式。"
@@ -2061,7 +2282,7 @@ msgstr "搜索通告"
#: actions/othersettings.php:60
#, fuzzy
-msgid "Other Settings"
+msgid "Other settings"
msgstr "Twitter 设置"
#: actions/othersettings.php:71
@@ -2396,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 "主页"
@@ -2989,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 "无法获取收藏的通告。"
@@ -3097,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"
@@ -4015,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"
@@ -4029,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 ""
@@ -4194,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 "修改资料"
@@ -4363,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."
@@ -4408,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 ""
@@ -4429,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 "密码已保存。"
@@ -4732,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 ""
@@ -5267,10 +5619,6 @@ msgid "Do not share my location"
msgstr "无法保存个人信息。"
#: lib/noticeform.php:216
-msgid "Hide this info"
-msgstr ""
-
-#: lib/noticeform.php:217
msgid ""
"Sorry, retrieving your geo location is taking longer than expected, please "
"try again later"
@@ -5660,47 +6008,47 @@ msgstr "新消息"
msgid "Moderate"
msgstr ""
-#: lib/util.php:877
+#: lib/util.php:875
msgid "a few seconds ago"
msgstr "几秒前"
-#: lib/util.php:879
+#: lib/util.php:877
msgid "about a minute ago"
msgstr "一分钟前"
-#: lib/util.php:881
+#: lib/util.php:879
#, php-format
msgid "about %d minutes ago"
msgstr "%d 分钟前"
-#: lib/util.php:883
+#: lib/util.php:881
msgid "about an hour ago"
msgstr "一小时前"
-#: lib/util.php:885
+#: lib/util.php:883
#, php-format
msgid "about %d hours ago"
msgstr "%d 小时前"
-#: lib/util.php:887
+#: lib/util.php:885
msgid "about a day ago"
msgstr "一天前"
-#: lib/util.php:889
+#: lib/util.php:887
#, php-format
msgid "about %d days ago"
msgstr "%d 天前"
-#: lib/util.php:891
+#: lib/util.php:889
msgid "about a month ago"
msgstr "一个月前"
-#: lib/util.php:893
+#: lib/util.php:891
#, php-format
msgid "about %d months ago"
msgstr "%d 个月前"
-#: lib/util.php:895
+#: 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 5a6552550..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-13 22:04+0000\n"
-"PO-Revision-Date: 2010-01-13 22:06:27+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 (r61027); 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
@@ -50,8 +50,13 @@ msgstr "無此通知"
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個字元)"
@@ -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 ""
@@ -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 "取消"
@@ -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:237
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236
msgid "Send"
msgstr ""
@@ -1795,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 ""
@@ -1854,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 ""
@@ -1958,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 ""
@@ -1976,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 ""
@@ -1991,7 +2204,7 @@ msgstr ""
#: actions/othersettings.php:60
#, fuzzy
-msgid "Other Settings"
+msgid "Other settings"
msgstr "線上即時通設定"
#: actions/othersettings.php:71
@@ -2316,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 "個人首頁"
@@ -2882,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 ""
@@ -2989,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"
@@ -3871,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"
@@ -3885,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 ""
@@ -4050,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 ""
@@ -4212,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 ""
@@ -4251,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 ""
@@ -4271,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 ""
@@ -4571,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 ""
@@ -5089,10 +5427,6 @@ msgid "Do not share my location"
msgstr "無法儲存個人資料"
#: lib/noticeform.php:216
-msgid "Hide this info"
-msgstr ""
-
-#: lib/noticeform.php:217
msgid ""
"Sorry, retrieving your geo location is taking longer than expected, please "
"try again later"
@@ -5462,47 +5796,47 @@ msgstr ""
msgid "Moderate"
msgstr ""
-#: lib/util.php:877
+#: lib/util.php:875
msgid "a few seconds ago"
msgstr ""
-#: lib/util.php:879
+#: lib/util.php:877
msgid "about a minute ago"
msgstr ""
-#: lib/util.php:881
+#: lib/util.php:879
#, php-format
msgid "about %d minutes ago"
msgstr ""
-#: lib/util.php:883
+#: lib/util.php:881
msgid "about an hour ago"
msgstr ""
-#: lib/util.php:885
+#: lib/util.php:883
#, php-format
msgid "about %d hours ago"
msgstr ""
-#: lib/util.php:887
+#: lib/util.php:885
msgid "about a day ago"
msgstr ""
-#: lib/util.php:889
+#: lib/util.php:887
#, php-format
msgid "about %d days ago"
msgstr ""
-#: lib/util.php:891
+#: lib/util.php:889
msgid "about a month ago"
msgstr ""
-#: lib/util.php:893
+#: lib/util.php:891
#, php-format
msgid "about %d months ago"
msgstr ""
-#: lib/util.php:895
+#: lib/util.php:893
msgid "about a year ago"
msgstr ""
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/MobileProfile/MobileProfilePlugin.php b/plugins/MobileProfile/MobileProfilePlugin.php
index 14d2500e8..d426fc282 100644
--- a/plugins/MobileProfile/MobileProfilePlugin.php
+++ b/plugins/MobileProfile/MobileProfilePlugin.php
@@ -356,8 +356,6 @@ class MobileProfilePlugin extends WAP20Plugin
$contentLimit = Notice::maxContent();
- $form->out->inlineScript('maxLength = ' . $contentLimit . ';');
-
if ($contentLimit > 0) {
$form->out->element('div', array('id' => 'notice_text-count'),
$contentLimit);
diff --git a/plugins/MobileProfile/mp-screen.css b/plugins/MobileProfile/mp-screen.css
index 3eefc0c8e..04fa5fb00 100644
--- a/plugins/MobileProfile/mp-screen.css
+++ b/plugins/MobileProfile/mp-screen.css
@@ -176,13 +176,25 @@ margin-bottom:0;
.profile {
padding-top:4px;
padding-bottom:4px;
+min-height:65px;
}
-.notice div.entry-content {
+#content .notice .entry-title {
+float:left;
+width:100%;
margin-left:0;
-width:62.5%;
+}
+#content .notice .author .photo {
+position:static;
+float:left;
+}
+#content .notice div.entry-content {
+margin-left:0;
+width:75%;
+max-width:100%;
+min-width:0;
}
.notice-options {
-width:34%;
+width:43px;
margin-right:1%;
}
@@ -190,12 +202,36 @@ margin-right:1%;
width:16px;
height:16px;
}
-.notice-options a,
-.notice-options input {
+.notice-options form.processing {
+background-image:none;
+}
+#wrap .notice-options form.processing input.submit {
+background-position:0 47%;
+}
+
+.notice .notice-options a,
+.notice .notice-options input {
box-shadow:none;
-moz-box-shadow:none;
-webkit-box-shadow:none;
}
+.notice .notice-options a,
+.notice .notice-options form {
+margin:-4px 0 0 0;
+}
+.notice .notice-options .form_repeat,
+.notice .notice-options .notice_delete {
+margin-top:11px;
+}
+.notice .notice-options .form_favor,
+.notice .notice-options .form_disfavor,
+.notice .notice-options .form_repeat {
+margin-right:11px;
+}
+
+.notice .notice-options .notice_delete {
+float:left;
+}
.entity_profile {
width:auto;
diff --git a/plugins/README-plugins b/plugins/README-plugins
new file mode 100644
index 000000000..cdce7eb18
--- /dev/null
+++ b/plugins/README-plugins
@@ -0,0 +1,21 @@
+Several example plugins are included in the plugins/ directory. You
+can enable a plugin with the following line in config.php:
+
+ addPlugin('Example', array('param1' => 'value1',
+ 'param2' => 'value2'));
+
+This will look for and load files named 'ExamplePlugin.php' or
+'Example/ExamplePlugin.php' either in the plugins/ directory (for
+plugins that ship with StatusNet) or in the local/ directory (for
+plugins you write yourself or that you get from somewhere else) or
+local/plugins/.
+
+Plugins are documented in their own directories.
+
+
+Additional information on using and developing plugins can be found
+on the StatusNet wiki:
+
+http://status.net/wiki/Plugins
+http://status.net/wiki/Plugin_development
+
diff --git a/plugins/Recaptcha/RecaptchaPlugin.php b/plugins/Recaptcha/RecaptchaPlugin.php
index 3665214f8..c585da43c 100644
--- a/plugins/Recaptcha/RecaptchaPlugin.php
+++ b/plugins/Recaptcha/RecaptchaPlugin.php
@@ -31,8 +31,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
exit(1);
}
-define('RECAPTCHA', '0.2');
-
require_once(INSTALLDIR.'/plugins/Recaptcha/recaptchalib.php');
class RecaptchaPlugin extends Plugin
@@ -88,4 +86,16 @@ class RecaptchaPlugin extends Plugin
return false;
}
}
+
+ function onPluginVersion(&$versions)
+ {
+ $versions[] = array('name' => 'Recaptcha',
+ 'version' => STATUSNET_VERSION,
+ 'author' => 'Eric Helgeson',
+ 'homepage' => 'http://status.net/wiki/Plugin:Recaptcha',
+ 'rawdescription' =>
+ _m('Uses <a href="http://recaptcha.org/">Recaptcha</a> service to add a '.
+ 'captcha to the registration page.'));
+ return true;
+ }
}
diff --git a/scripts/useremail.php b/scripts/useremail.php
index 6676a87c8..0a59d36f8 100755
--- a/scripts/useremail.php
+++ b/scripts/useremail.php
@@ -53,7 +53,17 @@ if (have_option('i', 'id')) {
if (!empty($user)) {
if (empty($user->email)) {
- print "No email registered for user '$user->nickname'\n";
+ # Check for unconfirmed emails
+ $unconfirmed_email = new Confirm_address();
+ $unconfirmed_email->user_id = $user->id;
+ $unconfirmed_email->address_type = 'email';
+ $unconfirmed_email->find(true);
+
+ if (empty($unconfirmed_email->address)) {
+ print "No email registered for user '$user->nickname'\n";
+ } else {
+ print "Unconfirmed Adress: $unconfirmed_email->address\n";
+ }
} else {
print "$user->email\n";
}
@@ -65,7 +75,18 @@ if (have_option('e', 'email')) {
$user->email = get_option_value('e', 'email');
$user->find(false);
if (!$user->fetch()) {
- print "No users with email $user->email\n";
+ # Check unconfirmed emails
+ $unconfirmed_email = new Confirm_address();
+ $unconfirmed_email->address = $user->email;
+ $unconfirmed_email->address_type = 'email';
+ $unconfirmed_email->find(true);
+
+ if (empty($unconfirmed_email->user_id)) {
+ print "No users with email $user->email\n";
+ } else {
+ $user=User::staticGet('id', $unconfirmed_email->user_id);
+ print "Unconfirmed Address: $user->id $user->nickname\n";
+ }
exit(0);
}
do {
diff --git a/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 2e4c88dfa..84e9426c7 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;
}
@@ -567,7 +568,8 @@ float:right;
font-size:0.8em;
}
-.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;
@@ -578,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;
@@ -894,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;
@@ -956,6 +1012,16 @@ float:left;
#shownotice .vcard .photo {
margin-bottom:4px;
}
+#content .notice .author .photo {
+position:absolute;
+top:11px;
+left:0;
+float:none;
+}
+#content .notice .entry-title {
+margin-left:59px;
+}
+
.vcard .url {
text-decoration:none;
}
@@ -964,13 +1030,19 @@ text-decoration:underline;
}
.notice .entry-title {
-float:left;
-width:100%;
overflow:hidden;
}
.notice .entry-title.ov {
overflow:visible;
}
+#showstream .notice .entry-title,
+#showstream .notice div.entry-content {
+margin-left:0;
+}
+#shownotice .notice .entry-title,
+#shownotice .notice div.entry-content {
+margin-left:110px;
+}
#shownotice .notice .entry-title {
font-size:2.2em;
}
@@ -1000,7 +1072,6 @@ max-width:70%;
}
#showstream .notice div.entry-content,
#shownotice .notice div.entry-content {
-margin-left:0;
max-width:79%;
}
@@ -1064,6 +1135,7 @@ position:relative;
font-size:0.95em;
width:113px;
float:right;
+margin-top:3px;
margin-right:4px;
}
diff --git a/theme/base/css/mobile.css b/theme/base/css/mobile.css
deleted file mode 100644
index f6c53ea8d..000000000
--- a/theme/base/css/mobile.css
+++ /dev/null
@@ -1,150 +0,0 @@
-/** theme: base
- *
- * @package StatusNet
- * @author Meitar Moscovitz <meitar@maymay.net>
- * @author Sarven Capadisli <csarven@status.net>
- * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link http://status.net/
- */
-
-body {
-font-size:2.5em;
-}
-
-#wrap {
-width:95%;
-}
-
-#header,
-#header address,
-#anon_notice,
-#site_nav_local_views .nav,
-#form_notice,
-#form_notice .form_data li,
-#core,
-#content_inner,
-#notices_primary,
-.notice,
-.notice .entry-title,
-.notice div.entry-content,
-.notice-options,
-.notice .notice-options a,
-.pagination,
-.pagination .nav,
-.aside .section {
-float:none;
-}
-
-.notice-options .notice_reply,
-.notice-options .notice_delete,
-.notice-options .form_favor,
-.notice-options .form_disfavor {
-position:static;
-}
-
-#form_notice,
-#anon_notice,
-#footer,
-#form_notice .form_actions input.submit {
-width:auto;
-}
-
-.form_settings label {
-width:25%;
-}
-.form_settings .form_data p.form_guide {
-margin-left:26%;
-}
-
-#site_nav_global_primary {
-width:75%;
-}
-
-.entity_profile {
-width:65%;
-}
-.entity_actions {
-margin-left:0;
-}
-
-#form_notice,
-#anon_notice {
-clear:both;
-}
-
-#content,
-#aside_primary {
-width:96%;
-padding-left:2%;
-padding-right:2%;
-}
-
-#site_notice {
-position:static;
-float:right;
-clear:right;
-width:75%;
-margin-right:0;
-margin-bottom:11px;
-}
-
-.notices {
-font-size:1.5em;
-}
-
-#form_notice textarea {
-width:80%;
-height:5em;
-}
-#form_notice .form_note {
-right:20%;
-top:6em;
-}
-
-
-.vcard .photo,
-.section .vcard .photo {
-margin-right:18px;
-}
-.notice,
-.profile {
-margin-bottom:18px;
-}
-
-.notices .entry-title,
-.notices div.entry-content {
-width:90%;
-}
-.notice div.entry-content {
-margin-left:0;
-}
-
-.notice .author .photo {
-height:4.5em;
-width:4.5em;
-}
-.notice-options {
-position:absolute;
-top:0;
-right:0;
-padding-left:7%;
-width:3%;
-}
-
-.notice-options .notice_delete a {
-float:left;
-}
-.pagination .nav {
-overflow:auto;
-}
-
-#export_data {
-display:none;
-}
-
-#site_nav_local_views li {
-margin-right:4px;
-}
-#site_nav_local_views a {
-padding:18px 11px;
-}
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 8a2c01175..3aebb239d 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -129,6 +129,7 @@ color:#002FA7;
.notice,
.profile,
+.application,
#content tbody tr {
border-top-color:#C8D1D5;
}
@@ -187,7 +188,8 @@ button.close,
.entity_delete input.submit,
.notice-options .repeated,
.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;
@@ -332,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 {
@@ -378,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 4ee48459d..2818196c2 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -129,6 +129,7 @@ color:#002FA7;
.notice,
.profile,
+.application,
#content tbody tr {
border-top-color:#CEE1E9;
}
@@ -187,7 +188,8 @@ button.close,
.entity_delete input.submit,
.notice-options .repeated,
.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;
@@ -331,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 {
@@ -377,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);
}