summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--EVENTS.txt6
-rw-r--r--actions/apiaccountupdateprofile.php4
-rw-r--r--actions/apiaccountverifycredentials.php14
-rw-r--r--actions/apigroupjoin.php2
-rw-r--r--actions/apigroupleave.php2
-rw-r--r--actions/apigroupshow.php29
-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/doc.php152
-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/File.php2
-rw-r--r--classes/Memcached_DataObject.php33
-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/identica-badge.js2
-rw-r--r--js/util.js54
-rw-r--r--lib/action.php10
-rw-r--r--lib/api.php14
-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.php8
-rw-r--r--lib/designsettings.php2
-rw-r--r--lib/iomaster.php10
-rw-r--r--lib/queuemanager.php6
-rw-r--r--lib/router.php25
-rw-r--r--lib/statusnet.php2
-rw-r--r--lib/util.php17
-rw-r--r--locale/ar/LC_MESSAGES/statusnet.po783
-rw-r--r--locale/arz/LC_MESSAGES/statusnet.po741
-rw-r--r--locale/bg/LC_MESSAGES/statusnet.po574
-rw-r--r--locale/ca/LC_MESSAGES/statusnet.po577
-rw-r--r--locale/cs/LC_MESSAGES/statusnet.po568
-rw-r--r--locale/de/LC_MESSAGES/statusnet.po575
-rw-r--r--locale/el/LC_MESSAGES/statusnet.po557
-rw-r--r--locale/en_GB/LC_MESSAGES/statusnet.po574
-rw-r--r--locale/es/LC_MESSAGES/statusnet.po574
-rw-r--r--locale/fa/LC_MESSAGES/statusnet.po568
-rw-r--r--locale/fi/LC_MESSAGES/statusnet.po580
-rw-r--r--locale/fr/LC_MESSAGES/statusnet.po594
-rw-r--r--locale/ga/LC_MESSAGES/statusnet.po580
-rw-r--r--locale/he/LC_MESSAGES/statusnet.po567
-rw-r--r--locale/hsb/LC_MESSAGES/statusnet.po611
-rw-r--r--locale/ia/LC_MESSAGES/statusnet.po567
-rw-r--r--locale/is/LC_MESSAGES/statusnet.po573
-rw-r--r--locale/it/LC_MESSAGES/statusnet.po576
-rw-r--r--locale/ja/LC_MESSAGES/statusnet.po596
-rw-r--r--locale/ko/LC_MESSAGES/statusnet.po573
-rw-r--r--locale/mk/LC_MESSAGES/statusnet.po571
-rw-r--r--locale/nb/LC_MESSAGES/statusnet.po565
-rw-r--r--locale/nl/LC_MESSAGES/statusnet.po582
-rw-r--r--locale/nn/LC_MESSAGES/statusnet.po573
-rw-r--r--locale/pl/LC_MESSAGES/statusnet.po559
-rw-r--r--locale/pt/LC_MESSAGES/statusnet.po574
-rw-r--r--locale/pt_BR/LC_MESSAGES/statusnet.po804
-rw-r--r--locale/ru/LC_MESSAGES/statusnet.po573
-rw-r--r--locale/statusnet.po536
-rw-r--r--locale/sv/LC_MESSAGES/statusnet.po948
-rw-r--r--locale/te/LC_MESSAGES/statusnet.po630
-rw-r--r--locale/tr/LC_MESSAGES/statusnet.po569
-rw-r--r--locale/uk/LC_MESSAGES/statusnet.po563
-rw-r--r--locale/vi/LC_MESSAGES/statusnet.po572
-rw-r--r--locale/zh_CN/LC_MESSAGES/statusnet.po576
-rw-r--r--locale/zh_TW/LC_MESSAGES/statusnet.po562
-rw-r--r--plugins/Imap/ImapPlugin.php2
-rw-r--r--plugins/LdapAuthentication/LdapAuthenticationPlugin.php16
-rw-r--r--plugins/MobileProfile/MobileProfilePlugin.php16
-rw-r--r--plugins/MobileProfile/mp-screen.css46
-rw-r--r--plugins/PoweredByStatusNet/PoweredByStatusNetPlugin.php5
-rw-r--r--plugins/PoweredByStatusNet/locale/PoweredByStatusNet.po32
-rw-r--r--plugins/PubSubHubBub/PubSubHubBubPlugin.php21
-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/README51
-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
108 files changed, 21234 insertions, 4888 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/apiaccountupdateprofile.php b/actions/apiaccountupdateprofile.php
index fd4384a25..9b371ea95 100644
--- a/actions/apiaccountupdateprofile.php
+++ b/actions/apiaccountupdateprofile.php
@@ -115,11 +115,11 @@ class ApiAccountUpdateProfileAction extends ApiAuthAction
$original = clone($profile);
- if (empty($this->name)) {
+ if (!empty($this->name)) {
$profile->fullname = $this->name;
}
- if (empty($this->url)) {
+ if (!empty($this->url)) {
$profile->homepage = $this->url;
}
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/apigroupshow.php b/actions/apigroupshow.php
index 7aa49b1bf..ef9cbf0e7 100644
--- a/actions/apigroupshow.php
+++ b/actions/apigroupshow.php
@@ -45,6 +45,7 @@ require_once INSTALLDIR . '/lib/apiprivateauth.php';
* @author Evan Prodromou <evan@status.net>
* @author Jeffery To <jeffery.to@gmail.com>
* @author Zach Copley <zach@status.net>
+ * @author Michele <macno@macno.org>
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
@@ -68,6 +69,24 @@ class ApiGroupShowAction extends ApiPrivateAuthAction
$this->group = $this->getTargetGroup($this->arg('id'));
+ if (empty($this->group)) {
+ $alias = Group_alias::staticGet(
+ 'alias',
+ common_canonical_nickname($this->arg('id'))
+ );
+ if (!empty($alias)) {
+ $args = array('id' => $alias->group_id, 'format' => $this->format);
+ common_redirect(common_local_url('ApiGroupShow', $args), 301);
+ } else {
+ $this->clientError(
+ _('Group not found!'),
+ 404,
+ $this->format
+ );
+ }
+ return;
+ }
+
return true;
}
@@ -85,15 +104,6 @@ class ApiGroupShowAction extends ApiPrivateAuthAction
{
parent::handle($args);
- if (empty($this->group)) {
- $this->clientError(
- _('Group not found!'),
- 404,
- $this->format
- );
- return;
- }
-
switch($this->format) {
case 'xml':
$this->showSingleXmlGroup($this->group);
@@ -105,7 +115,6 @@ class ApiGroupShowAction extends ApiPrivateAuthAction
$this->clientError(_('API method not found.'), 404, $this->format);
break;
}
-
}
/**
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 9d831b9db..31c9b20ce 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/doc.php b/actions/doc.php
index 836f039d3..25d363472 100644
--- a/actions/doc.php
+++ b/actions/doc.php
@@ -45,11 +45,23 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
*/
class DocAction extends Action
{
- var $filename;
- var $title;
+ var $output = null;
+ var $filename = null;
+ var $title = null;
+
+ function prepare($args)
+ {
+ parent::prepare($args);
+
+ $this->title = $this->trimmed('title');
+ $this->output = null;
+
+ $this->loadDoc();
+ return true;
+ }
/**
- * Class handler.
+ * Handle a request
*
* @param array $args array of arguments
*
@@ -58,51 +70,51 @@ class DocAction extends Action
function handle($args)
{
parent::handle($args);
-
- $this->title = $this->trimmed('title');
- $this->output = null;
-
- if (Event::handle('StartLoadDoc', array(&$this->title, &$this->output))) {
-
- $this->filename = INSTALLDIR.'/doc-src/'.$this->title;
- if (!file_exists($this->filename)) {
- $this->clientError(_('No such document.'));
- return;
- }
-
- $c = file_get_contents($this->filename);
- $this->output = common_markup_to_html($c);
-
- Event::handle('EndLoadDoc', array($this->title, &$this->output));
- }
-
$this->showPage();
}
- // overrrided to add entry-title class
- function showPageTitle() {
+ /**
+ * Page title
+ *
+ * Gives the page title of the document. Override default for hAtom entry.
+ *
+ * @return void
+ */
+
+ function showPageTitle()
+ {
$this->element('h1', array('class' => 'entry-title'), $this->title());
}
- // overrided to add hentry, and content-inner classes
+ /**
+ * Block for content.
+ *
+ * Overrides default from Action to wrap everything in an hAtom entry.
+ *
+ * @return void.
+ */
+
function showContentBlock()
- {
- $this->elementStart('div', array('id' => 'content', 'class' => 'hentry'));
- $this->showPageTitle();
- $this->showPageNoticeBlock();
- $this->elementStart('div', array('id' => 'content_inner',
- 'class' => 'entry-content'));
- // show the actual content (forms, lists, whatever)
- $this->showContent();
- $this->elementEnd('div');
- $this->elementEnd('div');
- }
+ {
+ $this->elementStart('div', array('id' => 'content', 'class' => 'hentry'));
+ $this->showPageTitle();
+ $this->showPageNoticeBlock();
+ $this->elementStart('div', array('id' => 'content_inner',
+ 'class' => 'entry-content'));
+ // show the actual content (forms, lists, whatever)
+ $this->showContent();
+ $this->elementEnd('div');
+ $this->elementEnd('div');
+ }
/**
* Display content.
*
- * @return nothing
+ * Shows the content of the document.
+ *
+ * @return void
*/
+
function showContent()
{
$this->raw($this->output);
@@ -111,6 +123,8 @@ class DocAction extends Action
/**
* Page title.
*
+ * Uses the title of the document.
+ *
* @return page title
*/
function title()
@@ -118,8 +132,74 @@ class DocAction extends Action
return ucfirst($this->title);
}
+ /**
+ * These pages are read-only.
+ *
+ * @param array $args unused.
+ *
+ * @return boolean read-only flag (false)
+ */
+
function isReadOnly($args)
{
return true;
}
+
+ function loadDoc()
+ {
+ if (Event::handle('StartLoadDoc', array(&$this->title, &$this->output))) {
+
+ $this->filename = $this->getFilename();
+
+ if (empty($this->filename)) {
+ throw new ClientException(sprintf(_('No such document "%s"'), $this->title), 404);
+ }
+
+ $c = file_get_contents($this->filename);
+
+ $this->output = common_markup_to_html($c);
+
+ Event::handle('EndLoadDoc', array($this->title, &$this->output));
+ }
+ }
+
+ function getFilename()
+ {
+ if (file_exists(INSTALLDIR.'/local/doc-src/'.$this->title)) {
+ $localDef = INSTALLDIR.'/local/doc-src/'.$this->title;
+ }
+
+ $local = glob(INSTALLDIR.'/local/doc-src/'.$this->title.'.*');
+
+ if (count($local) || isset($localDef)) {
+ return $this->negotiateLanguage($local, $localDef);
+ }
+
+ if (file_exists(INSTALLDIR.'/doc-src/'.$this->title)) {
+ $distDef = INSTALLDIR.'/doc-src/'.$this->title;
+ }
+
+ $dist = glob(INSTALLDIR.'/doc-src/'.$this->title.'.*');
+
+ if (count($dist) || isset($distDef)) {
+ return $this->negotiateLanguage($dist, $distDef);
+ }
+
+ return null;
+ }
+
+ function negotiateLanguage($filenames, $defaultFilename=null)
+ {
+ // XXX: do this better
+
+ $langcode = common_language();
+
+ foreach ($filenames as $filename) {
+ if (preg_match('/\.'.$langcode.'$/', $filename)) {
+ return $filename;
+ }
+ }
+
+ return $defaultFilename;
+ }
}
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/File.php b/classes/File.php
index c527c4ffe..34e4632a8 100644
--- a/classes/File.php
+++ b/classes/File.php
@@ -251,6 +251,8 @@ class File extends Memcached_DataObject
if($oembed->modified) $enclosure->modified=$oembed->modified;
unset($oembed->size);
}
+ } else {
+ return false;
}
}
}
diff --git a/classes/Memcached_DataObject.php b/classes/Memcached_DataObject.php
index 2c9dcf595..43610dddb 100644
--- a/classes/Memcached_DataObject.php
+++ b/classes/Memcached_DataObject.php
@@ -313,6 +313,39 @@ class Memcached_DataObject extends DB_DataObject
return new ArrayWrapper($cached);
}
+ /**
+ * sends query to database - this is the private one that must work
+ * - internal functions use this rather than $this->query()
+ *
+ * Overridden to do logging.
+ *
+ * @param string $string
+ * @access private
+ * @return mixed none or PEAR_Error
+ */
+ function _query($string)
+ {
+ $start = microtime(true);
+ $result = parent::_query($string);
+ $delta = microtime(true) - $start;
+
+ $limit = common_config('db', 'log_slow_queries');
+ if (($limit > 0 && $delta >= $limit) || common_config('db', 'log_queries')) {
+ $clean = $this->sanitizeQuery($string);
+ common_log(LOG_DEBUG, sprintf("DB query (%0.3fs): %s", $delta, $clean));
+ }
+ return $result;
+ }
+
+ // Sanitize a query for logging
+ // @fixme don't trim spaces in string literals
+ function sanitizeQuery($string)
+ {
+ $string = preg_replace('/\s+/', ' ', $string);
+ $string = trim($string);
+ return $string;
+ }
+
// We overload so that 'SET NAMES "utf8"' is called for
// each connection
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 6ce4495be..6203650a6 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 a9ed66cb4..17de4fd0d 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/identica-badge.js b/js/identica-badge.js
index 8276f22a1..e43d1c43c 100644
--- a/js/identica-badge.js
+++ b/js/identica-badge.js
@@ -223,7 +223,7 @@ function markupPost(raw, server) {
},
changeUserTo : function(el) {
$.a.user = el.rel;
- $.s.h.a.innerHTML = el.rev + $.a.headerText;
+ $.s.h.a.appendChild(document.createTextNode(el.rev + $.a.headerText));
$.s.h.a.href = 'http://' + $.a.server + '/' + el.id;
$.f.runSearch();
},
diff --git a/js/util.js b/js/util.js
index 88016bd6d..8d52d859b 100644
--- a/js/util.js
+++ b/js/util.js
@@ -205,8 +205,10 @@ var SN = { // StatusNet
cookieValue = JSON.parse(cookieValue);
NLat = $('#'+SN.C.S.NoticeLat).val(cookieValue.NLat).val();
NLon = $('#'+SN.C.S.NoticeLon).val(cookieValue.NLon).val();
- NLNS = $('#'+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS).val();
- NLID = $('#'+SN.C.S.NoticeLocationId).val(cookieValue.NLID).val();
+ if ($('#'+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS)) {
+ NLNS = $('#'+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS).val();
+ NLID = $('#'+SN.C.S.NoticeLocationId).val(cookieValue.NLID).val();
+ }
}
if (cookieValue == 'disabled') {
NDG = $('#'+SN.C.S.NoticeDataGeo).attr('checked', false).attr('checked');
@@ -301,8 +303,10 @@ var SN = { // StatusNet
$('#'+SN.C.S.NoticeLat).val(NLat);
$('#'+SN.C.S.NoticeLon).val(NLon);
- $('#'+SN.C.S.NoticeLocationNs).val(NLNS);
- $('#'+SN.C.S.NoticeLocationId).val(NLID);
+ if ($('#'+SN.C.S.NoticeLocationNs)) {
+ $('#'+SN.C.S.NoticeLocationNs).val(NLNS);
+ $('#'+SN.C.S.NoticeLocationId).val(NLID);
+ }
$('#'+SN.C.S.NoticeDataGeo).attr('checked', NDG);
}
});
@@ -491,7 +495,7 @@ var SN = { // StatusNet
$('#'+SN.C.S.NoticeLocationId).val('');
$('#'+SN.C.S.NoticeDataGeo).attr('checked', false);
- $.cookie(SN.C.S.NoticeDataGeoCookie, 'disabled');
+ $.cookie(SN.C.S.NoticeDataGeoCookie, 'disabled', { path: '/', expires: SN.U.GetDateFromNow(30) });
}
function getJSONgeocodeURL(geocodeURL, data) {
@@ -509,7 +513,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,15 +529,16 @@ 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));
+
+ $.cookie(SN.C.S.NoticeDataGeoCookie, JSON.stringify(cookieValue), { path: '/', expires: SN.U.GetDateFromNow(30) });
});
}
@@ -566,9 +571,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 +598,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 +629,6 @@ var SN = { // StatusNet
else {
removeNoticeDataGeo();
}
-
- $('#'+SN.C.S.NoticeDataText).focus();
}).change();
}
},
@@ -656,6 +659,13 @@ var SN = { // StatusNet
}
return false;
});
+ },
+
+ GetDateFromNow: function(days) {
+ var date = new Date();
+ date.setTime(date.getTime() + (days * 24 * 60 * 60 * 1000));
+
+ return date;
}
},
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..825262b4c 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.
*
@@ -283,11 +288,12 @@ class ApiAction extends Action
$twitter_status['attachments'] = array();
foreach ($attachments as $attachment) {
- if ($attachment->isEnclosure()) {
+ $enclosure_o=$attachment->getEnclosure();
+ if ($enclosure_o) {
$enclosure = array();
- $enclosure['url'] = $attachment->url;
- $enclosure['mimetype'] = $attachment->mimetype;
- $enclosure['size'] = $attachment->size;
+ $enclosure['url'] = $enclosure_o->url;
+ $enclosure['mimetype'] = $enclosure_o->mimetype;
+ $enclosure['size'] = $enclosure_o->size;
$twitter_status['attachments'][] = $enclosure;
}
}
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 57199b356..4f24a6d22 100644
--- a/lib/default.php
+++ b/lib/default.php
@@ -69,7 +69,9 @@ $default =
'db_driver' => 'DB', # XXX: JanRain libs only work with DB
'quote_identifiers' => false,
'type' => 'mysql',
- 'schemacheck' => 'runtime'), // 'runtime' or 'script'
+ 'schemacheck' => 'runtime', // 'runtime' or 'script'
+ 'log_queries' => false, // true to log all DB queries
+ 'log_slow_queries' => 0), // if set, log queries taking over N seconds
'syslog' =>
array('appname' => 'statusnet', # for syslog
'priority' => 'debug', # XXX: currently ignored
@@ -209,6 +211,8 @@ $default =
'uploads' => true,
'filecommand' => '/usr/bin/file',
),
+ 'application' =>
+ array('desclimit' => null),
'group' =>
array('maxaliases' => 3,
'desclimit' => null),
@@ -252,6 +256,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/iomaster.php b/lib/iomaster.php
index 3bf82bc6b..94abdeefc 100644
--- a/lib/iomaster.php
+++ b/lib/iomaster.php
@@ -102,7 +102,7 @@ abstract class IoMaster
*/
protected function instantiate($class)
{
- if (isset($this->singletons[$class])) {
+ if (is_string($class) && isset($this->singletons[$class])) {
// Already instantiated a multi-site-capable handler.
// Just let it know it should listen to this site too!
$this->singletons[$class]->addSite(common_config('site', 'server'));
@@ -129,7 +129,11 @@ abstract class IoMaster
protected function getManager($class)
{
- return call_user_func(array($class, 'get'));
+ if(is_object($class)){
+ return $class;
+ } else {
+ return call_user_func(array($class, 'get'));
+ }
}
/**
@@ -347,7 +351,7 @@ abstract class IoMaster
* for per-queue and per-site records.
*
* @param string $key counter name
- * @param array $owners list of owner keys like 'queue:jabber' or 'site:stat01'
+ * @param array $owners list of owner keys like 'queue:xmpp' or 'site:stat01'
*/
public function stats($key, $owners=array())
{
diff --git a/lib/queuemanager.php b/lib/queuemanager.php
index e5cf8239e..0063ed5f3 100644
--- a/lib/queuemanager.php
+++ b/lib/queuemanager.php
@@ -181,7 +181,9 @@ abstract class QueueManager extends IoManager
{
if (isset($this->handlers[$queue])) {
$class = $this->handlers[$queue];
- if (class_exists($class)) {
+ if(is_object($class)) {
+ return $class;
+ } else if (class_exists($class)) {
return new $class();
} else {
common_log(LOG_ERR, "Nonexistent handler class '$class' for queue '$queue'");
@@ -243,7 +245,7 @@ abstract class QueueManager extends IoManager
* Only registered transports will be reliably picked up!
*
* @param string $transport
- * @param string $class
+ * @param string $class class name or object instance
* @param string $group
*/
public function connect($transport, $class, $group='queuedaemon')
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/lib/util.php b/lib/util.php
index 4312f9876..6c9f6316a 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -596,20 +596,13 @@ function common_linkify($url) {
}
if (!empty($f)) {
- if ($f->isEnclosure()) {
+ if ($f->getEnclosure()) {
$is_attachment = true;
$attachment_id = $f->id;
- } else {
- $foe = File_oembed::staticGet('file_id', $f->id);
- if (!empty($foe)) {
- // if it has OEmbed info, it's an attachment, too
- $is_attachment = true;
- $attachment_id = $f->id;
-
- $thumb = File_thumbnail::staticGet('file_id', $f->id);
- if (!empty($thumb)) {
- $has_thumb = true;
- }
+
+ $thumb = File_thumbnail::staticGet('file_id', $f->id);
+ if (!empty($thumb)) {
+ $has_thumb = true;
}
}
}
diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po
index 4e63e3e33..bbe2597a2 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-21 22:36+0000\n"
+"PO-Revision-Date: 2010-01-21 22:37:00+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 (r61339); 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!"
@@ -122,12 +127,12 @@ msgstr ""
#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
-#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
+#: actions/apigroupmembership.php:106 actions/apigroupshow.php:115
#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
-#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150
+#: actions/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 ""
@@ -367,7 +372,7 @@ msgstr ""
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
msgid "Group not found!"
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 ""
@@ -501,7 +597,7 @@ msgstr ""
#: actions/apitimelineretweetedbyme.php:112
#, php-format
msgid "Repeated by %s"
-msgstr ""
+msgstr "كرّره %s"
#: actions/apitimelineretweetedtome.php:111
#, php-format
@@ -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:1189
+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 "أرسل"
@@ -1699,25 +1838,25 @@ msgstr ""
#: actions/joingroup.php:60
msgid "You must be logged in to join a group."
-msgstr ""
+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."
-msgstr ""
+msgstr "يجب أن تلج لتغادر مجموعة."
#: actions/leavegroup.php:90 lib/command.php:265
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 "مجموعة جديدة"
@@ -1813,7 +1961,7 @@ msgstr "رسالة جديدة"
#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358
msgid "You can't send a message to this user."
-msgstr ""
+msgstr "لا يمكنك إرسال رسائل إلى هذا المستخدم."
#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342
#: lib/command.php:475
@@ -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"
@@ -1856,15 +2004,17 @@ msgid ""
"Search for notices on %%site.name%% by their contents. Separate search terms "
"by spaces; they must be 3 characters or more."
msgstr ""
+"ابحث عن إشعارات على %%site.name%% عبر محتوياتها. اÙصل عبارات البحث بمساÙات؛ "
+"ويجب أن تتكون هذه العبارات من 3 أحر٠أو أكثر."
#: actions/noticesearch.php:78
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 +2053,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 +2112,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 +2126,7 @@ msgid "Notice Search"
msgstr "بحث الإشعارات"
#: actions/othersettings.php:60
-msgid "Other Settings"
+msgid "Other settings"
msgstr "إعدادات أخرى"
#: actions/othersettings.php:71
@@ -1966,29 +2158,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 +2373,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 +2438,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 "الصÙحة الرئيسية"
@@ -2286,7 +2472,7 @@ msgstr ""
#: actions/profilesettings.php:138
msgid "Share my current location when posting notices"
-msgstr ""
+msgstr "شارك مكاني الحالي عند إرسال إشعارات"
#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
@@ -2735,7 +2921,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 +2998,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 +3181,6 @@ msgstr "(لا شيء)"
msgid "All members"
msgstr "جميع الأعضاء"
-#: actions/showgroup.php:429 lib/profileaction.php:174
-msgid "Statistics"
-msgstr "إحصاءات"
-
#: actions/showgroup.php:432
msgid "Created"
msgstr "أنشئ"
@@ -3042,7 +3298,7 @@ msgstr ""
#: actions/showstream.php:313
#, php-format
msgid "Repeat of %s"
-msgstr "تكرارات %s"
+msgstr "تكرار ل%s"
#: actions/silence.php:65 actions/unsilence.php:65
msgid "You cannot silence users on this site."
@@ -3061,14 +3317,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 +3502,6 @@ msgid "Save site settings"
msgstr "اذ٠إعدادت الموقع"
#: actions/smssettings.php:58
-#, fuzzy
msgid "SMS settings"
msgstr "إعدادات الرسائل القصيرة"
@@ -3277,9 +3531,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 +3615,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 +3652,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."
@@ -3720,7 +3973,7 @@ msgstr "استمتع بالنقانق!"
#: actions/usergroups.php:130
msgid "Search for more groups"
-msgstr ""
+msgstr "ابحث عن المزيد من المجموعات"
#: actions/usergroups.php:153
#, php-format
@@ -3733,9 +3986,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 +3998,8 @@ msgid ""
msgstr ""
#: actions/version.php:157
-#, fuzzy
msgid "StatusNet"
-msgstr "Ø­ÙØ°ÙÙت الحالة."
+msgstr "ستاتس نت"
#: actions/version.php:161
msgid "Contributors"
@@ -3778,26 +4030,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 +4058,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 +4118,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 +4170,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 +4191,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 +4293,7 @@ msgstr ""
#: lib/action.php:773
msgid "StatusNet software license"
-msgstr ""
+msgstr "رخصة برنامج StatusNet"
#: lib/action.php:776
#, php-format
@@ -4086,42 +4320,51 @@ msgstr ""
"المتوÙر تحت [رخصة غنو Ø£Ùيرو العمومية](http://www.fsf.org/licensing/licenses/"
"agpl-3.0.html)."
-#: lib/action.php:794
+#: lib/action.php:795
msgid "Site content license"
msgstr "رخصة محتوى الموقع"
-#: lib/action.php:803
-msgid "All "
+#: lib/action.php:800
+#, php-format
+msgid "Content and data of %1$s are private and confidential."
+msgstr ""
+
+#: lib/action.php:805
+#, php-format
+msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
#: lib/action.php:808
+msgid "Content and data copyright by contributors. All rights reserved."
+msgstr ""
+
+#: lib/action.php:820
+msgid "All "
+msgstr ""
+
+#: lib/action.php:825
msgid "license."
msgstr "الرخصة."
-#: lib/action.php:1102
+#: lib/action.php:1124
msgid "Pagination"
msgstr ""
-#: lib/action.php:1111
+#: lib/action.php:1133
msgid "After"
msgstr "بعد"
-#: lib/action.php:1119
+#: lib/action.php:1141
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 +4390,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 +4471,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 +4496,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 +4521,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 +4534,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 +4548,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 +4583,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 +4780,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 "خطأ قاعدة بيانات"
@@ -4607,7 +4914,7 @@ msgstr "أض٠أو عدّل شعار %s"
#: lib/groupnav.php:120
#, php-format
msgid "Add or edit %s design"
-msgstr ""
+msgstr "أض٠أو عدل تصميم %s"
#: lib/groupsbymemberssection.php:71
msgid "Groups with most members"
@@ -4620,7 +4927,7 @@ msgstr "المجموعات الأكثر مرسلات"
#: lib/grouptagcloudsection.php:56
#, php-format
msgid "Tags in %s group's notices"
-msgstr ""
+msgstr "وسوم ÙÙŠ إشعارات المجموعة %s"
#: lib/htmloutputter.php:103
msgid "This page is not available in a media type you accept"
@@ -4669,9 +4976,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"
@@ -4713,7 +5020,7 @@ msgstr ""
#: lib/mail.php:236
#, php-format
msgid "%1$s is now listening to your notices on %2$s."
-msgstr ""
+msgstr "%1$s يستمع الآن إلى إشعاراتك على %2$s."
#: lib/mail.php:241
#, php-format
@@ -4729,11 +5036,21 @@ msgid ""
"----\n"
"Change your email address or notification options at %8$s\n"
msgstr ""
+"%1$s يستمع الآن إلى إشعاراتك على %2$s.\n"
+"\n"
+"%3$s\n"
+"\n"
+"%4$s%5$s%6$s\n"
+"بوÙاء،\n"
+"%7$s.\n"
+"\n"
+"----\n"
+"غيّر خيارات البريد الإلكتروني والإشعار ÙÙŠ %8$s\n"
#: 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 +5201,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 +5244,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 +5287,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"
@@ -5102,12 +5412,11 @@ msgstr "رسائلك المÙرسلة"
#: lib/personaltagcloudsection.php:56
#, php-format
msgid "Tags in %s's notices"
-msgstr ""
+msgstr "وسوم ÙÙŠ إشعارات %s"
#: lib/plugin.php:114
-#, fuzzy
msgid "Unknown"
-msgstr "إجراء غير معروÙ"
+msgstr "غير معروÙ"
#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82
msgid "Subscriptions"
@@ -5167,11 +5476,11 @@ msgstr "مشهورة"
#: lib/repeatform.php:107
msgid "Repeat this notice?"
-msgstr "كرر هذا الإشعار؟"
+msgstr "أأكرّر هذا الإشعار؟ّ"
#: lib/repeatform.php:132
msgid "Repeat this notice"
-msgstr "كرر هذا الإشعار"
+msgstr "كرّر هذا الإشعار"
#: lib/sandboxform.php:67
msgid "Sandbox"
@@ -5338,47 +5647,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..20bb7a4b2 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-21 22:36+0000\n"
+"PO-Revision-Date: 2010-01-21 22:37:03+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 (r61339); 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!"
@@ -121,12 +127,12 @@ msgstr ""
#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
-#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
+#: actions/apigroupmembership.php:106 actions/apigroupshow.php:115
#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
-#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150
+#: actions/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 ""
@@ -366,7 +372,7 @@ msgstr ""
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
msgid "Group not found!"
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:1189
+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 ""
@@ -4085,42 +4318,51 @@ msgstr ""
"المتوÙر تحت [رخصه غنو Ø£Ùيرو العمومية](http://www.fsf.org/licensing/licenses/"
"agpl-3.0.html)."
-#: lib/action.php:794
+#: lib/action.php:795
msgid "Site content license"
msgstr "رخصه محتوى الموقع"
-#: lib/action.php:803
-msgid "All "
+#: lib/action.php:800
+#, php-format
+msgid "Content and data of %1$s are private and confidential."
+msgstr ""
+
+#: lib/action.php:805
+#, php-format
+msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
#: lib/action.php:808
+msgid "Content and data copyright by contributors. All rights reserved."
+msgstr ""
+
+#: lib/action.php:820
+msgid "All "
+msgstr ""
+
+#: lib/action.php:825
msgid "license."
msgstr "الرخصه."
-#: lib/action.php:1102
+#: lib/action.php:1124
msgid "Pagination"
msgstr ""
-#: lib/action.php:1111
+#: lib/action.php:1133
msgid "After"
msgstr "بعد"
-#: lib/action.php:1119
+#: lib/action.php:1141
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 +4388,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 +4470,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 +4495,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 +4520,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 +4533,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 +4547,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 +4582,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 +4779,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 +4975,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 +5037,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 +5190,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 +5233,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 +5276,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 +5404,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 +5636,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..e7bc79a13 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-21 22:36+0000\n"
+"PO-Revision-Date: 2010-01-21 22:37:06+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 (r61339); Translate extension (2010-01-16)\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!"
@@ -121,12 +126,12 @@ msgstr "Бележки от %1$s и приÑтели в %2$s."
#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
-#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
+#: actions/apigroupmembership.php:106 actions/apigroupshow.php:115
#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
-#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150
+#: actions/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 Ñимвола)."
@@ -373,7 +381,7 @@ msgstr ""
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
msgid "Group not found!"
msgstr "Групата не е открита."
@@ -414,6 +422,101 @@ msgstr "Групи на %s"
msgid "groups on %s"
msgstr "групи в %s"
+#: actions/apioauthauthorize.php:108 actions/apioauthauthorize.php:114
+msgid "Bad request."
+msgstr ""
+
+#: actions/apioauthauthorize.php:134 actions/avatarsettings.php:268
+#: actions/deletenotice.php:157 actions/disfavor.php:74
+#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:50
+#: actions/groupblock.php:66 actions/grouplogo.php:309
+#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
+#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:139
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/profilesettings.php:194 actions/recoverpassword.php:337
+#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/subscribe.php:46 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
+#: lib/designsettings.php:294
+msgid "There was a problem with your session token. Try again, please."
+msgstr "Имаше проблем ÑÑŠÑ ÑеÑиÑта ви в Ñайта. МолÑ, опитайте отново!"
+
+#: actions/apioauthauthorize.php:146
+#, fuzzy
+msgid "Invalid nickname / password!"
+msgstr "Ðеправилно име или парола."
+
+#: actions/apioauthauthorize.php:170
+#, fuzzy
+msgid "DB error deleting OAuth app user."
+msgstr "Грешка в наÑтройките на потребителÑ."
+
+#: actions/apioauthauthorize.php:196
+#, fuzzy
+msgid "DB error inserting OAuth app user."
+msgstr "Грешка в базата от данни — отговор при вмъкването: %s"
+
+#: actions/apioauthauthorize.php:231
+#, php-format
+msgid ""
+"The request token %s has been authorized. Please exchange it for an access "
+"token."
+msgstr ""
+
+#: actions/apioauthauthorize.php:241
+#, php-format
+msgid "The request token %s has been denied."
+msgstr ""
+
+#: actions/apioauthauthorize.php:246 actions/avatarsettings.php:281
+#: actions/designadminpanel.php:103 actions/editapplication.php:139
+#: actions/emailsettings.php:256 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/oauthconnectionssettings.php:151 actions/recoverpassword.php:44
+#: actions/smssettings.php:248 lib/designsettings.php:304
+msgid "Unexpected form submission."
+msgstr "Ðеочаквано изпращане на форма."
+
+#: actions/apioauthauthorize.php:273
+msgid "An application would like to connect to your account"
+msgstr ""
+
+#: actions/apioauthauthorize.php:290
+msgid "Allow or deny access"
+msgstr ""
+
+#: actions/apioauthauthorize.php:320 lib/action.php:435
+msgid "Account"
+msgstr "Сметка"
+
+#: actions/apioauthauthorize.php:323 actions/login.php:230
+#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/showgroup.php:236 actions/tagother.php:94 lib/groupeditform.php:152
+#: lib/userprofile.php:131
+msgid "Nickname"
+msgstr "ПÑевдоним"
+
+#: actions/apioauthauthorize.php:326 actions/login.php:233
+#: actions/register.php:429 lib/accountsettingsaction.php:116
+msgid "Password"
+msgstr "Парола"
+
+#: actions/apioauthauthorize.php:338
+msgid "Deny"
+msgstr ""
+
+#: actions/apioauthauthorize.php:344
+#, fuzzy
+msgid "Allow"
+msgstr "Ð’Ñички"
+
+#: actions/apioauthauthorize.php:361
+msgid "Allow or deny access to your account information."
+msgstr ""
+
#: actions/apistatusesdestroy.php:107
msgid "This method requires a POST or DELETE."
msgstr "Този метод изиÑква заÑвка POST или DELETE."
@@ -443,17 +546,17 @@ msgstr "Бележката е изтрита."
msgid "No status with that ID found."
msgstr "Ðе е открита бележка Ñ Ñ‚Ð°ÐºÑŠÐ² идентификатор."
-#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:162 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, fuzzy, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "Твърде дълга бележка. ТрÑбва да е най-много 140 знака."
-#: actions/apistatusesupdate.php:198
+#: actions/apistatusesupdate.php:203
msgid "Not found"
msgstr "Ðе е открито."
-#: actions/apistatusesupdate.php:221 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:226 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -599,29 +702,6 @@ msgstr "Качване"
msgid "Crop"
msgstr "ИзрÑзване"
-#: actions/avatarsettings.php:268 actions/deletenotice.php:157
-#: actions/disfavor.php:74 actions/emailsettings.php:238 actions/favor.php:75
-#: actions/geocode.php:50 actions/groupblock.php:66 actions/grouplogo.php:309
-#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:194 actions/recoverpassword.php:337
-#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
-#: actions/subscribe.php:46 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:294
-msgid "There was a problem with your session token. Try again, please."
-msgstr "Имаше проблем ÑÑŠÑ ÑеÑиÑта ви в Ñайта. МолÑ, опитайте отново!"
-
-#: actions/avatarsettings.php:281 actions/designadminpanel.php:103
-#: actions/emailsettings.php:256 actions/grouplogo.php:319
-#: actions/imsettings.php:220 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
-msgid "Unexpected form submission."
-msgstr "Ðеочаквано изпращане на форма."
-
#: actions/avatarsettings.php:328
msgid "Pick a square area of the image to be your avatar"
msgstr "Изберете квадратна облаÑÑ‚ от изображението за аватар"
@@ -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:1189
+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 ""
@@ -4036,12 +4323,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"
@@ -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 "ПромÑна на поща, аватар, парола, профил"
@@ -4248,34 +4531,44 @@ msgstr ""
"доÑтъпна под [GNU Affero General Public License](http://www.fsf.org/"
"licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:794
+#: lib/action.php:795
msgid "Site content license"
msgstr "Лиценз на Ñъдържанието"
-#: lib/action.php:803
+#: lib/action.php:800
+#, php-format
+msgid "Content and data of %1$s are private and confidential."
+msgstr ""
+
+#: lib/action.php:805
+#, php-format
+msgid "Content and data copyright by %1$s. All rights reserved."
+msgstr ""
+
+#: lib/action.php:808
+msgid "Content and data copyright by contributors. All rights reserved."
+msgstr ""
+
+#: lib/action.php:820
msgid "All "
msgstr "Ð’Ñички "
-#: lib/action.php:808
+#: lib/action.php:825
msgid "license."
msgstr "лиценз."
-#: lib/action.php:1102
+#: lib/action.php:1124
msgid "Pagination"
msgstr "Страниране"
-#: lib/action.php:1111
+#: lib/action.php:1133
msgid "After"
msgstr "След"
-#: lib/action.php:1119
+#: lib/action.php:1141
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 +4605,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 +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 "Паролата е запиÑана."
-#: lib/authenticationplugin.php:197
+#: lib/authenticationplugin.php:229
#, fuzzy
msgid "Password changing is not allowed"
msgstr "Паролата е запиÑана."
@@ -4635,6 +4994,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 +5520,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 +5885,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..ef08bf3f1 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-21 22:36+0000\n"
+"PO-Revision-Date: 2010-01-21 22:37:10+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 (r61339); Translate extension (2010-01-16)\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!"
@@ -123,12 +128,12 @@ msgstr "Actualitzacions de %1$s i amics a %2$s!"
#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
-#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
+#: actions/apigroupmembership.php:106 actions/apigroupshow.php:115
#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
-#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150
+#: actions/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)."
@@ -381,7 +389,7 @@ msgstr "L'àlies no pot ser el mateix que el sobrenom."
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
msgid "Group not found!"
msgstr "No s'ha trobat el grup!"
@@ -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:1189
+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 ""
@@ -4089,12 +4377,12 @@ msgstr "Ha estat bandejat de publicar notificacions en aquest lloc."
msgid "Problem saving notice."
msgstr "Problema en guardar l'avís."
-#: classes/Notice.php:1052
+#: classes/Notice.php:1059
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Error de BD en inserir resposta: %s"
-#: classes/Notice.php:1423
+#: classes/Notice.php:1441
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%1$s (%2$s)"
@@ -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"
@@ -4297,34 +4581,44 @@ msgstr ""
"%s, disponible sota la [GNU Affero General Public License](http://www.fsf."
"org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:794
+#: lib/action.php:795
msgid "Site content license"
msgstr "Llicència de contingut del lloc"
-#: lib/action.php:803
+#: lib/action.php:800
+#, php-format
+msgid "Content and data of %1$s are private and confidential."
+msgstr ""
+
+#: lib/action.php:805
+#, php-format
+msgid "Content and data copyright by %1$s. All rights reserved."
+msgstr ""
+
+#: lib/action.php:808
+msgid "Content and data copyright by contributors. All rights reserved."
+msgstr ""
+
+#: lib/action.php:820
msgid "All "
msgstr "Tot "
-#: lib/action.php:808
+#: lib/action.php:825
msgid "license."
msgstr "llicència."
-#: lib/action.php:1102
+#: lib/action.php:1124
msgid "Pagination"
msgstr "Paginació"
-#: lib/action.php:1111
+#: lib/action.php:1133
msgid "After"
msgstr "Posteriors"
-#: lib/action.php:1119
+#: lib/action.php:1141
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 +4655,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 +4741,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 +5043,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 +5572,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 +5935,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..6fbec682b 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-21 22:36+0000\n"
+"PO-Revision-Date: 2010-01-21 22:37:13+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 (r61339); Translate extension (2010-01-16)\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!"
@@ -123,12 +128,12 @@ msgstr ""
#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
-#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
+#: actions/apigroupmembership.php:106 actions/apigroupshow.php:115
#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
-#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150
+#: actions/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ů)"
@@ -375,7 +383,7 @@ msgstr ""
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
#, fuzzy
msgid "Group not found!"
msgstr "Žádný požadavek nebyl nalezen!"
@@ -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:1189
+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 ""
@@ -4041,12 +4319,12 @@ msgstr ""
msgid "Problem saving notice."
msgstr "Problém při ukládání sdělení"
-#: classes/Notice.php:1052
+#: classes/Notice.php:1059
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Chyba v DB při vkládání odpovědi: %s"
-#: classes/Notice.php:1423
+#: classes/Notice.php:1441
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
@@ -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 ""
@@ -4258,37 +4531,47 @@ msgstr ""
"dostupná pod [GNU Affero General Public License](http://www.fsf.org/"
"licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:794
+#: lib/action.php:795
#, fuzzy
msgid "Site content license"
msgstr "Nové sdělení"
-#: lib/action.php:803
-msgid "All "
+#: lib/action.php:800
+#, php-format
+msgid "Content and data of %1$s are private and confidential."
+msgstr ""
+
+#: lib/action.php:805
+#, php-format
+msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
#: lib/action.php:808
+msgid "Content and data copyright by contributors. All rights reserved."
+msgstr ""
+
+#: lib/action.php:820
+msgid "All "
+msgstr ""
+
+#: lib/action.php:825
msgid "license."
msgstr ""
-#: lib/action.php:1102
+#: lib/action.php:1124
msgid "Pagination"
msgstr ""
-#: lib/action.php:1111
+#: lib/action.php:1133
#, fuzzy
msgid "After"
msgstr "« Novější"
-#: lib/action.php:1119
+#: lib/action.php:1141
#, fuzzy
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 +4607,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 +4693,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 +5003,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 +5532,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 +5904,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..e1ea37636 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-21 22:36+0000\n"
+"PO-Revision-Date: 2010-01-21 22:37:16+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 (r61339); Translate extension (2010-01-16)\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!"
@@ -134,12 +139,12 @@ msgstr "Aktualisierungen von %1$s und Freunden auf %2$s!"
#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
-#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
+#: actions/apigroupmembership.php:106 actions/apigroupshow.php:115
#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
-#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150
+#: actions/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)."
@@ -382,7 +390,7 @@ msgstr "Alias kann nicht das gleiche wie der Spitznamen sein."
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
msgid "Group not found!"
msgstr "Gruppe nicht gefunden!"
@@ -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:1189
+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 ""
@@ -4108,12 +4396,12 @@ msgstr ""
msgid "Problem saving notice."
msgstr "Problem bei Speichern der Nachricht."
-#: classes/Notice.php:1052
+#: classes/Notice.php:1059
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Datenbankfehler beim Einfügen der Antwort: %s"
-#: classes/Notice.php:1423
+#: classes/Notice.php:1441
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%1$s (%2$s)"
@@ -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"
@@ -4318,35 +4602,45 @@ msgstr ""
"(Version %s) betrieben, die unter der [GNU Affero General Public License]"
"(http://www.fsf.org/licensing/licenses/agpl-3.0.html) erhältlich ist."
-#: lib/action.php:794
+#: lib/action.php:795
msgid "Site content license"
msgstr "StatusNet-Software-Lizenz"
-#: lib/action.php:803
+#: lib/action.php:800
+#, php-format
+msgid "Content and data of %1$s are private and confidential."
+msgstr ""
+
+#: lib/action.php:805
+#, php-format
+msgid "Content and data copyright by %1$s. All rights reserved."
+msgstr ""
+
+#: lib/action.php:808
+msgid "Content and data copyright by contributors. All rights reserved."
+msgstr ""
+
+#: lib/action.php:820
#, fuzzy
msgid "All "
msgstr "Alle "
-#: lib/action.php:808
+#: lib/action.php:825
msgid "license."
msgstr "Lizenz."
-#: lib/action.php:1102
+#: lib/action.php:1124
msgid "Pagination"
msgstr "Seitenerstellung"
-#: lib/action.php:1111
+#: lib/action.php:1133
msgid "After"
msgstr "Später"
-#: lib/action.php:1119
+#: lib/action.php:1141
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 +4678,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 +4764,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 +5063,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 +5649,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 +6019,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..91ea54305 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-21 22:36+0000\n"
+"PO-Revision-Date: 2010-01-21 22:37:20+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 (r61339); Translate extension (2010-01-16)\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!"
@@ -121,12 +126,12 @@ msgstr ""
#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
-#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
+#: actions/apigroupmembership.php:106 actions/apigroupshow.php:115
#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
-#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150
+#: actions/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 χαÏακτ.)."
@@ -372,7 +380,7 @@ msgstr ""
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
msgid "Group not found!"
msgstr "Ομάδα δεν βÏέθηκε!"
@@ -413,6 +421,99 @@ msgstr ""
msgid "groups on %s"
msgstr "ομάδες του χÏήστη %s"
+#: actions/apioauthauthorize.php:108 actions/apioauthauthorize.php:114
+msgid "Bad request."
+msgstr ""
+
+#: actions/apioauthauthorize.php:134 actions/avatarsettings.php:268
+#: actions/deletenotice.php:157 actions/disfavor.php:74
+#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:50
+#: actions/groupblock.php:66 actions/grouplogo.php:309
+#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
+#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:139
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/profilesettings.php:194 actions/recoverpassword.php:337
+#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/subscribe.php:46 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
+#: lib/designsettings.php:294
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#: actions/apioauthauthorize.php:146
+msgid "Invalid nickname / password!"
+msgstr ""
+
+#: actions/apioauthauthorize.php:170
+#, fuzzy
+msgid "DB error deleting OAuth app user."
+msgstr "Σφάλμα στη βάση δεδομένων κατά την εισαγωγή hashtag: %s"
+
+#: actions/apioauthauthorize.php:196
+#, fuzzy
+msgid "DB error inserting OAuth app user."
+msgstr "Σφάλμα στη βάση δεδομένων κατά την εισαγωγή hashtag: %s"
+
+#: actions/apioauthauthorize.php:231
+#, php-format
+msgid ""
+"The request token %s has been authorized. Please exchange it for an access "
+"token."
+msgstr ""
+
+#: actions/apioauthauthorize.php:241
+#, php-format
+msgid "The request token %s has been denied."
+msgstr ""
+
+#: actions/apioauthauthorize.php:246 actions/avatarsettings.php:281
+#: actions/designadminpanel.php:103 actions/editapplication.php:139
+#: actions/emailsettings.php:256 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/oauthconnectionssettings.php:151 actions/recoverpassword.php:44
+#: actions/smssettings.php:248 lib/designsettings.php:304
+msgid "Unexpected form submission."
+msgstr ""
+
+#: actions/apioauthauthorize.php:273
+msgid "An application would like to connect to your account"
+msgstr ""
+
+#: actions/apioauthauthorize.php:290
+msgid "Allow or deny access"
+msgstr ""
+
+#: actions/apioauthauthorize.php:320 lib/action.php:435
+msgid "Account"
+msgstr "ΛογαÏιασμός"
+
+#: actions/apioauthauthorize.php:323 actions/login.php:230
+#: actions/profilesettings.php:106 actions/register.php:424
+#: actions/showgroup.php:236 actions/tagother.php:94 lib/groupeditform.php:152
+#: lib/userprofile.php:131
+msgid "Nickname"
+msgstr "Ψευδώνυμο"
+
+#: actions/apioauthauthorize.php:326 actions/login.php:233
+#: actions/register.php:429 lib/accountsettingsaction.php:116
+msgid "Password"
+msgstr "Κωδικός"
+
+#: actions/apioauthauthorize.php:338
+msgid "Deny"
+msgstr ""
+
+#: actions/apioauthauthorize.php:344
+msgid "Allow"
+msgstr ""
+
+#: actions/apioauthauthorize.php:361
+msgid "Allow or deny access to your account information."
+msgstr ""
+
#: actions/apistatusesdestroy.php:107
msgid "This method requires a POST or DELETE."
msgstr ""
@@ -444,17 +545,17 @@ msgstr "Η κατάσταση διαγÏάφεται."
msgid "No status with that ID found."
msgstr ""
-#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:162 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr ""
-#: actions/apistatusesupdate.php:198
+#: actions/apistatusesupdate.php:203
msgid "Not found"
msgstr ""
-#: actions/apistatusesupdate.php:221 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:226 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -598,29 +699,6 @@ msgstr ""
msgid "Crop"
msgstr ""
-#: actions/avatarsettings.php:268 actions/deletenotice.php:157
-#: actions/disfavor.php:74 actions/emailsettings.php:238 actions/favor.php:75
-#: actions/geocode.php:50 actions/groupblock.php:66 actions/grouplogo.php:309
-#: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:194 actions/recoverpassword.php:337
-#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
-#: actions/subscribe.php:46 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:294
-msgid "There was a problem with your session token. Try again, please."
-msgstr ""
-
-#: actions/avatarsettings.php:281 actions/designadminpanel.php:103
-#: actions/emailsettings.php:256 actions/grouplogo.php:319
-#: actions/imsettings.php:220 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
-msgid "Unexpected form submission."
-msgstr ""
-
#: actions/avatarsettings.php:328
msgid "Pick a square area of the image to be your avatar"
msgstr ""
@@ -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:1189
+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 ""
@@ -3973,12 +4247,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 ""
@@ -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 ""
@@ -4179,34 +4449,44 @@ msgid ""
"org/licensing/licenses/agpl-3.0.html)."
msgstr ""
-#: lib/action.php:794
+#: lib/action.php:795
msgid "Site content license"
msgstr ""
-#: lib/action.php:803
-msgid "All "
+#: lib/action.php:800
+#, php-format
+msgid "Content and data of %1$s are private and confidential."
+msgstr ""
+
+#: lib/action.php:805
+#, php-format
+msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
#: lib/action.php:808
+msgid "Content and data copyright by contributors. All rights reserved."
+msgstr ""
+
+#: lib/action.php:820
+msgid "All "
+msgstr ""
+
+#: lib/action.php:825
msgid "license."
msgstr ""
-#: lib/action.php:1102
+#: lib/action.php:1124
msgid "Pagination"
msgstr ""
-#: lib/action.php:1111
+#: lib/action.php:1133
msgid "After"
msgstr ""
-#: lib/action.php:1119
+#: lib/action.php:1141
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 +4522,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 +4604,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 +4906,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 +5419,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 +5781,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..11257ae75 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-21 22:36+0000\n"
+"PO-Revision-Date: 2010-01-21 22:37:23+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 (r61339); Translate extension (2010-01-16)\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!"
@@ -129,12 +134,12 @@ msgstr "Updates from %1$s and friends on %2$s!"
#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
-#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
+#: actions/apigroupmembership.php:106 actions/apigroupshow.php:115
#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
-#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150
+#: actions/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)"
@@ -380,7 +388,7 @@ msgstr "Alias can't be the same as nickname."
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
msgid "Group not found!"
msgstr "Group not found!"
@@ -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:1189
+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 ""
@@ -4090,12 +4377,12 @@ msgstr "You are banned from posting notices on this site."
msgid "Problem saving notice."
msgstr "Problem saving notice."
-#: classes/Notice.php:1052
+#: classes/Notice.php:1059
#, php-format
msgid "DB error inserting reply: %s"
msgstr "DB error inserting reply: %s"
-#: classes/Notice.php:1423
+#: classes/Notice.php:1441
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%1$s (%2$s)"
@@ -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"
@@ -4298,34 +4581,44 @@ msgstr ""
"s, available under the [GNU Affero General Public Licence](http://www.fsf."
"org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:794
+#: lib/action.php:795
msgid "Site content license"
msgstr "Site content license"
-#: lib/action.php:803
+#: lib/action.php:800
+#, php-format
+msgid "Content and data of %1$s are private and confidential."
+msgstr ""
+
+#: lib/action.php:805
+#, php-format
+msgid "Content and data copyright by %1$s. All rights reserved."
+msgstr ""
+
+#: lib/action.php:808
+msgid "Content and data copyright by contributors. All rights reserved."
+msgstr ""
+
+#: lib/action.php:820
msgid "All "
msgstr "All "
-#: lib/action.php:808
+#: lib/action.php:825
msgid "license."
msgstr "licence."
-#: lib/action.php:1102
+#: lib/action.php:1124
msgid "Pagination"
msgstr "Pagination"
-#: lib/action.php:1111
+#: lib/action.php:1133
msgid "After"
msgstr "After"
-#: lib/action.php:1119
+#: lib/action.php:1141
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 +4658,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 +4745,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 +5046,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 +5579,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 +5941,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..3afbc4e98 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-21 22:36+0000\n"
+"PO-Revision-Date: 2010-01-21 22:37:27+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 (r61339); Translate extension (2010-01-16)\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!"
@@ -124,12 +129,12 @@ msgstr "¡Actualizaciones de %1$s y amigos en %2$s!"
#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
-#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
+#: actions/apigroupmembership.php:106 actions/apigroupshow.php:115
#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
-#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150
+#: actions/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)."
@@ -375,7 +383,7 @@ msgstr ""
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
#, fuzzy
msgid "Group not found!"
msgstr "¡No se encontró el método de la API!"
@@ -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:1189
+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 ""
@@ -4141,12 +4426,12 @@ msgstr "Tienes prohibido publicar avisos en este sitio."
msgid "Problem saving notice."
msgstr "Hubo un problema al guardar el aviso."
-#: classes/Notice.php:1052
+#: classes/Notice.php:1059
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Error de BD al insertar respuesta: %s"
-#: classes/Notice.php:1423
+#: classes/Notice.php:1441
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -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"
@@ -4349,34 +4630,44 @@ msgstr ""
"disponible bajo la [GNU Affero General Public License](http://www.fsf.org/"
"licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:794
+#: lib/action.php:795
msgid "Site content license"
msgstr "Licencia de contenido del sitio"
-#: lib/action.php:803
+#: lib/action.php:800
+#, php-format
+msgid "Content and data of %1$s are private and confidential."
+msgstr ""
+
+#: lib/action.php:805
+#, php-format
+msgid "Content and data copyright by %1$s. All rights reserved."
+msgstr ""
+
+#: lib/action.php:808
+msgid "Content and data copyright by contributors. All rights reserved."
+msgstr ""
+
+#: lib/action.php:820
msgid "All "
msgstr "Todo"
-#: lib/action.php:808
+#: lib/action.php:825
msgid "license."
msgstr "Licencia."
-#: lib/action.php:1102
+#: lib/action.php:1124
msgid "Pagination"
msgstr "Paginación"
-#: lib/action.php:1111
+#: lib/action.php:1133
msgid "After"
msgstr "Después"
-#: lib/action.php:1119
+#: lib/action.php:1141
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 +4708,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 +4794,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 +5097,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 +5629,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 +5997,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..2c826643a 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-21 22:36+0000\n"
+"PO-Revision-Date: 2010-01-21 22:37:33+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 (r61339); Translate extension (2010-01-16)\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!"
@@ -130,12 +135,12 @@ msgstr "به روز رسانی از %1$ و دوستان در %2$"
#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
-#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
+#: actions/apigroupmembership.php:106 actions/apigroupshow.php:115
#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
-#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150
+#: actions/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 حرÙ)."
@@ -376,7 +384,7 @@ msgstr "نام و نام مستعار شما نمی تواند یکی باشد .
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
msgid "Group not found!"
msgstr "گروه یاÙت نشد!"
@@ -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:1189
+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 ""
@@ -3955,12 +4239,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 ""
@@ -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 "آدرس ایمیل، آواتار، کلمه ÛŒ عبور، پروÙایل خود را تغییر دهید"
@@ -4156,34 +4436,44 @@ msgid ""
"org/licensing/licenses/agpl-3.0.html)."
msgstr ""
-#: lib/action.php:794
+#: lib/action.php:795
msgid "Site content license"
msgstr "مجوز محتویات سایت"
-#: lib/action.php:803
+#: lib/action.php:800
+#, php-format
+msgid "Content and data of %1$s are private and confidential."
+msgstr ""
+
+#: lib/action.php:805
+#, php-format
+msgid "Content and data copyright by %1$s. All rights reserved."
+msgstr ""
+
+#: lib/action.php:808
+msgid "Content and data copyright by contributors. All rights reserved."
+msgstr ""
+
+#: lib/action.php:820
msgid "All "
msgstr "همه "
-#: lib/action.php:808
+#: lib/action.php:825
msgid "license."
msgstr "مجوز."
-#: lib/action.php:1102
+#: lib/action.php:1124
msgid "Pagination"
msgstr "صÙحه بندى"
-#: lib/action.php:1111
+#: lib/action.php:1133
msgid "After"
msgstr "بعد از"
-#: lib/action.php:1119
+#: lib/action.php:1141
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 +4507,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 +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 "تغییر گذرواژه"
@@ -4537,6 +4890,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 +5407,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 +5760,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..d07fd61ca 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-21 22:36+0000\n"
+"PO-Revision-Date: 2010-01-21 22:37:30+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 (r61339); Translate extension (2010-01-16)\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!"
@@ -128,12 +133,12 @@ msgstr "Käyttäjän %1$s ja kavereiden päivitykset palvelussa %2$s!"
#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
-#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
+#: actions/apigroupmembership.php:106 actions/apigroupshow.php:115
#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
-#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150
+#: actions/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ä)."
@@ -384,7 +392,7 @@ msgstr "Alias ei voi olla sama kuin ryhmätunnus."
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
msgid "Group not found!"
msgstr "Ryhmää ei löytynyt!"
@@ -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:1189
+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 ""
@@ -4126,12 +4415,12 @@ msgstr "Päivityksesi tähän palveluun on estetty."
msgid "Problem saving notice."
msgstr "Ongelma päivityksen tallentamisessa."
-#: classes/Notice.php:1052
+#: classes/Notice.php:1059
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Tietokantavirhe tallennettaessa vastausta: %s"
-#: classes/Notice.php:1423
+#: classes/Notice.php:1441
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%1$s (%2$s)"
@@ -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"
@@ -4336,35 +4621,45 @@ msgstr ""
"versio %s, saatavilla lisenssillä [GNU Affero General Public License](http://"
"www.fsf.org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:794
+#: lib/action.php:795
#, fuzzy
msgid "Site content license"
msgstr "StatusNet-ohjelmiston lisenssi"
-#: lib/action.php:803
+#: lib/action.php:800
+#, php-format
+msgid "Content and data of %1$s are private and confidential."
+msgstr ""
+
+#: lib/action.php:805
+#, php-format
+msgid "Content and data copyright by %1$s. All rights reserved."
+msgstr ""
+
+#: lib/action.php:808
+msgid "Content and data copyright by contributors. All rights reserved."
+msgstr ""
+
+#: lib/action.php:820
msgid "All "
msgstr "Kaikki "
-#: lib/action.php:808
+#: lib/action.php:825
msgid "license."
msgstr "lisenssi."
-#: lib/action.php:1102
+#: lib/action.php:1124
msgid "Pagination"
msgstr "Sivutus"
-#: lib/action.php:1111
+#: lib/action.php:1133
msgid "After"
msgstr "Myöhemmin"
-#: lib/action.php:1119
+#: lib/action.php:1141
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 +4700,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 +4787,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 +5093,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 +5630,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 +6005,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..41f62001f 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-21 22:36+0000\n"
+"PO-Revision-Date: 2010-01-21 22:37:36+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 (r61339); Translate extension (2010-01-16)\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!"
@@ -133,12 +139,12 @@ msgstr "Statuts de %1$s et ses amis dans %2$s!"
#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
-#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
+#: actions/apigroupmembership.php:106 actions/apigroupshow.php:115
#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
-#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150
+#: actions/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)."
@@ -383,7 +392,7 @@ msgstr "L’alias ne peut pas être le même que le pseudo."
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
msgid "Group not found!"
msgstr "Groupe non trouvé !"
@@ -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:1189
+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
@@ -4156,12 +4441,12 @@ msgstr "Il vous est interdit de poster des avis sur ce site."
msgid "Problem saving notice."
msgstr "Problème lors de l’enregistrement de l’avis."
-#: classes/Notice.php:1052
+#: classes/Notice.php:1059
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Erreur de base de donnée en insérant la réponse :%s"
-#: classes/Notice.php:1423
+#: classes/Notice.php:1441
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -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"
@@ -4362,34 +4643,44 @@ msgstr ""
"version %s, disponible sous la licence [GNU Affero General Public License] "
"(http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:794
+#: lib/action.php:795
msgid "Site content license"
msgstr "Licence du contenu du site"
-#: lib/action.php:803
+#: lib/action.php:800
+#, php-format
+msgid "Content and data of %1$s are private and confidential."
+msgstr ""
+
+#: lib/action.php:805
+#, php-format
+msgid "Content and data copyright by %1$s. All rights reserved."
+msgstr ""
+
+#: lib/action.php:808
+msgid "Content and data copyright by contributors. All rights reserved."
+msgstr ""
+
+#: lib/action.php:820
msgid "All "
msgstr "Tous "
-#: lib/action.php:808
+#: lib/action.php:825
msgid "license."
msgstr "licence."
-#: lib/action.php:1102
+#: lib/action.php:1124
msgid "Pagination"
msgstr "Pagination"
-#: lib/action.php:1111
+#: lib/action.php:1133
msgid "After"
msgstr "Après"
-#: lib/action.php:1119
+#: lib/action.php:1141
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 +4713,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 +4801,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 +5143,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 +5347,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 +5746,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 +6100,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..0f6c29dfa 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-21 22:36+0000\n"
+"PO-Revision-Date: 2010-01-21 22:37:39+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 (r61339); Translate extension (2010-01-16)\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!"
@@ -123,12 +128,12 @@ msgstr "Actualizacións dende %1$s e amigos en %2$s!"
#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
-#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
+#: actions/apigroupmembership.php:106 actions/apigroupshow.php:115
#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
-#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150
+#: actions/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.)."
@@ -381,7 +389,7 @@ msgstr ""
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
#, fuzzy
msgid "Group not found!"
msgstr "Método da API non atopado"
@@ -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:1189
+#, 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 ""
@@ -4184,12 +4473,12 @@ msgstr "Tes restrinxido o envio de chíos neste sitio."
msgid "Problem saving notice."
msgstr "Aconteceu un erro ó gardar o chío."
-#: classes/Notice.php:1052
+#: classes/Notice.php:1059
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Erro ó inserir a contestación na BD: %s"
-#: classes/Notice.php:1423
+#: classes/Notice.php:1441
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%1$s (%2$s)"
@@ -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"
@@ -4405,39 +4689,48 @@ msgstr ""
"%s, dispoñible baixo licenza [GNU Affero General Public License](http://www."
"fsf.org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:794
+#: lib/action.php:795
#, fuzzy
msgid "Site content license"
msgstr "Atopar no contido dos chíos"
-#: lib/action.php:803
+#: lib/action.php:800
+#, php-format
+msgid "Content and data of %1$s are private and confidential."
+msgstr ""
+
+#: lib/action.php:805
+#, php-format
+msgid "Content and data copyright by %1$s. All rights reserved."
+msgstr ""
+
+#: lib/action.php:808
+msgid "Content and data copyright by contributors. All rights reserved."
+msgstr ""
+
+#: lib/action.php:820
#, fuzzy
msgid "All "
msgstr "Todos"
-#: lib/action.php:808
+#: lib/action.php:825
msgid "license."
msgstr ""
-#: lib/action.php:1102
+#: lib/action.php:1124
msgid "Pagination"
msgstr ""
-#: lib/action.php:1111
+#: lib/action.php:1133
#, fuzzy
msgid "After"
msgstr "« Despois"
-#: lib/action.php:1119
+#: lib/action.php:1141
#, fuzzy
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 +4771,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 +4858,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 +5203,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 +5794,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 +6183,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..0367bace5 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-21 22:36+0000\n"
+"PO-Revision-Date: 2010-01-21 22:37:42+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 (r61339); Translate extension (2010-01-16)\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!"
@@ -121,12 +126,12 @@ msgstr ""
#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
-#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
+#: actions/apigroupmembership.php:106 actions/apigroupshow.php:115
#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
-#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150
+#: actions/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 ×ותיות)"
@@ -373,7 +381,7 @@ msgstr ""
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
#, fuzzy
msgid "Group not found!"
msgstr "×œ× × ×ž×¦×"
@@ -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:1189
+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 ""
@@ -4042,12 +4319,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 ""
@@ -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 ""
@@ -4260,37 +4532,47 @@ msgstr ""
"s, המופצת תחת רשיון [GNU Affero General Public License](http://www.fsf.org/"
"licensing/licenses/agpl-3.0.html)"
-#: lib/action.php:794
+#: lib/action.php:795
#, fuzzy
msgid "Site content license"
msgstr "הודעה חדשה"
-#: lib/action.php:803
-msgid "All "
+#: lib/action.php:800
+#, php-format
+msgid "Content and data of %1$s are private and confidential."
+msgstr ""
+
+#: lib/action.php:805
+#, php-format
+msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
#: lib/action.php:808
+msgid "Content and data copyright by contributors. All rights reserved."
+msgstr ""
+
+#: lib/action.php:820
+msgid "All "
+msgstr ""
+
+#: lib/action.php:825
msgid "license."
msgstr ""
-#: lib/action.php:1102
+#: lib/action.php:1124
msgid "Pagination"
msgstr ""
-#: lib/action.php:1111
+#: lib/action.php:1133
#, fuzzy
msgid "After"
msgstr "<< ×חרי"
-#: lib/action.php:1119
+#: lib/action.php:1141
#, fuzzy
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 +4607,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 +4694,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 +5001,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 +5530,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 +5908,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..2355fd8e9 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-21 22:36+0000\n"
+"PO-Revision-Date: 2010-01-21 22:37:44+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 (r61339); Translate extension (2010-01-16)\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!"
@@ -122,12 +127,12 @@ msgstr ""
#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
-#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
+#: actions/apigroupmembership.php:106 actions/apigroupshow.php:115
#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
-#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150
+#: actions/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)."
@@ -364,7 +372,7 @@ msgstr "Alias njemóže samsny kaž přimjeno być."
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
msgid "Group not found!"
msgstr "Skupina njenamakana!"
@@ -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:1189
+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
@@ -3859,12 +4113,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 ""
@@ -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 ""
@@ -4060,34 +4310,44 @@ msgid ""
"org/licensing/licenses/agpl-3.0.html)."
msgstr ""
-#: lib/action.php:794
+#: lib/action.php:795
msgid "Site content license"
msgstr ""
-#: lib/action.php:803
-msgid "All "
+#: lib/action.php:800
+#, php-format
+msgid "Content and data of %1$s are private and confidential."
+msgstr ""
+
+#: lib/action.php:805
+#, php-format
+msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
#: lib/action.php:808
+msgid "Content and data copyright by contributors. All rights reserved."
+msgstr ""
+
+#: lib/action.php:820
+msgid "All "
+msgstr ""
+
+#: lib/action.php:825
msgid "license."
msgstr ""
-#: lib/action.php:1102
+#: lib/action.php:1124
msgid "Pagination"
msgstr ""
-#: lib/action.php:1111
+#: lib/action.php:1133
msgid "After"
msgstr ""
-#: lib/action.php:1119
+#: lib/action.php:1141
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 +4380,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 +4461,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 +4508,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 +4570,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 +4601,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 +4761,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 +4957,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 +5258,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 +5618,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..b54150d95 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-21 22:36+0000\n"
+"PO-Revision-Date: 2010-01-21 22:37:47+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 (r61339); Translate extension (2010-01-16)\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!"
@@ -128,12 +133,12 @@ msgstr "Actualisationes de %1$s e su amicos in %2$s!"
#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
-#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
+#: actions/apigroupmembership.php:106 actions/apigroupshow.php:115
#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
-#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150
+#: actions/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)."
@@ -377,7 +385,7 @@ msgstr "Le alias non pote esser identic al pseudonymo."
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
msgid "Group not found!"
msgstr "Gruppo non trovate!"
@@ -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:1189
+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 ""
@@ -4083,12 +4366,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 ""
@@ -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 ""
@@ -4284,34 +4563,44 @@ msgid ""
"org/licensing/licenses/agpl-3.0.html)."
msgstr ""
-#: lib/action.php:794
+#: lib/action.php:795
msgid "Site content license"
msgstr ""
-#: lib/action.php:803
-msgid "All "
+#: lib/action.php:800
+#, php-format
+msgid "Content and data of %1$s are private and confidential."
+msgstr ""
+
+#: lib/action.php:805
+#, php-format
+msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
#: lib/action.php:808
+msgid "Content and data copyright by contributors. All rights reserved."
+msgstr ""
+
+#: lib/action.php:820
+msgid "All "
+msgstr ""
+
+#: lib/action.php:825
msgid "license."
msgstr ""
-#: lib/action.php:1102
+#: lib/action.php:1124
msgid "Pagination"
msgstr ""
-#: lib/action.php:1111
+#: lib/action.php:1133
msgid "After"
msgstr ""
-#: lib/action.php:1119
+#: lib/action.php:1141
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 +4634,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 +4717,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 +5015,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 +5524,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 +5879,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..a12227a70 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-21 22:36+0000\n"
+"PO-Revision-Date: 2010-01-21 22:37:50+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 (r61339); Translate extension (2010-01-16)\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!"
@@ -123,12 +128,12 @@ msgstr "Færslur frá %1$s og vinum á %2$s!"
#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
-#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
+#: actions/apigroupmembership.php:106 actions/apigroupshow.php:115
#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
-#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150
+#: actions/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)."
@@ -375,7 +383,7 @@ msgstr ""
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
#, fuzzy
msgid "Group not found!"
msgstr "Aðferð í forritsskilum fannst ekki!"
@@ -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:1189
+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 ""
@@ -4081,12 +4367,12 @@ msgstr "Það hefur verið lagt bann við babli frá þér á þessari síðu."
msgid "Problem saving notice."
msgstr "Vandamál komu upp við að vista babl."
-#: classes/Notice.php:1052
+#: classes/Notice.php:1059
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Gagnagrunnsvilla við innsetningu svars: %s"
-#: classes/Notice.php:1423
+#: classes/Notice.php:1441
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%1$s (%2$s)"
@@ -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, "
@@ -4291,35 +4573,45 @@ msgstr ""
"sem er gefinn út undir [GNU Affero almenningsleyfinu](http://www.fsf.org/"
"licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:794
+#: lib/action.php:795
#, fuzzy
msgid "Site content license"
msgstr "Hugbúnaðarleyfi StatusNet"
-#: lib/action.php:803
+#: lib/action.php:800
+#, php-format
+msgid "Content and data of %1$s are private and confidential."
+msgstr ""
+
+#: lib/action.php:805
+#, php-format
+msgid "Content and data copyright by %1$s. All rights reserved."
+msgstr ""
+
+#: lib/action.php:808
+msgid "Content and data copyright by contributors. All rights reserved."
+msgstr ""
+
+#: lib/action.php:820
msgid "All "
msgstr "Allt "
-#: lib/action.php:808
+#: lib/action.php:825
msgid "license."
msgstr "leyfi."
-#: lib/action.php:1102
+#: lib/action.php:1124
msgid "Pagination"
msgstr "Uppröðun"
-#: lib/action.php:1111
+#: lib/action.php:1133
msgid "After"
msgstr "Eftir"
-#: lib/action.php:1119
+#: lib/action.php:1141
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 +4651,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 +4737,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 +5043,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 +5567,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 +5936,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..892526e98 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-21 22:36+0000\n"
+"PO-Revision-Date: 2010-01-21 22:37:54+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 (r61339); Translate extension (2010-01-16)\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!"
@@ -130,12 +135,12 @@ msgstr "Messaggi da %1$s e amici su %2$s!"
#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
-#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
+#: actions/apigroupmembership.php:106 actions/apigroupshow.php:115
#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
-#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150
+#: actions/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)."
@@ -378,7 +386,7 @@ msgstr "L'alias non può essere lo stesso del soprannome."
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
msgid "Group not found!"
msgstr "Gruppo non trovato!"
@@ -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:1189
+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 ""
@@ -4117,12 +4406,12 @@ msgstr "Ti è proibito inviare messaggi su questo sito."
msgid "Problem saving notice."
msgstr "Problema nel salvare il messaggio."
-#: classes/Notice.php:1052
+#: classes/Notice.php:1059
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Errore del DB nell'inserire la risposta: %s"
-#: classes/Notice.php:1423
+#: classes/Notice.php:1441
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -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"
@@ -4323,34 +4608,44 @@ msgstr ""
"s, disponibile nei termini della licenza [GNU Affero General Public License]"
"(http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:794
+#: lib/action.php:795
msgid "Site content license"
msgstr "Licenza del contenuto del sito"
-#: lib/action.php:803
+#: lib/action.php:800
+#, php-format
+msgid "Content and data of %1$s are private and confidential."
+msgstr ""
+
+#: lib/action.php:805
+#, php-format
+msgid "Content and data copyright by %1$s. All rights reserved."
+msgstr ""
+
+#: lib/action.php:808
+msgid "Content and data copyright by contributors. All rights reserved."
+msgstr ""
+
+#: lib/action.php:820
msgid "All "
msgstr "Tutti "
-#: lib/action.php:808
+#: lib/action.php:825
msgid "license."
msgstr "licenza."
-#: lib/action.php:1102
+#: lib/action.php:1124
msgid "Pagination"
msgstr "Paginazione"
-#: lib/action.php:1111
+#: lib/action.php:1133
msgid "After"
msgstr "Successivi"
-#: lib/action.php:1119
+#: lib/action.php:1141
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 +4678,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 +4764,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 +5104,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 +5704,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 +6056,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..6260ef5ac 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-21 22:36+0000\n"
+"PO-Revision-Date: 2010-01-21 22:37:57+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 (r61339); 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!"
@@ -129,12 +134,12 @@ msgstr "%2$s ã« %1$s ã¨å‹äººã‹ã‚‰ã®æ›´æ–°ãŒã‚ã‚Šã¾ã™ï¼"
#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
-#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
+#: actions/apigroupmembership.php:106 actions/apigroupshow.php:115
#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
-#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150
+#: actions/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字)"
@@ -378,7 +386,7 @@ msgstr "別åã¯ãƒ‹ãƒƒã‚¯ãƒãƒ¼ãƒ ã¨åŒã˜ã§ã¯ã„ã‘ã¾ã›ã‚“。"
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
msgid "Group not found!"
msgstr "グループãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“!"
@@ -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 "ãã®ï¼©ï¼¤ã§ã®ã‚¹ãƒ†ãƒ¼ã‚¿ã‚¹ã¯ã‚ã‚Šã¾ã›ã‚“。"
-#: 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
@@ -798,7 +876,7 @@ msgid ""
"You are about to permanently delete a notice. Once this is done, it cannot "
"be undone."
msgstr ""
-"ã‚ãªãŸã¯æ°¸ä¹…ã«ã¤ã¶ã‚„ãを削除ã—よã†ã¨ã—ã¦ã„ã¾ã™ã€‚ ã“ã‚ŒãŒå®Œäº†ã™ã‚‹ã¨ãれを元ã«æˆ»"
+"ã‚ãªãŸã¯ã¤ã¶ã‚„ãを永久ã«å‰Šé™¤ã—よã†ã¨ã—ã¦ã„ã¾ã™ã€‚ ã“ã‚ŒãŒå®Œäº†ã™ã‚‹ã¨ãれを元ã«æˆ»"
"ã™ã“ã¨ã¯ã§ãã¾ã›ã‚“。"
#: actions/deletenotice.php:109 actions/deletenotice.php:141
@@ -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:1189
+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"
@@ -1035,11 +1184,12 @@ msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
msgstr ""
-"ã“ã®ã‚¢ãƒ‰ãƒ¬ã‚¹ã¯ç¢ºèªå¾…ã¡ã§ã™ã€‚å—信ボックス(ã¨ã‚¹ãƒ‘ムボックス)ã«è¿½åŠ ã®æŒ‡ç¤ºãŒæ›¸"
+"ã“ã®ã‚¢ãƒ‰ãƒ¬ã‚¹ã¯æ‰¿èªå¾…ã¡ã§ã™ã€‚å—信ボックス(ã¨ã‚¹ãƒ‘ムボックス)ã«è¿½åŠ ã®æŒ‡ç¤ºãŒæ›¸"
"ã‹ã‚ŒãŸãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ãŒå±Šã„ã¦ã„ãªã„ã‹ç¢ºèªã—ã¦ãã ã•ã„。"
#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126
+#: actions/smssettings.php:126 lib/applicationeditform.php:333
+#: lib/applicationeditform.php:334
msgid "Cancel"
msgstr "中止"
@@ -1084,17 +1234,17 @@ msgstr "メールã§æ–°è¦ãƒ•ã‚©ãƒ­ãƒ¼ã®é€šçŸ¥ã‚’ç§ã«é€ã£ã¦ãã ã•ã„。
#: actions/emailsettings.php:163
msgid "Send me email when someone adds my notice as a favorite."
msgstr ""
-"ã ã‚Œã‹ãŒãŠæ°—ã«å…¥ã‚Šã¨ã—ã¦ç§ã®ã¤ã¶ã‚„ãを加ãˆãŸã‚‰ãƒ¡ãƒ¼ãƒ«ã‚’ç§ã«é€ã£ã¦ãã ã•ã„。"
+"ã ã‚Œã‹ãŒãŠæ°—ã«å…¥ã‚Šã¨ã—ã¦ç§ã®ã¤ã¶ã‚„ãを加ãˆãŸã‚‰ã€ãƒ¡ãƒ¼ãƒ«ã‚’ç§ã«é€ã£ã¦ãã ã•ã„。"
#: actions/emailsettings.php:169
msgid "Send me email when someone sends me a private message."
msgstr ""
-"ã ã‚Œã‹ãŒãƒ—ライベート・メッセージをç§ã«é€ã‚‹ã¨ãã«ã¯ãƒ¡ãƒ¼ãƒ«ã‚’ç§ã«é€ã£ã¦ãã ã•"
+"ã ã‚Œã‹ãŒãƒ—ライベート・メッセージをç§ã«é€ã‚‹ã¨ãã«ã¯ã€ãƒ¡ãƒ¼ãƒ«ã‚’ç§ã«é€ã£ã¦ãã ã•"
"ã„。"
#: actions/emailsettings.php:174
msgid "Send me email when someone sends me an \"@-reply\"."
-msgstr "ã ã‚Œã‹ãŒ\"@-返信\"ã‚’ç§ã‚’é€ã‚‹ã¨ãã«ã¯ãƒ¡ãƒ¼ãƒ«ã‚’ç§ã«é€ã£ã¦ãã ã•ã„ã€"
+msgstr "ã ã‚Œã‹ãŒ\"@-返信\"ã‚’ç§ã‚’é€ã‚‹ã¨ãã«ã¯ã€ãƒ¡ãƒ¼ãƒ«ã‚’ç§ã«é€ã£ã¦ãã ã•ã„ã€"
#: actions/emailsettings.php:179
msgid "Allow friends to nudge me and send me an email."
@@ -1137,21 +1287,21 @@ msgstr "ã“ã®ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã¯æ—¢ã«ä»–ã®äººãŒä½¿ã£ã¦ã„ã¾ã™ã€‚"
#: actions/emailsettings.php:353 actions/imsettings.php:317
#: actions/smssettings.php:337
msgid "Couldn't insert confirmation code."
-msgstr "確èªã‚³ãƒ¼ãƒ‰ã‚’追加ã§ãã¾ã›ã‚“"
+msgstr "承èªã‚³ãƒ¼ãƒ‰ã‚’追加ã§ãã¾ã›ã‚“"
#: actions/emailsettings.php:359
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
msgstr ""
-"確èªç”¨ã‚³ãƒ¼ãƒ‰ã‚’入力ã•ã‚ŒãŸé›»å­ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã«é€ä¿¡ã—ã¾ã—ãŸã€‚å—信ボックス(ã¨ã‚¹"
-"パムボックス)ã«ã‚³ãƒ¼ãƒ‰ã¨ãれをã©ã†ä½¿ã†ã®ã‹ã¨ã„ã†æŒ‡ç¤ºãŒå±Šã„ã¦ã„ãªã„ã‹ç¢ºèªã—ã¦"
-"ãã ã•ã„。"
+"承èªã‚³ãƒ¼ãƒ‰ã‚’入力ã•ã‚ŒãŸé›»å­ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã«é€ä¿¡ã—ã¾ã—ãŸã€‚å—信ボックス(ã¨ã‚¹ãƒ‘"
+"ムボックス)ã«ã‚³ãƒ¼ãƒ‰ã¨ãれをã©ã†ä½¿ã†ã®ã‹ã¨ã„ã†æŒ‡ç¤ºãŒå±Šã„ã¦ã„ãªã„ã‹ç¢ºèªã—ã¦ã"
+"ã ã•ã„。"
#: actions/emailsettings.php:379 actions/imsettings.php:351
#: actions/smssettings.php:370
msgid "No pending confirmation to cancel."
-msgstr "èªè¨¼å¾…ã¡ã®ã‚‚ã®ã¯ã‚ã‚Šã¾ã›ã‚“。"
+msgstr "承èªå¾…ã¡ã®ã‚‚ã®ã¯ã‚ã‚Šã¾ã›ã‚“。"
#: actions/emailsettings.php:383 actions/imsettings.php:355
msgid "That is the wrong IM address."
@@ -1160,7 +1310,7 @@ msgstr "ãã® IM アドレスã¯ä¸æ­£ã§ã™ã€‚"
#: actions/emailsettings.php:395 actions/imsettings.php:367
#: actions/smssettings.php:386
msgid "Confirmation cancelled."
-msgstr "確èªä½œæ¥­ãŒä¸­æ­¢ã•ã‚Œã¾ã—ãŸã€‚"
+msgstr "承èªä½œæ¥­ãŒä¸­æ­¢ã•ã‚Œã¾ã—ãŸã€‚"
#: actions/emailsettings.php:413
msgid "That is not your email address."
@@ -1571,7 +1721,7 @@ msgid ""
"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
"message with further instructions. (Did you add %s to your buddy list?)"
msgstr ""
-"ã“ã®ã‚¢ãƒ‰ãƒ¬ã‚¹ã¯ç¢ºèªå¾…ã¡ã§ã™ã€‚Jabber ã‹ Gtalk ã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã§è¿½åŠ ã®æŒ‡ç¤ºãŒæ›¸ã‹ã‚Œ"
+"ã“ã®ã‚¢ãƒ‰ãƒ¬ã‚¹ã¯æ‰¿èªå¾…ã¡ã§ã™ã€‚Jabber ã‹ Gtalk ã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã§è¿½åŠ ã®æŒ‡ç¤ºãŒæ›¸ã‹ã‚Œ"
"ãŸãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’確èªã—ã¦ãã ã•ã„。(%s ã‚’å‹äººãƒªã‚¹ãƒˆã«è¿½åŠ ã—ã¾ã—ãŸã‹ï¼Ÿ)"
#: actions/imsettings.php:124
@@ -1631,8 +1781,8 @@ msgid ""
"A confirmation code was sent to the IM address you added. You must approve %"
"s for sending messages to you."
msgstr ""
-"確èªç”¨ã‚³ãƒ¼ãƒ‰ã‚’入力ã•ã‚ŒãŸ IM アドレスã«é€ä¿¡ã—ã¾ã—ãŸã€‚ã‚ãªãŸã«ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’é€ã‚Œ"
-"るよã†ã«ã™ã‚‹ã«ã¯%sを承èªã—ã¦ãã ã•ã„。"
+"承èªã‚³ãƒ¼ãƒ‰ã‚’入力ã•ã‚ŒãŸ IM アドレスã«é€ä¿¡ã—ã¾ã—ãŸã€‚ã‚ãªãŸã«ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’é€ã‚Œã‚‹"
+"よã†ã«ã™ã‚‹ã«ã¯%sを承èªã—ã¦ãã ã•ã„。"
#: actions/imsettings.php:387
msgid "That is not your Jabber ID."
@@ -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 "ホームページ"
@@ -2811,7 +3014,7 @@ msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
msgstr ""
-"(メールアドレスを確èªã™ã‚‹æ–¹æ³•ã‚’読んã§ã€ã™ãã«ãƒ¡ãƒ¼ãƒ«ã«ã‚ˆã‚‹ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’å—ã‘å–ã‚‹"
+"(メールアドレスを承èªã™ã‚‹æ–¹æ³•ã‚’読んã§ã€ã™ãã«ãƒ¡ãƒ¼ãƒ«ã«ã‚ˆã‚‹ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’å—ã‘å–ã‚‹"
"よã†ã«ã—ã¦ãã ã•ã„)"
#: actions/remotesubscribe.php:98
@@ -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 "メールアドレスã€ã‚¢ãƒã‚¿ãƒ¼ã€ãƒ‘スワードã€ãƒ—ロパティã®å¤‰æ›´"
@@ -4300,34 +4560,44 @@ msgstr ""
"ã„ã¦ã„ã¾ã™ã€‚ ライセンス [GNU Affero General Public License](http://www.fsf."
"org/licensing/licenses/agpl-3.0.html)。"
-#: lib/action.php:794
+#: lib/action.php:795
msgid "Site content license"
msgstr "サイト内容ライセンス"
-#: lib/action.php:803
+#: lib/action.php:800
+#, php-format
+msgid "Content and data of %1$s are private and confidential."
+msgstr ""
+
+#: lib/action.php:805
+#, php-format
+msgid "Content and data copyright by %1$s. All rights reserved."
+msgstr ""
+
+#: lib/action.php:808
+msgid "Content and data copyright by contributors. All rights reserved."
+msgstr ""
+
+#: lib/action.php:820
msgid "All "
msgstr "全㦠"
-#: lib/action.php:808
+#: lib/action.php:825
msgid "license."
msgstr "ライセンス。"
-#: lib/action.php:1102
+#: lib/action.php:1124
msgid "Pagination"
msgstr "ページ化"
-#: lib/action.php:1111
+#: lib/action.php:1133
msgid "After"
msgstr "<<後"
-#: lib/action.php:1119
+#: lib/action.php:1141
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 +4630,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 +4716,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 +5012,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 +5210,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"
@@ -4910,7 +5254,7 @@ msgstr ""
"\n"
"ã ã‚Œã‹ãŒã“ã®ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã‚’ %s ã«å…¥åŠ›ã—ã¾ã—ãŸã€‚\n"
"\n"
-"ã‚‚ã—エントリーを確èªã—ãŸã„ãªã‚‰ã€ä»¥ä¸‹ã®URLを使用ã—ã¦ãã ã•ã„:\n"
+"ã‚‚ã—登録を承èªã—ãŸã„ãªã‚‰ã€ä»¥ä¸‹ã®URLを使用ã—ã¦ãã ã•ã„:\n"
"\n"
"%s\n"
"\n"
@@ -5266,10 +5610,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 +5967,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..b8197af3e 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-21 22:36+0000\n"
+"PO-Revision-Date: 2010-01-21 22:38:00+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 (r61339); Translate extension (2010-01-16)\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!"
@@ -121,12 +126,12 @@ msgstr "%1$s ë° %2$sì— ìžˆëŠ” ì¹œêµ¬ë“¤ì˜ ì—…ë°ì´íŠ¸!"
#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
-#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
+#: actions/apigroupmembership.php:106 actions/apigroupshow.php:115
#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
-#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150
+#: actions/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글ìž)"
@@ -377,7 +385,7 @@ msgstr ""
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
#, fuzzy
msgid "Group not found!"
msgstr "API 메서드를 ì°¾ì„ ìˆ˜ 없습니다."
@@ -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:1189
+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 ""
@@ -4106,12 +4392,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
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%1$s (%2$s)"
@@ -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 "ë‹¹ì‹ ì˜ ì´ë©”ì¼, 아바타, 비밀 번호, í”„ë¡œí•„ì„ ë³€ê²½í•˜ì„¸ìš”."
@@ -4316,35 +4598,45 @@ msgstr ""
"ì„ ì‚¬ìš©í•©ë‹ˆë‹¤. StatusNet는 [GNU Affero General Public License](http://www."
"fsf.org/licensing/licenses/agpl-3.0.html) ë¼ì´ì„ ìŠ¤ì— ë”°ë¼ ì‚¬ìš©í•  수 있습니다."
-#: lib/action.php:794
+#: lib/action.php:795
#, fuzzy
msgid "Site content license"
msgstr "ë¼ì½”니카 소프트웨어 ë¼ì´ì„ ìŠ¤"
-#: lib/action.php:803
+#: lib/action.php:800
+#, php-format
+msgid "Content and data of %1$s are private and confidential."
+msgstr ""
+
+#: lib/action.php:805
+#, php-format
+msgid "Content and data copyright by %1$s. All rights reserved."
+msgstr ""
+
+#: lib/action.php:808
+msgid "Content and data copyright by contributors. All rights reserved."
+msgstr ""
+
+#: lib/action.php:820
msgid "All "
msgstr "모든 것"
-#: lib/action.php:808
+#: lib/action.php:825
msgid "license."
msgstr "ë¼ì´ì„ ìŠ¤"
-#: lib/action.php:1102
+#: lib/action.php:1124
msgid "Pagination"
msgstr "페ì´ì§€ìˆ˜"
-#: lib/action.php:1111
+#: lib/action.php:1133
msgid "After"
msgstr "ë’· 페ì´ì§€"
-#: lib/action.php:1119
+#: lib/action.php:1141
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 +4677,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 +4764,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 +5067,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 +5590,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 +5965,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..95eaff943 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-21 22:36+0000\n"
+"PO-Revision-Date: 2010-01-21 22:38:03+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 (r61339); Translate extension (2010-01-16)\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!"
@@ -130,12 +135,12 @@ msgstr "Подновувања од %1$s и пријатели на %2$s!"
#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
-#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
+#: actions/apigroupmembership.php:106 actions/apigroupshow.php:115
#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
-#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150
+#: actions/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 знаци)."
@@ -379,7 +387,7 @@ msgstr "ÐлијаÑот не може да биде иÑÑ‚ како прекаÑ
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
msgid "Group not found!"
msgstr "Групата не е пронајдена!"
@@ -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:1189
+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
@@ -4131,12 +4394,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"
@@ -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 "Промена на е-пошта, аватар, лозинка, профил"
@@ -4337,34 +4596,44 @@ msgstr ""
"верзија %s, доÑтапен пд [GNU Affero General Public License](http://www.fsf."
"org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:794
+#: lib/action.php:795
msgid "Site content license"
msgstr "Лиценца на Ñодржините на веб-Ñтраницата"
-#: lib/action.php:803
+#: lib/action.php:800
+#, php-format
+msgid "Content and data of %1$s are private and confidential."
+msgstr ""
+
+#: lib/action.php:805
+#, php-format
+msgid "Content and data copyright by %1$s. All rights reserved."
+msgstr ""
+
+#: lib/action.php:808
+msgid "Content and data copyright by contributors. All rights reserved."
+msgstr ""
+
+#: lib/action.php:820
msgid "All "
msgstr "Сите "
-#: lib/action.php:808
+#: lib/action.php:825
msgid "license."
msgstr "лиценца."
-#: lib/action.php:1102
+#: lib/action.php:1124
msgid "Pagination"
msgstr "Прелом на Ñтраници"
-#: lib/action.php:1111
+#: lib/action.php:1133
msgid "After"
msgstr "По"
-#: lib/action.php:1119
+#: lib/action.php:1141
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 +4666,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 +4748,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 +5085,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 +5285,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 +5688,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 +6043,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..697fda7b0 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-21 22:36+0000\n"
+"PO-Revision-Date: 2010-01-21 22:38:06+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 (r61339); Translate extension (2010-01-16)\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!"
@@ -127,12 +132,12 @@ msgstr "Oppdateringer fra %1$s og venner på %2$s!"
#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
-#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
+#: actions/apigroupmembership.php:106 actions/apigroupshow.php:115
#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
-#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150
+#: actions/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)."
@@ -380,7 +388,7 @@ msgstr ""
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
#, fuzzy
msgid "Group not found!"
msgstr "API-metode ikke funnet!"
@@ -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:1189
+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 ""
@@ -4020,12 +4295,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 ""
@@ -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 ""
@@ -4229,35 +4499,45 @@ msgid ""
"org/licensing/licenses/agpl-3.0.html)."
msgstr ""
-#: lib/action.php:794
+#: lib/action.php:795
msgid "Site content license"
msgstr ""
-#: lib/action.php:803
-msgid "All "
+#: lib/action.php:800
+#, php-format
+msgid "Content and data of %1$s are private and confidential."
+msgstr ""
+
+#: lib/action.php:805
+#, php-format
+msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
#: lib/action.php:808
+msgid "Content and data copyright by contributors. All rights reserved."
+msgstr ""
+
+#: lib/action.php:820
+msgid "All "
+msgstr ""
+
+#: lib/action.php:825
msgid "license."
msgstr ""
-#: lib/action.php:1102
+#: lib/action.php:1124
msgid "Pagination"
msgstr ""
-#: lib/action.php:1111
+#: lib/action.php:1133
msgid "After"
msgstr ""
-#: lib/action.php:1119
+#: lib/action.php:1141
#, fuzzy
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 +4570,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 +4657,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 +4960,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 +5488,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 +5858,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..935117671 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-21 22:36+0000\n"
+"PO-Revision-Date: 2010-01-21 22:38:12+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 (r61339); Translate extension (2010-01-16)\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!"
@@ -131,12 +136,12 @@ msgstr "Updates van %1$s en vrienden op %2$s."
#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
-#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
+#: actions/apigroupmembership.php:106 actions/apigroupshow.php:115
#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
-#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150
+#: actions/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)."
@@ -385,7 +393,7 @@ msgstr "Een alias kan niet hetzelfde zijn als de gebruikersnaam."
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
msgid "Group not found!"
msgstr "De groep is niet aangetroffen!"
@@ -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:1189
+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
@@ -4157,13 +4429,13 @@ msgstr ""
msgid "Problem saving notice."
msgstr "Er is een probleem opgetreden bij het opslaan van de mededeling."
-#: classes/Notice.php:1052
+#: classes/Notice.php:1059
#, php-format
msgid "DB error inserting reply: %s"
msgstr ""
"Er is een databasefout opgetreden bij het invoegen van het antwoord: %s"
-#: classes/Notice.php:1423
+#: classes/Notice.php:1441
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -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"
@@ -4364,34 +4632,44 @@ msgstr ""
"versie %s, beschikbaar onder de [GNU Affero General Public License](http://"
"www.fsf.org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:794
+#: lib/action.php:795
msgid "Site content license"
msgstr "Licentie voor siteinhoud"
-#: lib/action.php:803
+#: lib/action.php:800
+#, php-format
+msgid "Content and data of %1$s are private and confidential."
+msgstr ""
+
+#: lib/action.php:805
+#, php-format
+msgid "Content and data copyright by %1$s. All rights reserved."
+msgstr ""
+
+#: lib/action.php:808
+msgid "Content and data copyright by contributors. All rights reserved."
+msgstr ""
+
+#: lib/action.php:820
msgid "All "
msgstr "Alle "
-#: lib/action.php:808
+#: lib/action.php:825
msgid "license."
msgstr "licentie."
-#: lib/action.php:1102
+#: lib/action.php:1124
msgid "Pagination"
msgstr "Paginering"
-#: lib/action.php:1111
+#: lib/action.php:1133
msgid "After"
msgstr "Later"
-#: lib/action.php:1119
+#: lib/action.php:1141
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 +4702,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 +4784,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 +5128,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 +5328,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 +5730,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 +6085,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..5a9d928fd 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-21 22:36+0000\n"
+"PO-Revision-Date: 2010-01-21 22:38:09+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 (r61339); Translate extension (2010-01-16)\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!"
@@ -121,12 +126,12 @@ msgstr "Oppdateringar frå %1$s og vener på %2$s!"
#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
-#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
+#: actions/apigroupmembership.php:106 actions/apigroupshow.php:115
#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
-#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150
+#: actions/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)."
@@ -375,7 +383,7 @@ msgstr ""
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
#, fuzzy
msgid "Group not found!"
msgstr "Fann ikkje API-metode."
@@ -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:1189
+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 ""
@@ -4123,12 +4409,12 @@ msgstr "Du kan ikkje lengre legge inn notisar på denne sida."
msgid "Problem saving notice."
msgstr "Eit problem oppstod ved lagring av notis."
-#: classes/Notice.php:1052
+#: classes/Notice.php:1059
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Databasefeil, kan ikkje lagra svar: %s"
-#: classes/Notice.php:1423
+#: classes/Notice.php:1441
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%1$s (%2$s)"
@@ -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"
@@ -4333,35 +4615,45 @@ msgstr ""
"%s, tilgjengeleg under [GNU Affero General Public License](http://www.fsf."
"org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:794
+#: lib/action.php:795
#, fuzzy
msgid "Site content license"
msgstr "StatusNets programvarelisens"
-#: lib/action.php:803
+#: lib/action.php:800
+#, php-format
+msgid "Content and data of %1$s are private and confidential."
+msgstr ""
+
+#: lib/action.php:805
+#, php-format
+msgid "Content and data copyright by %1$s. All rights reserved."
+msgstr ""
+
+#: lib/action.php:808
+msgid "Content and data copyright by contributors. All rights reserved."
+msgstr ""
+
+#: lib/action.php:820
msgid "All "
msgstr "Alle"
-#: lib/action.php:808
+#: lib/action.php:825
msgid "license."
msgstr "lisens."
-#: lib/action.php:1102
+#: lib/action.php:1124
msgid "Pagination"
msgstr "Paginering"
-#: lib/action.php:1111
+#: lib/action.php:1133
msgid "After"
msgstr "« Etter"
-#: lib/action.php:1119
+#: lib/action.php:1141
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 +4694,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 +4781,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 +5087,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 +5617,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 +5992,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..b42a542b5 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-21 22:36+0000\n"
+"PO-Revision-Date: 2010-01-21 22:38:15+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 (r61339); Translate extension (2010-01-16)\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!"
@@ -134,12 +139,12 @@ msgstr "Aktualizacje z %1$s i przyjaciół na %2$s."
#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
-#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
+#: actions/apigroupmembership.php:106 actions/apigroupshow.php:115
#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
-#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150
+#: actions/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)."
@@ -382,7 +390,7 @@ msgstr "Alias nie może być taki sam jak pseudonim."
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
msgid "Group not found!"
msgstr "Nie odnaleziono grupy."
@@ -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:1189
+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
@@ -4106,12 +4367,12 @@ msgstr "Zabroniono ci wysyłania wpisów na tej stronie."
msgid "Problem saving notice."
msgstr "Problem podczas zapisywania wpisu."
-#: classes/Notice.php:1052
+#: classes/Notice.php:1059
#, php-format
msgid "DB error inserting reply: %s"
msgstr "BÅ‚Ä…d bazy danych podczas wprowadzania odpowiedzi: %s"
-#: classes/Notice.php:1423
+#: classes/Notice.php:1441
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -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"
@@ -4312,34 +4569,44 @@ msgstr ""
"status.net/) w wersji %s, dostępnego na [Powszechnej Licencji Publicznej GNU "
"Affero](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:794
+#: lib/action.php:795
msgid "Site content license"
msgstr "Licencja zawartości strony"
-#: lib/action.php:803
+#: lib/action.php:800
+#, php-format
+msgid "Content and data of %1$s are private and confidential."
+msgstr ""
+
+#: lib/action.php:805
+#, php-format
+msgid "Content and data copyright by %1$s. All rights reserved."
+msgstr ""
+
+#: lib/action.php:808
+msgid "Content and data copyright by contributors. All rights reserved."
+msgstr ""
+
+#: lib/action.php:820
msgid "All "
msgstr "Wszystko "
-#: lib/action.php:808
+#: lib/action.php:825
msgid "license."
msgstr "licencja."
-#: lib/action.php:1102
+#: lib/action.php:1124
msgid "Pagination"
msgstr "Paginacja"
-#: lib/action.php:1111
+#: lib/action.php:1133
msgid "After"
msgstr "Później"
-#: lib/action.php:1119
+#: lib/action.php:1141
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 +4639,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 +4721,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 +5062,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 +5262,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 +5659,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 +6013,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..9b136debd 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-21 22:36+0000\n"
+"PO-Revision-Date: 2010-01-21 22:38:17+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 (r61339); Translate extension (2010-01-16)\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!"
@@ -128,12 +133,12 @@ msgstr "Actualizações de %1$s e amigos no %2$s!"
#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
-#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
+#: actions/apigroupmembership.php:106 actions/apigroupshow.php:115
#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
-#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150
+#: actions/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)."
@@ -375,7 +383,7 @@ msgstr "Os sinónimos não podem ser iguais ao nome do utilizador."
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
msgid "Group not found!"
msgstr "Grupo não foi encontrado!"
@@ -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:1189
+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 ""
@@ -4111,12 +4400,12 @@ msgstr "Está proibido de publicar notas neste site."
msgid "Problem saving notice."
msgstr "Problema na gravação da nota."
-#: classes/Notice.php:1052
+#: classes/Notice.php:1059
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Ocorreu um erro na base de dados ao inserir a resposta: %s"
-#: classes/Notice.php:1423
+#: classes/Notice.php:1441
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -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"
@@ -4317,34 +4602,44 @@ msgstr ""
"disponibilizado nos termos da [GNU Affero General Public License](http://www."
"fsf.org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:794
+#: lib/action.php:795
msgid "Site content license"
msgstr "Licença de conteúdos do site"
-#: lib/action.php:803
+#: lib/action.php:800
+#, php-format
+msgid "Content and data of %1$s are private and confidential."
+msgstr ""
+
+#: lib/action.php:805
+#, php-format
+msgid "Content and data copyright by %1$s. All rights reserved."
+msgstr ""
+
+#: lib/action.php:808
+msgid "Content and data copyright by contributors. All rights reserved."
+msgstr ""
+
+#: lib/action.php:820
msgid "All "
msgstr "Tudo "
-#: lib/action.php:808
+#: lib/action.php:825
msgid "license."
msgstr "licença."
-#: lib/action.php:1102
+#: lib/action.php:1124
msgid "Pagination"
msgstr "Paginação"
-#: lib/action.php:1111
+#: lib/action.php:1133
msgid "After"
msgstr "Posteriores"
-#: lib/action.php:1119
+#: lib/action.php:1141
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 +4672,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 +4758,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 +5094,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 +5694,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 +6046,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..d28a14e68 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-21 22:36+0000\n"
+"PO-Revision-Date: 2010-01-21 22:38:21+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 (r61339); 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!"
@@ -131,12 +136,12 @@ msgstr "Atualizações de %1$s e amigos no %2$s!"
#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
-#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
+#: actions/apigroupmembership.php:106 actions/apigroupshow.php:115
#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
-#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150
+#: actions/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)."
@@ -384,7 +389,7 @@ msgstr "O apelido não pode ser igual à identificação."
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
msgid "Group not found!"
msgstr "O grupo não foi encontrado!"
@@ -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:1189
+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"
@@ -4345,42 +4599,51 @@ msgstr ""
"versão %s, disponível sob a [GNU Affero General Public License] (http://www."
"fsf.org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:794
+#: lib/action.php:795
msgid "Site content license"
msgstr "Licença do conteúdo do site"
-#: lib/action.php:803
+#: lib/action.php:800
+#, php-format
+msgid "Content and data of %1$s are private and confidential."
+msgstr ""
+
+#: lib/action.php:805
+#, php-format
+msgid "Content and data copyright by %1$s. All rights reserved."
+msgstr ""
+
+#: lib/action.php:808
+msgid "Content and data copyright by contributors. All rights reserved."
+msgstr ""
+
+#: lib/action.php:820
msgid "All "
msgstr "Todas "
-#: lib/action.php:808
+#: lib/action.php:825
msgid "license."
msgstr "licença."
-#: lib/action.php:1102
+#: lib/action.php:1124
msgid "Pagination"
msgstr "Paginação"
-#: lib/action.php:1111
+#: lib/action.php:1133
msgid "After"
msgstr "Próximo"
-#: lib/action.php:1119
+#: lib/action.php:1141
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 +4669,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 +4751,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 +5090,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 +5290,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 +5374,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 +5590,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 +5631,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 +5648,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 +5682,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 +5812,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 +6044,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 +6099,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..d95566fdf 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-21 22:36+0000\n"
+"PO-Revision-Date: 2010-01-21 22:38:23+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 (r61339); 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!"
@@ -130,12 +136,12 @@ msgstr "Обновлено от %1$s и его друзей на %2$s!"
#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
-#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
+#: actions/apigroupmembership.php:106 actions/apigroupshow.php:115
#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
-#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150
+#: actions/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 Ñимволов)"
@@ -381,7 +390,7 @@ msgstr "ÐÐ»Ð¸Ð°Ñ Ð½Ðµ может Ñовпадать Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼."
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
msgid "Group not found!"
msgstr "Группа не найдена!"
@@ -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:1189
+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, аватару, пароль, профиль"
@@ -4332,34 +4609,44 @@ msgstr ""
"лицензией [GNU Affero General Public License](http://www.fsf.org/licensing/"
"licenses/agpl-3.0.html)."
-#: lib/action.php:794
+#: lib/action.php:795
msgid "Site content license"
msgstr "Ð›Ð¸Ñ†ÐµÐ½Ð·Ð¸Ñ Ñодержимого Ñайта"
-#: lib/action.php:803
+#: lib/action.php:800
+#, php-format
+msgid "Content and data of %1$s are private and confidential."
+msgstr ""
+
+#: lib/action.php:805
+#, php-format
+msgid "Content and data copyright by %1$s. All rights reserved."
+msgstr ""
+
+#: lib/action.php:808
+msgid "Content and data copyright by contributors. All rights reserved."
+msgstr ""
+
+#: lib/action.php:820
msgid "All "
msgstr "All "
-#: lib/action.php:808
+#: lib/action.php:825
msgid "license."
msgstr "license."
-#: lib/action.php:1102
+#: lib/action.php:1124
msgid "Pagination"
msgstr "Разбиение на Ñтраницы"
-#: lib/action.php:1111
+#: lib/action.php:1133
msgid "After"
msgstr "Сюда"
-#: lib/action.php:1119
+#: lib/action.php:1141
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 +4679,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 +4765,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 +5102,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 +5697,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 +6053,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..fedcf6e7b 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-21 22:36+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!"
@@ -118,12 +123,12 @@ msgstr ""
#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
-#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
+#: actions/apigroupmembership.php:106 actions/apigroupshow.php:115
#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
-#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150
+#: actions/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 ""
@@ -360,7 +368,7 @@ msgstr ""
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
msgid "Group not found!"
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:1189
+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 ""
@@ -4042,34 +4299,44 @@ msgid ""
"org/licensing/licenses/agpl-3.0.html)."
msgstr ""
-#: lib/action.php:794
+#: lib/action.php:795
msgid "Site content license"
msgstr ""
-#: lib/action.php:803
-msgid "All "
+#: lib/action.php:800
+#, php-format
+msgid "Content and data of %1$s are private and confidential."
+msgstr ""
+
+#: lib/action.php:805
+#, php-format
+msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
#: lib/action.php:808
+msgid "Content and data copyright by contributors. All rights reserved."
+msgstr ""
+
+#: lib/action.php:820
+msgid "All "
+msgstr ""
+
+#: lib/action.php:825
msgid "license."
msgstr ""
-#: lib/action.php:1102
+#: lib/action.php:1124
msgid "Pagination"
msgstr ""
-#: lib/action.php:1111
+#: lib/action.php:1133
msgid "After"
msgstr ""
-#: lib/action.php:1119
+#: lib/action.php:1141
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 +4369,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 +4450,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 +4744,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 +5249,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 +5601,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..6046d5fe2 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-21 22:36+0000\n"
+"PO-Revision-Date: 2010-01-21 22:38:31+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 (r61339); 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!"
@@ -128,19 +133,19 @@ msgstr "Uppdateringar från %1$s och vänner på %2$s!"
#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
-#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
+#: actions/apigroupmembership.php:106 actions/apigroupshow.php:115
#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
-#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150
+#: actions/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
@@ -376,7 +381,7 @@ msgstr "Alias kan inte vara samma som smeknamn."
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
msgid "Group not found!"
msgstr "Grupp hittades inte!"
@@ -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:1189
+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,46 +4522,55 @@ 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)."
-#: lib/action.php:794
+#: lib/action.php:795
msgid "Site content license"
msgstr "Licens för webbplatsinnehåll"
-#: lib/action.php:803
+#: lib/action.php:800
+#, php-format
+msgid "Content and data of %1$s are private and confidential."
+msgstr ""
+
+#: lib/action.php:805
+#, php-format
+msgid "Content and data copyright by %1$s. All rights reserved."
+msgstr ""
+
+#: lib/action.php:808
+msgid "Content and data copyright by contributors. All rights reserved."
+msgstr ""
+
+#: lib/action.php:820
msgid "All "
msgstr "Alla "
-#: lib/action.php:808
+#: lib/action.php:825
msgid "license."
msgstr "licens."
-#: lib/action.php:1102
+#: lib/action.php:1124
msgid "Pagination"
msgstr "Numrering av sidor"
-#: lib/action.php:1111
+#: lib/action.php:1133
msgid "After"
msgstr "Senare"
-#: lib/action.php:1119
+#: lib/action.php:1141
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 +4596,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 +4678,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 +4700,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 +4976,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 +5174,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 +5236,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 +5393,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 +5439,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 +5456,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 +5474,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 +5490,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 +5540,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 +5560,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 +5576,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 +5588,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 +5620,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 +5661,7 @@ msgstr "Inte implementerad metod."
#: lib/publicgroupnav.php:78
msgid "Public"
-msgstr "Publik"
+msgstr "Publikt"
#: lib/publicgroupnav.php:82
msgid "User groups"
@@ -5353,7 +5685,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 +5785,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 +5830,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 +5852,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 +5907,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..4b313d88f 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-21 22:36+0000\n"
+"PO-Revision-Date: 2010-01-21 22:38:34+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 (r61339); Translate extension (2010-01-16)\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!"
@@ -120,12 +125,12 @@ msgstr ""
#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
-#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
+#: actions/apigroupmembership.php:106 actions/apigroupshow.php:115
#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
-#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150
+#: actions/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 à°…à°•à±à°·à°°à°¾à°²à± à°—à°°à°¿à°·à±à° à°‚)."
@@ -371,7 +377,7 @@ msgstr "మారà±à°ªà±‡à°°à± పేరà±à°¤à±‹ సమానంగా ఉం
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
msgid "Group not found!"
msgstr "à°—à±à°‚పౠదొరకలేదà±!"
@@ -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:1189
+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
@@ -3928,12 +4197,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
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%1$s (%2$s)"
@@ -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 "మీ ఈమెయిలà±, అవతారం, సంకేతపదం మరియౠపà±à°°à±Œà°«à±ˆà°³à±à°³à°¨à± మారà±à°šà±à°•à±‹à°‚à°¡à°¿"
@@ -4140,35 +4405,45 @@ msgstr ""
"html) à°•à°¿à°‚à°¦ లభà±à°¯à°®à°¯à±à°¯à±‡ [à°¸à±à°Ÿà±‡à°Ÿà°¸à±&zwnj;నెటà±](http://status.net/) మైకà±à°°à±‹à°¬à±à°²à°¾à°—ింగౠఉపకరణం సంచిక %s "
"పై నడà±à°¸à±à°¤à±à°‚ది."
-#: lib/action.php:794
+#: lib/action.php:795
#, fuzzy
msgid "Site content license"
msgstr "కొతà±à°¤ సందేశం"
-#: lib/action.php:803
+#: lib/action.php:800
+#, php-format
+msgid "Content and data of %1$s are private and confidential."
+msgstr ""
+
+#: lib/action.php:805
+#, php-format
+msgid "Content and data copyright by %1$s. All rights reserved."
+msgstr ""
+
+#: lib/action.php:808
+msgid "Content and data copyright by contributors. All rights reserved."
+msgstr ""
+
+#: lib/action.php:820
msgid "All "
msgstr "à°…à°¨à±à°¨à±€ "
-#: lib/action.php:808
+#: lib/action.php:825
msgid "license."
msgstr ""
-#: lib/action.php:1102
+#: lib/action.php:1124
msgid "Pagination"
msgstr "పేజీకరణ"
-#: lib/action.php:1111
+#: lib/action.php:1133
msgid "After"
msgstr "తరà±à°µà°¾à°¤"
-#: lib/action.php:1119
+#: lib/action.php:1141
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 +4478,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 +4565,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 +4726,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 +4735,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 +4871,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 +4889,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 +4965,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 +5389,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 +5756,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 +5811,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..bcec74af8 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-21 22:36+0000\n"
+"PO-Revision-Date: 2010-01-21 22:38:37+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 (r61339); Translate extension (2010-01-16)\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!"
@@ -122,12 +127,12 @@ msgstr ""
#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
-#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
+#: actions/apigroupmembership.php:106 actions/apigroupshow.php:115
#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
-#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150
+#: actions/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)."
@@ -377,7 +385,7 @@ msgstr ""
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
#, fuzzy
msgid "Group not found!"
msgstr "İstek bulunamadı!"
@@ -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:1189
+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 ""
@@ -4050,12 +4327,12 @@ msgstr ""
msgid "Problem saving notice."
msgstr "Durum mesajını kaydederken hata oluştu."
-#: classes/Notice.php:1052
+#: classes/Notice.php:1059
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Cevap eklenirken veritabanı hatası: %s"
-#: classes/Notice.php:1423
+#: classes/Notice.php:1441
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
@@ -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 ""
@@ -4268,37 +4540,47 @@ msgstr ""
"licenses/agpl-3.0.html) lisansı ile korunan [StatusNet](http://status.net/) "
"microbloglama yazılımının %s. versiyonunu kullanmaktadır."
-#: lib/action.php:794
+#: lib/action.php:795
#, fuzzy
msgid "Site content license"
msgstr "Yeni durum mesajı"
-#: lib/action.php:803
-msgid "All "
+#: lib/action.php:800
+#, php-format
+msgid "Content and data of %1$s are private and confidential."
+msgstr ""
+
+#: lib/action.php:805
+#, php-format
+msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
#: lib/action.php:808
+msgid "Content and data copyright by contributors. All rights reserved."
+msgstr ""
+
+#: lib/action.php:820
+msgid "All "
+msgstr ""
+
+#: lib/action.php:825
msgid "license."
msgstr ""
-#: lib/action.php:1102
+#: lib/action.php:1124
msgid "Pagination"
msgstr ""
-#: lib/action.php:1111
+#: lib/action.php:1133
#, fuzzy
msgid "After"
msgstr "« Sonra"
-#: lib/action.php:1119
+#: lib/action.php:1141
#, fuzzy
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 +4616,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 +4705,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 +5008,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 +5541,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 +5915,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..886b60cc3 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-21 22:36+0000\n"
+"PO-Revision-Date: 2010-01-21 22:38:40+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 (r61339); Translate extension (2010-01-16)\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!"
@@ -129,12 +134,12 @@ msgstr "ÐžÐ½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð²Ñ–Ð´ %1$s та друзів на %2$s!"
#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
-#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
+#: actions/apigroupmembership.php:106 actions/apigroupshow.php:115
#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
-#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150
+#: actions/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 знаків макÑимум)."
@@ -377,7 +385,7 @@ msgstr "Додаткове Ñ–Ð¼â€™Ñ Ð½Ðµ може бути таким ÑамиÐ
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
msgid "Group not found!"
msgstr "Групу не знайдено!"
@@ -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:1189
+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
@@ -4108,12 +4371,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"
@@ -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 "Змінити електронну адреÑу, аватару, пароль, профіль"
@@ -4314,34 +4573,44 @@ msgstr ""
"Ð´Ð»Ñ Ð¼Ñ–ÐºÑ€Ð¾Ð±Ð»Ð¾Ò‘Ñ–Ð², верÑÑ–Ñ %s, доÑтупному під [GNU Affero General Public "
"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:794
+#: lib/action.php:795
msgid "Site content license"
msgstr "Ð›Ñ–Ñ†ÐµÐ½Ð·Ñ–Ñ Ð·Ð¼Ñ–Ñту Ñайту"
-#: lib/action.php:803
+#: lib/action.php:800
+#, php-format
+msgid "Content and data of %1$s are private and confidential."
+msgstr ""
+
+#: lib/action.php:805
+#, php-format
+msgid "Content and data copyright by %1$s. All rights reserved."
+msgstr ""
+
+#: lib/action.php:808
+msgid "Content and data copyright by contributors. All rights reserved."
+msgstr ""
+
+#: lib/action.php:820
msgid "All "
msgstr "Ð’ÑÑ– "
-#: lib/action.php:808
+#: lib/action.php:825
msgid "license."
msgstr "ліцензіÑ."
-#: lib/action.php:1102
+#: lib/action.php:1124
msgid "Pagination"
msgstr "ÐÑƒÐ¼ÐµÑ€Ð°Ñ†Ñ–Ñ Ñторінок"
-#: lib/action.php:1111
+#: lib/action.php:1133
msgid "After"
msgstr "Вперед"
-#: lib/action.php:1119
+#: lib/action.php:1141
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 +4643,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 +4725,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 +5061,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 +5260,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 +5658,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 +6012,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..4b977cee4 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-21 22:36+0000\n"
+"PO-Revision-Date: 2010-01-21 22:38:43+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 (r61339); Translate extension (2010-01-16)\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!"
@@ -121,12 +126,12 @@ msgstr ""
#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
-#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
+#: actions/apigroupmembership.php:106 actions/apigroupshow.php:115
#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
-#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150
+#: actions/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ự)"
@@ -379,7 +387,7 @@ msgstr ""
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
#, fuzzy
msgid "Group not found!"
msgstr "Phương thức API không tìm thấy!"
@@ -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:1189
+#, 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 ""
@@ -4195,12 +4478,12 @@ msgstr ""
msgid "Problem saving notice."
msgstr "Có lỗi xảy ra khi lưu tin nhắn."
-#: classes/Notice.php:1052
+#: classes/Notice.php:1059
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Lá»—i cÆ¡ sở dữ liệu khi chèn trả lá»i: %s"
-#: classes/Notice.php:1423
+#: classes/Notice.php:1441
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%s (%s)"
@@ -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"
@@ -4418,38 +4696,47 @@ msgstr ""
"quyá»n [GNU Affero General Public License](http://www.fsf.org/licensing/"
"licenses/agpl-3.0.html)."
-#: lib/action.php:794
+#: lib/action.php:795
#, fuzzy
msgid "Site content license"
msgstr "Tìm theo nội dung của tin nhắn"
-#: lib/action.php:803
-msgid "All "
+#: lib/action.php:800
+#, php-format
+msgid "Content and data of %1$s are private and confidential."
+msgstr ""
+
+#: lib/action.php:805
+#, php-format
+msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
#: lib/action.php:808
+msgid "Content and data copyright by contributors. All rights reserved."
+msgstr ""
+
+#: lib/action.php:820
+msgid "All "
+msgstr ""
+
+#: lib/action.php:825
msgid "license."
msgstr ""
-#: lib/action.php:1102
+#: lib/action.php:1124
msgid "Pagination"
msgstr ""
-#: lib/action.php:1111
+#: lib/action.php:1133
#, fuzzy
msgid "After"
msgstr "Sau"
-#: lib/action.php:1119
+#: lib/action.php:1141
#, fuzzy
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 +4775,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 +4862,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 +5172,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 +5765,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 +6156,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..aec8ae047 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-21 22:36+0000\n"
+"PO-Revision-Date: 2010-01-21 22:38:46+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 (r61339); Translate extension (2010-01-16)\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!"
@@ -123,12 +128,12 @@ msgstr "æ¥è‡ª%2$s 上 %1$s 和好å‹çš„æ›´æ–°ï¼"
#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
-#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
+#: actions/apigroupmembership.php:106 actions/apigroupshow.php:115
#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
-#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150
+#: actions/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字符)。"
@@ -377,7 +385,7 @@ msgstr ""
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
#, fuzzy
msgid "Group not found!"
msgstr "API 方法未实现ï¼"
@@ -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:1189
+#, 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 ""
@@ -4119,12 +4405,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
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%1$s (%2$s)"
@@ -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 "修改资料"
@@ -4336,38 +4618,47 @@ msgstr ""
"General Public License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)"
"授æƒã€‚"
-#: lib/action.php:794
+#: lib/action.php:795
#, fuzzy
msgid "Site content license"
msgstr "StatusNet软件注册è¯"
-#: lib/action.php:803
+#: lib/action.php:800
+#, php-format
+msgid "Content and data of %1$s are private and confidential."
+msgstr ""
+
+#: lib/action.php:805
+#, php-format
+msgid "Content and data copyright by %1$s. All rights reserved."
+msgstr ""
+
+#: lib/action.php:808
+msgid "Content and data copyright by contributors. All rights reserved."
+msgstr ""
+
+#: lib/action.php:820
msgid "All "
msgstr "全部"
-#: lib/action.php:808
+#: lib/action.php:825
msgid "license."
msgstr "注册è¯"
-#: lib/action.php:1102
+#: lib/action.php:1124
msgid "Pagination"
msgstr "分页"
-#: lib/action.php:1111
+#: lib/action.php:1133
#, fuzzy
msgid "After"
msgstr "« 之åŽ"
-#: lib/action.php:1119
+#: lib/action.php:1141
#, fuzzy
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 +4699,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 +4786,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 +5089,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 +5633,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 +6022,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..cbcbf1248 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-21 22:36+0000\n"
+"PO-Revision-Date: 2010-01-21 22:38:49+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 (r61339); Translate extension (2010-01-16)\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!"
@@ -121,12 +126,12 @@ msgstr ""
#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
-#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
+#: actions/apigroupmembership.php:106 actions/apigroupshow.php:115
#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
-#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150
+#: actions/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個字元)"
@@ -372,7 +380,7 @@ msgstr ""
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
-#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
#, fuzzy
msgid "Group not found!"
msgstr "ç›®å‰ç„¡è«‹æ±‚"
@@ -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:1189
+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 ""
@@ -3973,12 +4249,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 ""
@@ -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 ""
@@ -4186,36 +4457,46 @@ msgid ""
"org/licensing/licenses/agpl-3.0.html)."
msgstr ""
-#: lib/action.php:794
+#: lib/action.php:795
#, fuzzy
msgid "Site content license"
msgstr "新訊æ¯"
-#: lib/action.php:803
-msgid "All "
+#: lib/action.php:800
+#, php-format
+msgid "Content and data of %1$s are private and confidential."
+msgstr ""
+
+#: lib/action.php:805
+#, php-format
+msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
#: lib/action.php:808
+msgid "Content and data copyright by contributors. All rights reserved."
+msgstr ""
+
+#: lib/action.php:820
+msgid "All "
+msgstr ""
+
+#: lib/action.php:825
msgid "license."
msgstr ""
-#: lib/action.php:1102
+#: lib/action.php:1124
msgid "Pagination"
msgstr ""
-#: lib/action.php:1111
+#: lib/action.php:1133
msgid "After"
msgstr ""
-#: lib/action.php:1119
+#: lib/action.php:1141
#, fuzzy
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 +4532,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 +4614,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 +4914,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 +5441,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 +5810,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/Imap/ImapPlugin.php b/plugins/Imap/ImapPlugin.php
index 89a775a16..d1e920b00 100644
--- a/plugins/Imap/ImapPlugin.php
+++ b/plugins/Imap/ImapPlugin.php
@@ -86,7 +86,7 @@ class ImapPlugin extends Plugin
}
}
- function onStartIoManagerClasses(&$classes)
+ function onStartQueueDaemonIoManagers(&$classes)
{
$classes[] = new ImapManager($this);
}
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..5c913836d 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);
@@ -416,7 +414,15 @@ class MobileProfilePlugin extends WAP20Plugin
return $proto.'://'.$serverpart.'/'.$pathpart.$relative;
}
-}
-
-?>
+ function onPluginVersion(&$versions)
+ {
+ $versions[] = array('name' => 'MobileProfile',
+ 'version' => STATUSNET_VERSION,
+ 'author' => 'Sarven Capadisli',
+ 'homepage' => 'http://status.net/wiki/Plugin:MobileProfile',
+ 'rawdescription' =>
+ _m('XHTML MobileProfile output for supporting user agents.'));
+ return true;
+ }
+}
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/PoweredByStatusNet/PoweredByStatusNetPlugin.php b/plugins/PoweredByStatusNet/PoweredByStatusNetPlugin.php
index c59fcca89..14d1608d3 100644
--- a/plugins/PoweredByStatusNet/PoweredByStatusNetPlugin.php
+++ b/plugins/PoweredByStatusNet/PoweredByStatusNetPlugin.php
@@ -46,8 +46,9 @@ class PoweredByStatusNetPlugin extends Plugin
function onEndAddressData($action)
{
$action->elementStart('span', 'poweredby');
- $action->text(_('powered by'));
- $action->element('a', array('href' => 'http://status.net/'), 'StatusNet');
+ $action->raw(sprintf(_m('powered by %s'),
+ sprintf('<a href="http://status.net/">%s</a>',
+ _m('StatusNet'))));
$action->elementEnd('span');
return true;
diff --git a/plugins/PoweredByStatusNet/locale/PoweredByStatusNet.po b/plugins/PoweredByStatusNet/locale/PoweredByStatusNet.po
new file mode 100644
index 000000000..bd39124ef
--- /dev/null
+++ b/plugins/PoweredByStatusNet/locale/PoweredByStatusNet.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-01-22 15:03-0800\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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: PoweredByStatusNetPlugin.php:49
+#, php-format
+msgid "powered by %s"
+msgstr ""
+
+#: PoweredByStatusNetPlugin.php:51
+msgid "StatusNet"
+msgstr ""
+
+#: PoweredByStatusNetPlugin.php:64
+msgid ""
+"Outputs powered by <a href=\"http://status.net/\">StatusNet</a> after site "
+"name."
+msgstr ""
diff --git a/plugins/PubSubHubBub/PubSubHubBubPlugin.php b/plugins/PubSubHubBub/PubSubHubBubPlugin.php
index 8286cd548..ce6086df9 100644
--- a/plugins/PubSubHubBub/PubSubHubBubPlugin.php
+++ b/plugins/PubSubHubBub/PubSubHubBubPlugin.php
@@ -211,13 +211,20 @@ class PubSubHubBubPlugin extends Plugin
'format' => 'atom'));
}
}
-
- foreach (array_unique($feeds) as $feed) {
- if (!$publisher->publish_update($feed)) {
- common_log_line(LOG_WARNING,
- $feed.' was not published to hub at '.
- $this->hub.':'.$publisher->last_response());
- }
+ $feeds = array_unique($feeds);
+
+ ob_start();
+ $ok = $publisher->publish_update($feeds);
+ $push_last_response = ob_get_clean();
+
+ if (!$ok) {
+ common_log(LOG_WARNING,
+ 'Failure publishing ' . count($feeds) . ' feeds to hub at '.
+ $this->hub.': '.$push_last_response);
+ } else {
+ common_log(LOG_INFO,
+ 'Published ' . count($feeds) . ' feeds to hub at '.
+ $this->hub.': '.$push_last_response);
}
return true;
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/README b/theme/README
index 266a89fdf..e154a723c 100644
--- a/theme/README
+++ b/theme/README
@@ -2,37 +2,46 @@
*
* @package StatusNet
* @author Sarven Capadisli <csarven@status.net>
- * @copyright 2009 StatusNet, Inc.
+ * @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/
*/
-Location of key paths and files under theme/:
+== Location of key paths and files ==
+<pre><nowiki>
+base/css/
+base/css/display.css #layout, typography rules
+base/images/ #common icons, illustrations
+base/images/icons/icons-01.png #main icons file (combined into a single file)
-./base/css/
-./base/css/display.css
-./base/images/
+default/css/
+default/css/display.css #imports the base stylesheet for layout and adds background images and colour rules
+default/logo.png #default site logo for this theme
+default/mobilelogo.png #default logo for the mobile output
+default/default-avatar-mini.png #24x24 default avatar for minilists
+default/default-avatar-stream.png #48x48 default avatar for notice timelines
+default/default-avatar-profile.png #96x96 default avatar for the profile page
+</nowiki></pre>
-./default/css/
-./default/css/display.css
-./default/images/
-./base/display.css contains layout, typography rules:
-Only alter this file if you want to change the layout of the site. Please note that, any updates to this in future statusnet releases may not be compatible with your version.
+== How to create your own theme ==
-./default/css/display.css contains only the background images and colour rules:
-This file is a good basis for creating your own theme.
-Let's create a theme:
+You probably want to do one of the following:
-1. To start off, copy over the default theme:
-cp -r default mytheme
-2. Edit your mytheme stylesheet:
-nano mytheme/css/display.css
+* If you just want to change the text, link, background, content, sidebar colours, background image:
+** Do this from the Admin->Design settings (recommended!). You could also create a directory and a file structure like the default theme, search and replace with your own values. This is more work, but, you can do this if you plan to make additional *minimal* changes.
-a) Search and replace your colours and background images, or
-b) Create your own layout either importing a separate stylesheet (e.g., change to @import url(base.css);) or simply place it before the rest of the rules.
-4. Set /config.php to load 'mytheme':
-$config['site']['theme'] = 'mytheme';
+* If you want to change the background images and colours:
+# Create a directory and a file structure like the default theme.
+# Have your stylesheet import base/css/display.css and add your own styles below. It is okay to add *minimal* changes here.
+
+
+* If you want to create a different layout, typography, background images and colours:
+** Create your own theme directory (base or default) with stylesheets and images like.
+
+
+Finally, enable your theme by selecting it from the Admin->Design interface. You can set site's logo from here as well.
+
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);
}