diff options
| author | Evan Prodromou <evan@status.net> | 2009-11-17 08:04:14 -0500 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2009-11-17 08:04:14 -0500 |
| commit | bac2d80c919a78d5cafd57f712872a90cda04847 (patch) | |
| tree | d2df10a582edc0bf9e043f1c764953a290927678 | |
| parent | 9a1a83e8ebe5ad39838e6363f1537a1a5232b9cb (diff) | |
| parent | 6a1afda259c5223449f679a64f932e36df5ebe39 (diff) | |
Merge branch '0.9.x' into adminpanel
Conflicts:
classes/User.php
166 files changed, 9711 insertions, 4995 deletions
diff --git a/EVENTS.txt b/EVENTS.txt index f75dcebca..c788a9215 100644 --- a/EVENTS.txt +++ b/EVENTS.txt @@ -528,13 +528,27 @@ EndCheckPassword: After checking a username/password pair - $authenticatedUser: User object if credentials match a user, else null. StartChangePassword: Before changing a password -- $nickname: user's nickname +- $user: user - $oldpassword: the user's old password - $newpassword: the desired new password EndChangePassword: After changing a password -- $nickname: user's nickname +- $user: user UserDeleteRelated: Specify additional tables to delete entries from when deleting users - $user: User object - &$related: array of DB_DataObject class names to delete entries on matching user_id. + +GetUrlShorteners: Specify URL shorteners that are available for use +- &$shorteners: append your shortener to this array like so: $shorteners[shortenerName]=array('display'=>display, 'freeService'=>boolean) + +StartShortenUrl: About to shorten a URL +- $url: url to be shortened +- $shortenerName: name of the requested shortener +- &$shortenedUrl: short version of the url + +EndShortenUrl: After a URL has been shortened +- $url: url to be shortened +- $shortenerName: name of the requested shortener +- $shortenedUrl: short version of the url + diff --git a/actions/apigroupismember.php b/actions/apigroupismember.php index a822d18dd..08348e97b 100644 --- a/actions/apigroupismember.php +++ b/actions/apigroupismember.php @@ -92,7 +92,7 @@ class ApiGroupIsMemberAction extends ApiBareAuthAction } if (empty($this->group)) { - $this->clientError('Group not found!', 404, $this->format); + $this->clientError(_('Group not found!'), 404, $this->format); return false; } diff --git a/actions/apigroupjoin.php b/actions/apigroupjoin.php index ffda3986f..b531d9501 100644 --- a/actions/apigroupjoin.php +++ b/actions/apigroupjoin.php @@ -101,7 +101,7 @@ class ApiGroupJoinAction extends ApiAuthAction } if (empty($this->group)) { - $this->clientError('Group not found!', 404, $this->format); + $this->clientError(_('Group not found!'), 404, $this->format); return false; } diff --git a/actions/apigroupleave.php b/actions/apigroupleave.php index 8665ea1aa..514a3a557 100644 --- a/actions/apigroupleave.php +++ b/actions/apigroupleave.php @@ -101,7 +101,7 @@ class ApiGroupLeaveAction extends ApiAuthAction } if (empty($this->group)) { - $this->clientError('Group not found!', 404, $this->format); + $this->clientError(_('Group not found!'), 404, $this->format); return false; } diff --git a/actions/apigroupmembership.php b/actions/apigroupmembership.php index d221a6418..dd2843161 100644 --- a/actions/apigroupmembership.php +++ b/actions/apigroupmembership.php @@ -87,6 +87,11 @@ class ApiGroupMembershipAction extends ApiPrivateAuthAction { parent::handle($args); + if (empty($this->group)) { + $this->clientError(_('Group not found!'), 404, $this->format); + return false; + } + // XXX: RSS and Atom switch($this->format) { diff --git a/actions/apigroupshow.php b/actions/apigroupshow.php index b745ff92f..f9b960747 100644 --- a/actions/apigroupshow.php +++ b/actions/apigroupshow.php @@ -87,7 +87,7 @@ class ApiGroupShowAction extends ApiPrivateAuthAction if (empty($this->group)) { $this->clientError( - 'Group not found!', + _('Group not found!'), 404, $this->format ); diff --git a/actions/apitimelinegroup.php b/actions/apitimelinegroup.php index f25f6ba51..de13e7eb9 100644 --- a/actions/apitimelinegroup.php +++ b/actions/apitimelinegroup.php @@ -69,7 +69,6 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction parent::prepare($args); $this->group = $this->getTargetGroup($this->arg('id')); - $this->notices = $this->getNotices(); return true; } @@ -87,6 +86,13 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction function handle($args) { parent::handle($args); + + if (empty($this->group)) { + $this->clientError(_('Group not found!'), 404, $this->format); + return false; + } + + $this->notices = $this->getNotices(); $this->showTimeline(); } diff --git a/actions/block.php b/actions/block.php index b125d2d8b..71a34e087 100644 --- a/actions/block.php +++ b/actions/block.php @@ -42,9 +42,11 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3 * @link http://status.net/ */ -class BlockAction extends Action + +class BlockAction extends ProfileFormAction { var $profile = null; + /** * Take arguments for running * @@ -52,28 +54,22 @@ class BlockAction extends Action * * @return boolean success flag */ + function prepare($args) { - parent::prepare($args); - if (!common_logged_in()) { - $this->clientError(_('Not logged in.')); - return false; - } - $token = $this->trimmed('token'); - if (!$token || $token != common_session_token()) { - $this->clientError(_('There was a problem with your session token. Try again, please.')); - return; - } - $id = $this->trimmed('blockto'); - if (!$id) { - $this->clientError(_('No profile specified.')); + if (!parent::prepare($args)) { return false; } - $this->profile = Profile::staticGet('id', $id); - if (!$this->profile) { - $this->clientError(_('No profile with that ID.')); + + $cur = common_current_user(); + + assert(!empty($cur)); // checked by parent + + if ($cur->hasBlocked($this->profile)) { + $this->clientError(_("You already blocked that user.")); return false; } + return true; } @@ -86,18 +82,16 @@ class BlockAction extends Action * * @return void */ + function handle($args) { - parent::handle($args); if ($_SERVER['REQUEST_METHOD'] == 'POST') { if ($this->arg('no')) { - $cur = common_current_user(); - $other = Profile::staticGet('id', $this->arg('blockto')); - common_redirect(common_local_url('showstream', array('nickname' => $other->nickname)), - 303); + $this->returnToArgs(); } elseif ($this->arg('yes')) { - $this->blockProfile(); - } elseif ($this->arg('blockto')) { + $this->handlePost(); + $this->returnToArgs(); + } else { $this->showPage(); } } @@ -138,7 +132,7 @@ class BlockAction extends Action 'unable to subscribe to you in the future, and '. 'you will not be notified of any @-replies from them.')); $this->element('input', array('id' => 'blockto-' . $id, - 'name' => 'blockto', + 'name' => 'profileid', 'type' => 'hidden', 'value' => $id)); foreach ($this->args as $k => $v) { @@ -157,36 +151,17 @@ class BlockAction extends Action * * @return void */ - function blockProfile() + + function handlePost() { $cur = common_current_user(); - if ($cur->hasBlocked($this->profile)) { - $this->clientError(_('You have already blocked this user.')); - return; - } $result = $cur->block($this->profile); + if (!$result) { $this->serverError(_('Failed to save block information.')); return; } - - // Now, gotta figure where we go back to - foreach ($this->args as $k => $v) { - if ($k == 'returnto-action') { - $action = $v; - } elseif (substr($k, 0, 9) == 'returnto-') { - $args[substr($k, 9)] = $v; - } - } - - if ($action) { - common_redirect(common_local_url($action, $args), 303); - } else { - common_redirect(common_local_url('subscribers', - array('nickname' => $cur->nickname)), - 303); - } } } diff --git a/actions/deleteuser.php b/actions/deleteuser.php new file mode 100644 index 000000000..32b703aa7 --- /dev/null +++ b/actions/deleteuser.php @@ -0,0 +1,164 @@ +<?php +/** + * StatusNet, the distributed open-source microblogging tool + * + * Action class to delete a user + * + * 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 Action + * @package StatusNet + * @author Evan Prodromou <evan@status.net> + * @copyright 2009 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET') && !defined('LACONICA')) { + exit(1); +} + +/** + * Delete a user + * + * @category Action + * @package StatusNet + * @author Evan Prodromou <evan@status.net> + * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3 + * @link http://status.net/ + */ + +class DeleteuserAction extends ProfileFormAction +{ + var $user = null; + + /** + * Take arguments for running + * + * @param array $args $_REQUEST args + * + * @return boolean success flag + */ + + function prepare($args) + { + if (!parent::prepare($args)) { + return false; + } + + $cur = common_current_user(); + + assert(!empty($cur)); // checked by parent + + if (!$cur->hasRight(Right::DELETEUSER)) { + $this->clientError(_("You cannot delete users.")); + return false; + } + + $this->user = User::staticGet('id', $this->profile->id); + + if (empty($this->user)) { + $this->clientError(_("You can only delete local users.")); + return false; + } + + return true; + } + + /** + * Handle request + * + * Shows a page with list of favorite notices + * + * @param array $args $_REQUEST args; handled in prepare() + * + * @return void + */ + + function handle($args) + { + if ($_SERVER['REQUEST_METHOD'] == 'POST') { + if ($this->arg('no')) { + $this->returnToArgs(); + } elseif ($this->arg('yes')) { + $this->handlePost(); + $this->returnToArgs(); + } else { + $this->showPage(); + } + } + } + + function showContent() { + $this->areYouSureForm(); + } + + function title() { + return _('Delete user'); + } + + function showNoticeForm() { + // nop + } + + /** + * Confirm with user. + * + * Shows a confirmation form. + * + * @return void + */ + function areYouSureForm() + { + $id = $this->profile->id; + $this->elementStart('form', array('id' => 'deleteuser-' . $id, + 'method' => 'post', + 'class' => 'form_settings form_entity_block', + 'action' => common_local_url('deleteuser'))); + $this->elementStart('fieldset'); + $this->hidden('token', common_session_token()); + $this->element('legend', _('Delete user')); + $this->element('p', null, + _('Are you sure you want to delete this user? '. + 'This will clear all data about the user from the '. + 'database, without a backup.')); + $this->element('input', array('id' => 'deleteuserto-' . $id, + 'name' => 'profileid', + 'type' => 'hidden', + 'value' => $id)); + foreach ($this->args as $k => $v) { + if (substr($k, 0, 9) == 'returnto-') { + $this->hidden($k, $v); + } + } + $this->submit('form_action-no', _('No'), 'submit form_action-primary', 'no', _("Do not block this user")); + $this->submit('form_action-yes', _('Yes'), 'submit form_action-secondary', 'yes', _('Delete this user')); + $this->elementEnd('fieldset'); + $this->elementEnd('form'); + } + + /** + * Actually delete a user. + * + * @return void + */ + + function handlePost() + { + $this->user->delete(); + } +} + diff --git a/actions/noticesearch.php b/actions/noticesearch.php index 1e5a69180..76c877ff2 100644 --- a/actions/noticesearch.php +++ b/actions/noticesearch.php @@ -121,7 +121,7 @@ class NoticesearchAction extends SearchAction $message = sprintf(_('Be the first to [post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!'), urlencode($q)); } else { - $message = sprintf(_('Why not [register an account](%%%%action.register%%%%) and be the first to [post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!'), urlencode($q)); + $message = sprintf(_('Why not [register an account](%%%%action.register%%%%) and be the first to [post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!'), urlencode($q)); } $this->elementStart('div', 'guide'); diff --git a/actions/othersettings.php b/actions/othersettings.php index d32a2d651..0de7cd908 100644 --- a/actions/othersettings.php +++ b/actions/othersettings.php @@ -96,28 +96,28 @@ class OthersettingsAction extends AccountSettingsAction common_local_url('othersettings'))); $this->elementStart('fieldset'); $this->hidden('token', common_session_token()); + $this->elementStart('ul', 'form_data'); - $services=array(); - global $_shorteners; - if($_shorteners){ - foreach($_shorteners as $name=>$value) - { - $services[$name]=$name; - if(!empty($value['info']['freeService'])){ - // I18N - $services[$name].=' (free service)'; - } + $shorteners = array(); + Event::handle('GetUrlShorteners', array(&$shorteners)); + $services = array(); + foreach($shorteners as $name=>$value) + { + $services[$name]=$name; + if($value['freeService']){ + $services[$name].=_(' (free service)'); } } - asort($services); - $services['']='None'; - - $this->elementStart('ul', 'form_data'); - $this->elementStart('li'); - $this->dropdown('urlshorteningservice', _('Shorten URLs with'), - $services, _('Automatic shortening service to use.'), - false, $user->urlshorteningservice); - $this->elementEnd('li'); + if($services) + { + asort($services); + + $this->elementStart('li'); + $this->dropdown('urlshorteningservice', _('Shorten URLs with'), + $services, _('Automatic shortening service to use.'), + false, $user->urlshorteningservice); + $this->elementEnd('li'); + } $this->elementStart('li'); $this->checkbox('viewdesigns', _('View profile designs'), $user->viewdesigns, _('Show or hide profile designs.')); diff --git a/actions/passwordsettings.php b/actions/passwordsettings.php index 9e79501e2..11d7bf785 100644 --- a/actions/passwordsettings.php +++ b/actions/passwordsettings.php @@ -170,7 +170,7 @@ class PasswordsettingsAction extends AccountSettingsAction } $success = false; - if(! Event::handle('StartChangePassword', array($user->nickname, $oldpassword, $newpassword))){ + if(! Event::handle('StartChangePassword', array($user, $oldpassword, $newpassword))){ //no handler changed the password, so change the password internally $original = clone($user); @@ -186,7 +186,7 @@ class PasswordsettingsAction extends AccountSettingsAction $this->serverError(_('Can\'t save new password.')); return; } - Event::handle('EndChangePassword', array($nickname)); + Event::handle('EndChangePassword', array($user)); } $this->showForm(_('Password saved.'), true); diff --git a/actions/sandbox.php b/actions/sandbox.php new file mode 100644 index 000000000..5b034ff07 --- /dev/null +++ b/actions/sandbox.php @@ -0,0 +1,89 @@ +<?php +/** + * StatusNet, the distributed open-source microblogging tool + * + * Action class to sandbox an abusive user + * + * 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 Action + * @package StatusNet + * @author Evan Prodromou <evan@status.net> + * @copyright 2009 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET')) { + exit(1); +} + +/** + * Sandbox a user. + * + * @category Action + * @package StatusNet + * @author Evan Prodromou <evan@status.net> + * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3 + * @link http://status.net/ + */ + +class SandboxAction extends ProfileFormAction +{ + /** + * Check parameters + * + * @param array $args action arguments (URL, GET, POST) + * + * @return boolean success flag + */ + + function prepare($args) + { + if (!parent::prepare($args)) { + return false; + } + + $cur = common_current_user(); + + assert(!empty($cur)); // checked by parent + + if (!$cur->hasRight(Right::SANDBOXUSER)) { + $this->clientError(_("You cannot sandbox users on this site.")); + return false; + } + + assert(!empty($this->profile)); // checked by parent + + if ($this->profile->isSandboxed()) { + $this->clientError(_("User is already sandboxed.")); + return false; + } + + return true; + } + + /** + * Sandbox a user. + * + * @return void + */ + + function handlePost() + { + $this->profile->sandbox(); + } +} diff --git a/actions/silence.php b/actions/silence.php new file mode 100644 index 000000000..206e5ba87 --- /dev/null +++ b/actions/silence.php @@ -0,0 +1,89 @@ +<?php +/** + * StatusNet, the distributed open-source microblogging tool + * + * Action class to silence an abusive user + * + * 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 Action + * @package StatusNet + * @author Evan Prodromou <evan@status.net> + * @copyright 2009 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET')) { + exit(1); +} + +/** + * Silence a user. + * + * @category Action + * @package StatusNet + * @author Evan Prodromou <evan@status.net> + * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3 + * @link http://status.net/ + */ + +class SilenceAction extends ProfileFormAction +{ + /** + * Check parameters + * + * @param array $args action arguments (URL, GET, POST) + * + * @return boolean success flag + */ + + function prepare($args) + { + if (!parent::prepare($args)) { + return false; + } + + $cur = common_current_user(); + + assert(!empty($cur)); // checked by parent + + if (!$cur->hasRight(Right::SILENCEUSER)) { + $this->clientError(_("You cannot silence users on this site.")); + return false; + } + + assert(!empty($this->profile)); // checked by parent + + if ($this->profile->isSilenced()) { + $this->clientError(_("User is already silenced.")); + return false; + } + + return true; + } + + /** + * Silence a user. + * + * @return void + */ + + function handlePost() + { + $this->profile->silence(); + } +} diff --git a/actions/unblock.php b/actions/unblock.php index dc28d5d54..c60458cd3 100644 --- a/actions/unblock.php +++ b/actions/unblock.php @@ -42,57 +42,25 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3 * @link http://status.net/ */ -class UnblockAction extends Action -{ - var $profile = null; - /** - * Take arguments for running - * - * @param array $args $_REQUEST args - * - * @return boolean success flag - */ +class UnblockAction extends ProfileFormAction +{ function prepare($args) { - parent::prepare($args); - if (!common_logged_in()) { - $this->clientError(_('Not logged in.')); - return false; - } - $token = $this->trimmed('token'); - if (!$token || $token != common_session_token()) { - $this->clientError(_('There was a problem with your session token. Try again, please.')); - return; - } - $id = $this->trimmed('unblockto'); - if (!$id) { - $this->clientError(_('No profile specified.')); + if (!parent::prepare($args)) { return false; } - $this->profile = Profile::staticGet('id', $id); - if (!$this->profile) { - $this->clientError(_('No profile with that ID.')); + + $cur = common_current_user(); + + assert(!empty($cur)); // checked by parent + + if (!$cur->hasBlocked($this->profile)) { + $this->clientError(_("You haven't blocked that user.")); return false; } - return true; - } - /** - * Handle request - * - * Shows a page with list of favorite notices - * - * @param array $args $_REQUEST args; handled in prepare() - * - * @return void - */ - function handle($args) - { - parent::handle($args); - if ($_SERVER['REQUEST_METHOD'] == 'POST') { - $this->unblockProfile(); - } + return true; } /** @@ -100,7 +68,8 @@ class UnblockAction extends Action * * @return void */ - function unblockProfile() + + function handlePost() { $cur = common_current_user(); $result = $cur->unblock($this->profile); @@ -108,20 +77,5 @@ class UnblockAction extends Action $this->serverError(_('Error removing the block.')); return; } - foreach ($this->args as $k => $v) { - if ($k == 'returnto-action') { - $action = $v; - } else if (substr($k, 0, 9) == 'returnto-') { - $args[substr($k, 9)] = $v; - } - } - if ($action) { - common_redirect(common_local_url($action, $args), 303); - } else { - common_redirect(common_local_url('subscribers', - array('nickname' => $cur->nickname)), - 303); - } } } - diff --git a/actions/unsandbox.php b/actions/unsandbox.php new file mode 100644 index 000000000..22f4d8e76 --- /dev/null +++ b/actions/unsandbox.php @@ -0,0 +1,89 @@ +<?php +/** + * StatusNet, the distributed open-source microblogging tool + * + * Action class to unsandbox a user + * + * 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 Action + * @package StatusNet + * @author Evan Prodromou <evan@status.net> + * @copyright 2009 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET')) { + exit(1); +} + +/** + * Unsandbox a user. + * + * @category Action + * @package StatusNet + * @author Evan Prodromou <evan@status.net> + * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3 + * @link http://status.net/ + */ + +class UnsandboxAction extends ProfileFormAction +{ + /** + * Check parameters + * + * @param array $args action arguments (URL, GET, POST) + * + * @return boolean success flag + */ + + function prepare($args) + { + if (!parent::prepare($args)) { + return false; + } + + $cur = common_current_user(); + + assert(!empty($cur)); // checked by parent + + if (!$cur->hasRight(Right::SANDBOXUSER)) { + $this->clientError(_("You cannot sandbox users on this site.")); + return false; + } + + assert(!empty($this->profile)); // checked by parent + + if (!$this->profile->isSandboxed()) { + $this->clientError(_("User is not sandboxed.")); + return false; + } + + return true; + } + + /** + * Unsandbox a user. + * + * @return void + */ + + function handlePost() + { + $this->profile->unsandbox(); + } +} diff --git a/actions/unsilence.php b/actions/unsilence.php new file mode 100644 index 000000000..9ff1b828b --- /dev/null +++ b/actions/unsilence.php @@ -0,0 +1,89 @@ +<?php +/** + * StatusNet, the distributed open-source microblogging tool + * + * Action class to unsilence a user + * + * 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 Action + * @package StatusNet + * @author Evan Prodromou <evan@status.net> + * @copyright 2009 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET')) { + exit(1); +} + +/** + * Silence a user. + * + * @category Action + * @package StatusNet + * @author Evan Prodromou <evan@status.net> + * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3 + * @link http://status.net/ + */ + +class UnsilenceAction extends ProfileFormAction +{ + /** + * Check parameters + * + * @param array $args action arguments (URL, GET, POST) + * + * @return boolean success flag + */ + + function prepare($args) + { + if (!parent::prepare($args)) { + return false; + } + + $cur = common_current_user(); + + assert(!empty($cur)); // checked by parent + + if (!$cur->hasRight(Right::SILENCEUSER)) { + $this->clientError(_("You cannot silence users on this site.")); + return false; + } + + assert(!empty($this->profile)); // checked by parent + + if (!$this->profile->isSilenced()) { + $this->clientError(_("User is not silenced.")); + return false; + } + + return true; + } + + /** + * Silence a user. + * + * @return void + */ + + function handlePost() + { + $this->profile->unsilence(); + } +} diff --git a/actions/userbyid.php b/actions/userbyid.php index 802bcb081..86a61f20b 100644 --- a/actions/userbyid.php +++ b/actions/userbyid.php @@ -74,8 +74,11 @@ class UserbyidAction extends Action $this->clientError(_('No such user.')); } - // support redirecting to FOAF rdf/xml if the agent prefers it - $page_prefs = 'application/rdf+xml,text/html,application/xhtml+xml,application/xml;q=0.3,text/xml;q=0.2'; + // Support redirecting to FOAF rdf/xml if the agent prefers it... + // Internet Explorer doesn't specify "text/html" and does list "*/*" + // at least through version 8. We need to list text/html up front to + // ensure that only user-agents who specifically ask for RDF get it. + $page_prefs = 'text/html,application/xhtml+xml,application/rdf+xml,application/xml;q=0.3,text/xml;q=0.2'; $httpaccept = isset($_SERVER['HTTP_ACCEPT']) ? $_SERVER['HTTP_ACCEPT'] : null; $type = common_negotiate_type(common_accept_to_prefs($httpaccept), diff --git a/actions/xrds.php b/actions/xrds.php index 8f09557d1..534182e3e 100644 --- a/actions/xrds.php +++ b/actions/xrds.php @@ -97,27 +97,23 @@ class XrdsAction extends Action $xrdsOutputter->element('Type', null, 'xri://$xrds*simple'); $xrdsOutputter->showXrdsService(OAUTH_ENDPOINT_REQUEST, common_local_url('requesttoken'), - array(OAUTH_AUTH_HEADER, OAUTH_POST_BODY, OAUTH_HMAC_SHA1)); - $xrdsOutputter->showXrdsService( OAUTH_ENDPOINT_AUTHORIZE, - common_local_url('userauthorization'), array(OAUTH_AUTH_HEADER, OAUTH_POST_BODY, OAUTH_HMAC_SHA1), null, - $this->user->getIdentifierURI()); + $this->user->uri); + $xrdsOutputter->showXrdsService( OAUTH_ENDPOINT_AUTHORIZE, + common_local_url('userauthorization'), + array(OAUTH_AUTH_HEADER, OAUTH_POST_BODY, OAUTH_HMAC_SHA1)); $xrdsOutputter->showXrdsService(OAUTH_ENDPOINT_ACCESS, common_local_url('accesstoken'), - array(OAUTH_AUTH_HEADER, OAUTH_POST_BODY, OAUTH_HMAC_SHA1), - null, - $this->user->getIdentifierURI()); + array(OAUTH_AUTH_HEADER, OAUTH_POST_BODY, OAUTH_HMAC_SHA1)); $xrdsOutputter->showXrdsService(OAUTH_ENDPOINT_RESOURCE, null, - array(OAUTH_AUTH_HEADER, OAUTH_POST_BODY, OAUTH_HMAC_SHA1), - null, - $this->user->getIdentifierURI()); + array(OAUTH_AUTH_HEADER, OAUTH_POST_BODY, OAUTH_HMAC_SHA1)); $xrdsOutputter->elementEnd('XRD'); //omb $xrdsOutputter->elementStart('XRD', array('xmlns' => 'xri://$xrd*($v*2.0)', - 'xml:id' => 'oauth', + 'xml:id' => 'omb', 'xmlns:simple' => 'http://xrds-simple.net/core/1.0', 'version' => '2.0')); $xrdsOutputter->element('Type', null, 'xri://$xrds*simple'); @@ -127,10 +123,10 @@ class XrdsAction extends Action common_local_url('updateprofile')); $xrdsOutputter->elementEnd('XRD'); + Event::handle('EndUserXRDS', array($this,&$xrdsOutputter)); + //misc $xrdsOutputter->elementStart('XRD', array('xmlns' => 'xri://$xrd*($v*2.0)', - 'xml:id' => 'oauth', - 'xmlns:simple' => 'http://xrds-simple.net/core/1.0', 'version' => '2.0')); $xrdsOutputter->showXrdsService(OAUTH_DISCOVERY, '#oauth'); @@ -138,8 +134,6 @@ class XrdsAction extends Action '#omb'); $xrdsOutputter->elementEnd('XRD'); - Event::handle('EndUserXRDS', array($this,&$xrdsOutputter)); - $xrdsOutputter->endXRDS(); } diff --git a/classes/Message.php b/classes/Message.php index 979e6e87c..718a9d922 100644 --- a/classes/Message.php +++ b/classes/Message.php @@ -39,6 +39,12 @@ class Message extends Memcached_DataObject static function saveNew($from, $to, $content, $source) { + $sender = Profile::staticGet('id', $from); + + if (!$sender->hasRight(Right::NEWMESSAGE)) { + throw new ClientException(_('You are banned from sending direct messages.')); + } + $msg = new Message(); $msg->from_profile = $from; diff --git a/classes/Notice.php b/classes/Notice.php index 291e6202b..1db431f2a 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -195,22 +195,19 @@ class Notice extends Memcached_DataObject ' take a breather and post again in a few minutes.')); } - $banned = common_config('profile', 'banned'); - - if ( in_array($profile_id, $banned) || in_array($profile->nickname, $banned)) { - common_log(LOG_WARNING, "Attempted post from banned user: $profile->nickname (user id = $profile_id)."); + if (!$profile->hasRight(Right::NEWNOTICE)) { + common_log(LOG_WARNING, "Attempted post from user disallowed to post: " . $profile->nickname); throw new ClientException(_('You are banned from posting notices on this site.')); } $notice = new Notice(); $notice->profile_id = $profile_id; - $blacklist = common_config('public', 'blacklist'); $autosource = common_config('public', 'autosource'); - # Blacklisted are non-false, but not 1, either + # Sandboxed are non-false, but not 1, either - if (($blacklist && in_array($profile_id, $blacklist)) || + if (!$user->hasRight(Right::PUBLICNOTICE) || ($source && $autosource && in_array($source, $autosource))) { $notice->is_local = Notice::LOCAL_NONPUBLIC; } else { diff --git a/classes/Plugin_DataObject.php b/classes/Plugin_DataObject.php new file mode 100644 index 000000000..d5cecf0f7 --- /dev/null +++ b/classes/Plugin_DataObject.php @@ -0,0 +1,195 @@ +<?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.'/classes/Memcached_DataObject.php'; + +abstract class Plugin_DataObject extends Memcached_DataObject +{ + function table() { + static $table = null; + if($table == null) { + $table = array(); + $DB = $this->getDatabaseConnection(); + $dbtype = $DB->phptype; + $tableDef = $this->tableDef(); + foreach($tableDef->columns as $columnDef){ + switch(strtoupper($columnDef->type)) { + /*shamelessly copied from DB_DataObject_Generator*/ + case 'INT': + case 'INT2': // postgres + case 'INT4': // postgres + case 'INT8': // postgres + case 'SERIAL4': // postgres + case 'SERIAL8': // postgres + case 'INTEGER': + case 'TINYINT': + case 'SMALLINT': + case 'MEDIUMINT': + case 'BIGINT': + $type = DB_DATAOBJECT_INT; + if ($columnDef->size == 1) { + $type += DB_DATAOBJECT_BOOL; + } + break; + + case 'REAL': + case 'DOUBLE': + case 'DOUBLE PRECISION': // double precision (firebird) + case 'FLOAT': + case 'FLOAT4': // real (postgres) + case 'FLOAT8': // double precision (postgres) + case 'DECIMAL': + case 'MONEY': // mssql and maybe others + case 'NUMERIC': + case 'NUMBER': // oci8 + $type = DB_DATAOBJECT_INT; // should really by FLOAT!!! / MONEY... + break; + + case 'YEAR': + $type = DB_DATAOBJECT_INT; + break; + + case 'BIT': + case 'BOOL': + case 'BOOLEAN': + + $type = DB_DATAOBJECT_BOOL; + // postgres needs to quote '0' + if ($dbtype == 'pgsql') { + $type += DB_DATAOBJECT_STR; + } + break; + + case 'STRING': + case 'CHAR': + case 'VARCHAR': + case 'VARCHAR2': + case 'TINYTEXT': + + case 'ENUM': + case 'SET': // not really but oh well + + case 'POINT': // mysql geometry stuff - not really string - but will do.. + + case 'TIMESTAMPTZ': // postgres + case 'BPCHAR': // postgres + case 'INTERVAL': // postgres (eg. '12 days') + + case 'CIDR': // postgres IP net spec + case 'INET': // postgres IP + case 'MACADDR': // postgress network Mac address. + + case 'INTEGER[]': // postgres type + case 'BOOLEAN[]': // postgres type + + $type = DB_DATAOBJECT_STR; + break; + + case 'TEXT': + case 'MEDIUMTEXT': + case 'LONGTEXT': + + $type = DB_DATAOBJECT_STR + DB_DATAOBJECT_TXT; + break; + + + case 'DATE': + $type = DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE; + break; + + case 'TIME': + $type = DB_DATAOBJECT_STR + DB_DATAOBJECT_TIME; + break; + + + case 'DATETIME': + + $type = DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME; + break; + + case 'TIMESTAMP': // do other databases use this??? + + $type = ($dbtype == 'mysql') ? + DB_DATAOBJECT_MYSQLTIMESTAMP : + DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME; + break; + + + case 'BLOB': /// these should really be ignored!!!??? + case 'TINYBLOB': + case 'MEDIUMBLOB': + case 'LONGBLOB': + + case 'CLOB': // oracle character lob support + + case 'BYTEA': // postgres blob support.. + $type = DB_DATAOBJECT_STR + DB_DATAOBJECT_BLOB; + break; + + default: + throw new Exception("Cannot handle datatype: $columnDef->type"); + } + if(! $columnDef->nullable) { + $type+=DB_DATAOBJECT_NOTNULL; + } + $table[$columnDef->name]=$type; + } + } + return $table; + } + + function keys() { + static $keys = null; + if($keys == null) { + $keys = array(); + $tableDef = $this->tableDef(); + foreach($tableDef->columns as $columnDef){ + if($columnDef->key != null){ + $keys[] = $columnDef->name; + } + } + } + return $keys; + } + + function sequenceKey() { + static $sequenceKey = null; + if($sequenceKey == null) { + $sequenceKey = array(false,false); + $tableDef = $this->tableDef(); + foreach($tableDef->columns as $columnDef){ + if($columnDef->key == 'PRI' && $columnDef->auto_increment){ + $sequenceKey=array($columnDef->name,true); + } + } + } + return $sequenceKey; + } + + /** + * Get the TableDef object that represents the table backing this class + * Ideally, this function would a static function, but PHP doesn't allow + * abstract static functions + * @return TableDef TableDef instance + */ + abstract function tableDef(); +} + diff --git a/classes/Profile.php b/classes/Profile.php index 7c1e9db33..1b9cdb52f 100644 --- a/classes/Profile.php +++ b/classes/Profile.php @@ -310,10 +310,12 @@ class Profile extends Memcached_DataObject 'AND subscription.subscribed != subscription.subscriber ' . 'ORDER BY subscription.created DESC '; - if (common_config('db','type') == 'pgsql') { - $qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset; - } else { - $qry .= ' LIMIT ' . $offset . ', ' . $limit; + if ($offset>0 && !is_null($limit)){ + if (common_config('db','type') == 'pgsql') { + $qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset; + } else { + $qry .= ' LIMIT ' . $offset . ', ' . $limit; + } } $profile = new Profile(); @@ -333,11 +335,13 @@ class Profile extends Memcached_DataObject 'AND subscription.subscribed != subscription.subscriber ' . 'ORDER BY subscription.created DESC '; - if ($offset) { - if (common_config('db','type') == 'pgsql') { - $qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset; - } else { - $qry .= ' LIMIT ' . $offset . ', ' . $limit; + if ($offset>0 && !is_null($limit)){ + if ($offset) { + if (common_config('db','type') == 'pgsql') { + $qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset; + } else { + $qry .= ' LIMIT ' . $offset . ', ' . $limit; + } } } @@ -587,4 +591,124 @@ class Profile extends Memcached_DataObject return $location; } + + function hasRole($name) + { + $role = Profile_role::pkeyGet(array('profile_id' => $this->id, + 'role' => $name)); + return (!empty($role)); + } + + function grantRole($name) + { + $role = new Profile_role(); + + $role->profile_id = $this->id; + $role->role = $name; + $role->created = common_sql_now(); + + $result = $role->insert(); + + if (!$result) { + common_log_db_error($role, 'INSERT', __FILE__); + return false; + } + + return true; + } + + function revokeRole($name) + { + $role = Profile_role::pkeyGet(array('profile_id' => $this->id, + 'role' => $name)); + + if (empty($role)) { + throw new Exception('Cannot revoke role "'.$name.'" for user #'.$this->id.'; does not exist.'); + } + + $result = $role->delete(); + + if (!$result) { + common_log_db_error($role, 'DELETE', __FILE__); + throw new Exception('Cannot revoke role "'.$name.'" for user #'.$this->id.'; database error.'); + } + + return true; + } + + function isSandboxed() + { + return $this->hasRole(Profile_role::SANDBOXED); + } + + function isSilenced() + { + return $this->hasRole(Profile_role::SILENCED); + } + + function sandbox() + { + $this->grantRole(Profile_role::SANDBOXED); + } + + function unsandbox() + { + $this->revokeRole(Profile_role::SANDBOXED); + } + + function silence() + { + $this->grantRole(Profile_role::SILENCED); + } + + function unsilence() + { + $this->revokeRole(Profile_role::SILENCED); + } + + /** + * Does this user have the right to do X? + * + * With our role-based authorization, this is merely a lookup for whether the user + * has a particular role. The implementation currently uses a switch statement + * to determine if the user has the pre-defined role to exercise the right. Future + * implementations may allow per-site roles, and different mappings of roles to rights. + * + * @param $right string Name of the right, usually a constant in class Right + * @return boolean whether the user has the right in question + */ + + function hasRight($right) + { + $result = false; + if (Event::handle('UserRightsCheck', array($this, $right, &$result))) { + switch ($right) + { + case Right::DELETEOTHERSNOTICE: + case Right::SANDBOXUSER: + case Right::SILENCEUSER: + case Right::DELETEUSER: + $result = $this->hasRole(Profile_role::MODERATOR); + break; + case Right::CONFIGURESITE: + $result = $this->hasRole(Profile_role::ADMINISTRATOR); + break; + case Right::NEWNOTICE: + case Right::NEWMESSAGE: + case Right::SUBSCRIBE: + $result = !$this->isSilenced(); + break; + case Right::PUBLICNOTICE: + case Right::EMAILONREPLY: + case Right::EMAILONSUBSCRIBE: + case Right::EMAILONFAVE: + $result = !$this->isSandboxed(); + break; + default: + $result = false; + break; + } + } + return $result; + } } diff --git a/classes/User_role.php b/classes/Profile_role.php index fc3806897..afa7fb74e 100644 --- a/classes/User_role.php +++ b/classes/Profile_role.php @@ -1,7 +1,7 @@ <?php /* * StatusNet - the distributed open-source microblogging tool - * Copyright (C) 2008, 2009, StatusNet, Inc. + * Copyright (C) 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 @@ -10,42 +10,46 @@ * * 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 + * 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/>. + * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } +if (!defined('STATUSNET')) { + exit(1); +} /** - * Table Definition for user_role + * Table Definition for profile_role */ require_once INSTALLDIR.'/classes/Memcached_DataObject.php'; -class User_role extends Memcached_DataObject +class Profile_role extends Memcached_DataObject { ###START_AUTOCODE /* the code below is auto generated do not remove the above tag */ - public $__table = 'user_role'; // table name - public $user_id; // int(4) primary_key not_null + public $__table = 'profile_role'; // table name + public $profile_id; // int(4) primary_key not_null public $role; // varchar(32) primary_key not_null - public $created; // datetime() not_null + public $created; // datetime not_null default_0000-00-00%2000%3A00%3A00 /* Static get */ - function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('User_role',$k,$v); } + function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Profile_role',$k,$v); } /* the code above is auto generated do not remove the tag below */ ###END_AUTOCODE function &pkeyGet($kv) { - return Memcached_DataObject::pkeyGet('User_role', $kv); + return Memcached_DataObject::pkeyGet('Profile_role', $kv); } const MODERATOR = 'moderator'; const ADMINISTRATOR = 'administrator'; + const SANDBOXED = 'sandboxed'; + const SILENCED = 'silenced'; } diff --git a/classes/User.php b/classes/User.php index 447a34141..f905ea2b7 100644 --- a/classes/User.php +++ b/classes/User.php @@ -114,7 +114,7 @@ class User extends Memcached_DataObject return $result; } - function allowed_nickname($nickname) + static function allowed_nickname($nickname) { // XXX: should already be validated for size, content, etc. $blacklist = common_config('nickname', 'blacklist'); @@ -190,7 +190,17 @@ class User extends Memcached_DataObject $profile->query('BEGIN'); + if(!empty($email)) + { + $email = common_canonical_email($email); + } + + $nickname = common_canonical_nickname($nickname); $profile->nickname = $nickname; + if(! User::allowed_nickname($nickname)){ + common_log(LOG_WARNING, sprintf("Attempted to register a nickname that is not allowed: %s", $profile->nickname), + __FILE__); + } $profile->profileurl = common_profile_url($nickname); if (!empty($fullname)) { @@ -242,6 +252,10 @@ class User extends Memcached_DataObject } } + if(isset($email_confirmed) && $email_confirmed) { + $user->email = $email; + } + // This flag is ignored but still set to 1 $user->inboxed = 1; @@ -563,11 +577,13 @@ class User extends Memcached_DataObject 'WHERE group_member.profile_id = %d ' . 'ORDER BY group_member.created DESC '; - if ($offset) { - if (common_config('db','type') == 'pgsql') { - $qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset; - } else { - $qry .= ' LIMIT ' . $offset . ', ' . $limit; + if ($offset>0 && !is_null($limit)) { + if ($offset) { + if (common_config('db','type') == 'pgsql') { + $qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset; + } else { + $qry .= ' LIMIT ' . $offset . ', ' . $limit; + } } } @@ -643,80 +659,10 @@ class User extends Memcached_DataObject return Design::staticGet('id', $this->design_id); } - function hasRole($name) - { - $role = User_role::pkeyGet(array('user_id' => $this->id, - 'role' => $name)); - return (!empty($role)); - } - - function grantRole($name) - { - $role = new User_role(); - - $role->user_id = $this->id; - $role->role = $name; - $role->created = common_sql_now(); - - $result = $role->insert(); - - if (!$result) { - common_log_db_error($role, 'INSERT', __FILE__); - return false; - } - - return true; - } - - function revokeRole($name) - { - $role = User_role::pkeyGet(array('user_id' => $this->id, - 'role' => $name)); - - if (empty($role)) { - throw new Exception('Cannot revoke role "'.$name.'" for user #'.$this->id.'; does not exist.'); - } - - $result = $role->delete(); - - if (!$result) { - common_log_db_error($role, 'DELETE', __FILE__); - throw new Exception('Cannot revoke role "'.$name.'" for user #'.$this->id.'; database error.'); - } - - return true; - } - - /** - * Does this user have the right to do X? - * - * With our role-based authorization, this is merely a lookup for whether the user - * has a particular role. The implementation currently uses a switch statement - * to determine if the user has the pre-defined role to exercise the right. Future - * implementations may allow per-site roles, and different mappings of roles to rights. - * - * @param $right string Name of the right, usually a constant in class Right - * @return boolean whether the user has the right in question - */ - function hasRight($right) { - $result = false; - if (Event::handle('UserRightsCheck', array($this, $right, &$result))) { - switch ($right) - { - case Right::DELETEOTHERSNOTICE: - $result = $this->hasRole(User_role::MODERATOR); - break; - case Right::CONFIGURESITE: - $result = $this->hasRole(User_role::ADMINISTRATOR); - break; - default: - $result = false; - break; - } - } - return $result; + $profile = $this->getProfile(); + return $profile->hasRight($right); } function delete() @@ -761,4 +707,34 @@ class User extends Memcached_DataObject $block->delete(); // XXX delete group block? Reset blocker? } + + function hasRole($name) + { + $profile = $this->getProfile(); + return $profile->hasRole($name); + } + + function grantRole($name) + { + $profile = $this->getProfile(); + return $profile->grantRole($name); + } + + function revokeRole($name) + { + $profile = $this->getProfile(); + return $profile->revokeRole($name); + } + + function isSandboxed() + { + $profile = $this->getProfile(); + return $profile->isSandboxed(); + } + + function isSilenced() + { + $profile = $this->getProfile(); + return $profile->isSilenced(); + } } diff --git a/classes/statusnet.ini b/classes/statusnet.ini index 912d05cdf..b2509dac5 100644 --- a/classes/statusnet.ini +++ b/classes/statusnet.ini @@ -253,6 +253,15 @@ modified = 384 [location_namespace__keys] id = K +[login_token] +user_id = 129 +token = 130 +created = 142 +modified = 384 + +[login_token__keys] +user_id = K + [message] id = 129 uri = 2 @@ -358,6 +367,15 @@ modified = 384 blocker = K blocked = K +[profile_role] +profile_id = 129 +role = 130 +created = 142 + +[profile_role__keys] +profile_id = K +role = K + [profile_tag] tagger = 129 tagged = 129 @@ -524,45 +542,4 @@ created = 142 modified = 384 [user_group__keys] -id = N - -[user_openid] -canonical = 130 -display = 130 -user_id = 129 -created = 142 -modified = 384 - -[user_openid__keys] -canonical = K -display = U - -[user_openid_trustroot] -trustroot = 130 -user_id = 129 -created = 142 -modified = 384 - -[user_openid__keys] -trustroot = K -user_id = K - -[user_role] -user_id = 129 -role = 130 -created = 142 - -[user_role__keys] -user_id = K -role = K - -[login_token] -user_id = 129 -token = 130 -created = 142 -modified = 384 - -[login_token__keys] -user_id = K -token = K - +id = N
\ No newline at end of file diff --git a/db/08to09.sql b/db/08to09.sql index 1d37a759d..028fe56a4 100644 --- a/db/08to09.sql +++ b/db/08to09.sql @@ -51,3 +51,7 @@ alter table subscription add index subscription_subscriber_idx (subscriber,created), drop index subscription_subscribed_idx, add index subscription_subscribed_idx (subscribed,created); + +alter table notice + drop index notice_profile_id_idx, + add index notice_profile_id_idx (profile_id,created,id); diff --git a/db/08to09_pg.sql b/db/08to09_pg.sql index 004c77b36..d9b57fb84 100644 --- a/db/08to09_pg.sql +++ b/db/08to09_pg.sql @@ -40,20 +40,23 @@ create table user_role ( ); create table login_token ( - user_id integer not null /* comment 'user owning this token'*/ references user (id), + user_id integer not null /* comment 'user owning this token'*/ references "user" (id), token char(32) not null /* comment 'token useable for logging in'*/, created timestamp not null DEFAULT CURRENT_TIMESTAMP /* comment 'date this record was created'*/, modified timestamp /* comment 'date this record was modified'*/, - constraint primary key (user_id) + primary key (user_id) ); -alter table fave - drop index fave_user_id_idx, - add index fave_user_id_idx using btree(user_id,modified); +DROP index fave_user_id_idx; +CREATE index fave_user_id_idx on fave (user_id,modified); + +DROP index subscription_subscriber_idx; +CREATE index subscription_subscriber_idx ON subscription (subscriber,created); + +DROP index subscription_subscribed_idx; +CREATE index subscription_subscribed_idx ON subscription (subscribed,created); + +DROP index notice_profile_id_idx; +CREATE index notice_profile_id_idx ON notice (profile_id,created,id); -alter table subscription - drop index subscription_subscriber_idx, - add index subscription_subscriber_idx using btree(subscriber,created), - drop index subscription_subscribed_idx, - add index subscription_subscribed_idx using btree(subscribed,created); diff --git a/db/statusnet.sql b/db/statusnet.sql index 2983c67cf..18abcdfdb 100644 --- a/db/statusnet.sql +++ b/db/statusnet.sql @@ -130,7 +130,7 @@ create table notice ( location_id integer comment 'location id if possible', location_ns integer comment 'namespace for location', - index notice_profile_id_idx (profile_id), + index notice_profile_id_idx (profile_id,created,id), index notice_conversation_idx (conversation), index notice_created_idx (created), index notice_replyto_idx (reply_to), @@ -557,13 +557,13 @@ create table config ( ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin; -create table user_role ( +create table profile_role ( - user_id integer not null comment 'user having the role' references user (id), + profile_id integer not null comment 'account having the role' references profile (id), role varchar(32) not null comment 'string representing the role', created datetime not null comment 'date the role was granted', - constraint primary key (user_id, role) + constraint primary key (profile_id, role) ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin; diff --git a/db/statusnet_pg.sql b/db/statusnet_pg.sql index 392a6a5f3..7b0e5313c 100644 --- a/db/statusnet_pg.sql +++ b/db/statusnet_pg.sql @@ -137,7 +137,7 @@ create table notice ( /* FULLTEXT(content) */ ); -create index notice_profile_id_idx on notice using btree(profile_id); +create index notice_profile_id_idx on notice using btree(profile_id,created,id); create index notice_created_idx on notice using btree(created); create table notice_source ( diff --git a/extlib/PEAR.php b/extlib/PEAR.php index fcefa964a..4c24c6006 100644 --- a/extlib/PEAR.php +++ b/extlib/PEAR.php @@ -746,7 +746,7 @@ class PEAR { if (!extension_loaded($ext)) { // if either returns true dl() will produce a FATAL error, stop that - if ((ini_get('enable_dl') != 1) || (ini_get('safe_mode') == 1) || !function_exists('dl')) { + if ((ini_get('enable_dl') != 1) || (ini_get('safe_mode') == 1)) { return false; } if (OS_WINDOWS) { diff --git a/extlib/Stomp.php b/extlib/Stomp.php index abd9cba62..b55a4aa6d 100644 --- a/extlib/Stomp.php +++ b/extlib/Stomp.php @@ -66,12 +66,13 @@ class Stomp protected $_sessionId; protected $_read_timeout_seconds = 60; protected $_read_timeout_milliseconds = 0; + protected $_connect_timeout_seconds = 60; /** * Constructor * * @param string $brokerUri Broker URL - * @throws Stomp_Exception + * @throws StompException */ public function __construct ($brokerUri) { @@ -81,7 +82,7 @@ class Stomp /** * Initialize connection * - * @throws Stomp_Exception + * @throws StompException */ protected function _init () { @@ -103,14 +104,14 @@ class Stomp } } else { require_once 'Stomp/Exception.php'; - throw new Stomp_Exception("Bad Broker URL {$this->_brokerUri}"); + throw new StompException("Bad Broker URL {$this->_brokerUri}"); } } /** * Process broker URL * * @param string $url Broker URL - * @throws Stomp_Exception + * @throws StompException * @return boolean */ protected function _processUrl ($url) @@ -120,19 +121,19 @@ class Stomp array_push($this->_hosts, array($parsed['host'] , $parsed['port'] , $parsed['scheme'])); } else { require_once 'Stomp/Exception.php'; - throw new Stomp_Exception("Bad Broker URL $url"); + throw new StompException("Bad Broker URL $url"); } } /** * Make socket connection to the server * - * @throws Stomp_Exception + * @throws StompException */ protected function _makeConnection () { if (count($this->_hosts) == 0) { require_once 'Stomp/Exception.php'; - throw new Stomp_Exception("No broker defined"); + throw new StompException("No broker defined"); } // force disconnect, if previous established connection exists @@ -141,6 +142,9 @@ class Stomp $i = $this->_currentHost; $att = 0; $connected = false; + $connect_errno = null; + $connect_errstr = null; + while (! $connected && $att ++ < $this->_attempts) { if (isset($this->_params['randomize']) && $this->_params['randomize'] == 'true') { $i = rand(0, count($this->_hosts) - 1); @@ -158,10 +162,10 @@ class Stomp fclose($this->_socket); $this->_socket = null; } - $this->_socket = @fsockopen($scheme . '://' . $host, $port); + $this->_socket = @fsockopen($scheme . '://' . $host, $port, $connect_errno, $connect_errstr, $this->_connect_timeout_seconds); if (!is_resource($this->_socket) && $att >= $this->_attempts && !array_key_exists($i + 1, $this->_hosts)) { require_once 'Stomp/Exception.php'; - throw new Stomp_Exception("Could not connect to $host:$port ($att/{$this->_attempts})"); + throw new StompException("Could not connect to $host:$port ($att/{$this->_attempts})"); } else if (is_resource($this->_socket)) { $connected = true; $this->_currentHost = $i; @@ -170,7 +174,7 @@ class Stomp } if (! $connected) { require_once 'Stomp/Exception.php'; - throw new Stomp_Exception("Could not connect to a broker"); + throw new StompException("Could not connect to a broker"); } } /** @@ -179,7 +183,7 @@ class Stomp * @param string $username * @param string $password * @return boolean - * @throws Stomp_Exception + * @throws StompException */ public function connect ($username = '', $password = '') { @@ -194,18 +198,18 @@ class Stomp if ($this->clientId != null) { $headers["client-id"] = $this->clientId; } - $frame = new Stomp_Frame("CONNECT", $headers); + $frame = new StompFrame("CONNECT", $headers); $this->_writeFrame($frame); $frame = $this->readFrame(); - if ($frame instanceof Stomp_Frame && $frame->command == 'CONNECTED') { + if ($frame instanceof StompFrame && $frame->command == 'CONNECTED') { $this->_sessionId = $frame->headers["session"]; return true; } else { require_once 'Stomp/Exception.php'; - if ($frame instanceof Stomp_Frame) { - throw new Stomp_Exception("Unexpected command: {$frame->command}", 0, $frame->body); + if ($frame instanceof StompFrame) { + throw new StompException("Unexpected command: {$frame->command}", 0, $frame->body); } else { - throw new Stomp_Exception("Connection not acknowledged"); + throw new StompException("Connection not acknowledged"); } } } @@ -232,21 +236,21 @@ class Stomp * Send a message to a destination in the messaging system * * @param string $destination Destination queue - * @param string|Stomp_Frame $msg Message + * @param string|StompFrame $msg Message * @param array $properties * @param boolean $sync Perform request synchronously * @return boolean */ - public function send ($destination, $msg, $properties = null, $sync = null) + public function send ($destination, $msg, $properties = array(), $sync = null) { - if ($msg instanceof Stomp_Frame) { + if ($msg instanceof StompFrame) { $msg->headers['destination'] = $destination; - $msg->headers = array_merge($msg->headers, $properties); + if (is_array($properties)) $msg->headers = array_merge($msg->headers, $properties); $frame = $msg; } else { $headers = $properties; $headers['destination'] = $destination; - $frame = new Stomp_Frame('SEND', $headers, $msg); + $frame = new StompFrame('SEND', $headers, $msg); } $this->_prepareReceipt($frame, $sync); $this->_writeFrame($frame); @@ -255,10 +259,10 @@ class Stomp /** * Prepair frame receipt * - * @param Stomp_Frame $frame + * @param StompFrame $frame * @param boolean $sync */ - protected function _prepareReceipt (Stomp_Frame $frame, $sync) + protected function _prepareReceipt (StompFrame $frame, $sync) { $receive = $this->sync; if ($sync !== null) { @@ -271,12 +275,12 @@ class Stomp /** * Wait for receipt * - * @param Stomp_Frame $frame + * @param StompFrame $frame * @param boolean $sync * @return boolean - * @throws Stomp_Exception + * @throws StompException */ - protected function _waitForReceipt (Stomp_Frame $frame, $sync) + protected function _waitForReceipt (StompFrame $frame, $sync) { $receive = $this->sync; @@ -289,19 +293,19 @@ class Stomp return true; } $frame = $this->readFrame(); - if ($frame instanceof Stomp_Frame && $frame->command == 'RECEIPT') { + if ($frame instanceof StompFrame && $frame->command == 'RECEIPT') { if ($frame->headers['receipt-id'] == $id) { return true; } else { require_once 'Stomp/Exception.php'; - throw new Stomp_Exception("Unexpected receipt id {$frame->headers['receipt-id']}", 0, $frame->body); + throw new StompException("Unexpected receipt id {$frame->headers['receipt-id']}", 0, $frame->body); } } else { require_once 'Stomp/Exception.php'; - if ($frame instanceof Stomp_Frame) { - throw new Stomp_Exception("Unexpected command {$frame->command}", 0, $frame->body); + if ($frame instanceof StompFrame) { + throw new StompException("Unexpected command {$frame->command}", 0, $frame->body); } else { - throw new Stomp_Exception("Receipt not received"); + throw new StompException("Receipt not received"); } } } @@ -314,7 +318,7 @@ class Stomp * @param array $properties * @param boolean $sync Perform request synchronously * @return boolean - * @throws Stomp_Exception + * @throws StompException */ public function subscribe ($destination, $properties = null, $sync = null) { @@ -329,7 +333,7 @@ class Stomp } } $headers['destination'] = $destination; - $frame = new Stomp_Frame('SUBSCRIBE', $headers); + $frame = new StompFrame('SUBSCRIBE', $headers); $this->_prepareReceipt($frame, $sync); $this->_writeFrame($frame); if ($this->_waitForReceipt($frame, $sync) == true) { @@ -346,7 +350,7 @@ class Stomp * @param array $properties * @param boolean $sync Perform request synchronously * @return boolean - * @throws Stomp_Exception + * @throws StompException */ public function unsubscribe ($destination, $properties = null, $sync = null) { @@ -357,7 +361,7 @@ class Stomp } } $headers['destination'] = $destination; - $frame = new Stomp_Frame('UNSUBSCRIBE', $headers); + $frame = new StompFrame('UNSUBSCRIBE', $headers); $this->_prepareReceipt($frame, $sync); $this->_writeFrame($frame); if ($this->_waitForReceipt($frame, $sync) == true) { @@ -373,7 +377,7 @@ class Stomp * @param string $transactionId * @param boolean $sync Perform request synchronously * @return boolean - * @throws Stomp_Exception + * @throws StompException */ public function begin ($transactionId = null, $sync = null) { @@ -381,7 +385,7 @@ class Stomp if (isset($transactionId)) { $headers['transaction'] = $transactionId; } - $frame = new Stomp_Frame('BEGIN', $headers); + $frame = new StompFrame('BEGIN', $headers); $this->_prepareReceipt($frame, $sync); $this->_writeFrame($frame); return $this->_waitForReceipt($frame, $sync); @@ -392,7 +396,7 @@ class Stomp * @param string $transactionId * @param boolean $sync Perform request synchronously * @return boolean - * @throws Stomp_Exception + * @throws StompException */ public function commit ($transactionId = null, $sync = null) { @@ -400,7 +404,7 @@ class Stomp if (isset($transactionId)) { $headers['transaction'] = $transactionId; } - $frame = new Stomp_Frame('COMMIT', $headers); + $frame = new StompFrame('COMMIT', $headers); $this->_prepareReceipt($frame, $sync); $this->_writeFrame($frame); return $this->_waitForReceipt($frame, $sync); @@ -417,7 +421,7 @@ class Stomp if (isset($transactionId)) { $headers['transaction'] = $transactionId; } - $frame = new Stomp_Frame('ABORT', $headers); + $frame = new StompFrame('ABORT', $headers); $this->_prepareReceipt($frame, $sync); $this->_writeFrame($frame); return $this->_waitForReceipt($frame, $sync); @@ -426,15 +430,19 @@ class Stomp * Acknowledge consumption of a message from a subscription * Note: This operation is always asynchronous * - * @param string|Stomp_Frame $messageMessage ID + * @param string|StompFrame $messageMessage ID * @param string $transactionId * @return boolean - * @throws Stomp_Exception + * @throws StompException */ public function ack ($message, $transactionId = null) { - if ($message instanceof Stomp_Frame) { - $frame = new Stomp_Frame('ACK', $message->headers); + if ($message instanceof StompFrame) { + $headers = $message->headers; + if (isset($transactionId)) { + $headers['transaction'] = $transactionId; + } + $frame = new StompFrame('ACK', $headers); $this->_writeFrame($frame); return true; } else { @@ -443,7 +451,7 @@ class Stomp $headers['transaction'] = $transactionId; } $headers['message-id'] = $message; - $frame = new Stomp_Frame('ACK', $headers); + $frame = new StompFrame('ACK', $headers); $this->_writeFrame($frame); return true; } @@ -461,7 +469,7 @@ class Stomp } if (is_resource($this->_socket)) { - $this->_writeFrame(new Stomp_Frame('DISCONNECT', $headers)); + $this->_writeFrame(new StompFrame('DISCONNECT', $headers)); fclose($this->_socket); } $this->_socket = null; @@ -474,13 +482,13 @@ class Stomp /** * Write frame to server * - * @param Stomp_Frame $stompFrame + * @param StompFrame $stompFrame */ - protected function _writeFrame (Stomp_Frame $stompFrame) + protected function _writeFrame (StompFrame $stompFrame) { if (!is_resource($this->_socket)) { require_once 'Stomp/Exception.php'; - throw new Stomp_Exception('Socket connection hasn\'t been established'); + throw new StompException('Socket connection hasn\'t been established'); } $data = $stompFrame->__toString(); @@ -504,9 +512,9 @@ class Stomp } /** - * Read responce frame from server + * Read response frame from server * - * @return Stomp_Frame|Stomp_Message_Map|boolean False when no frame to read + * @return StompFrame False when no frame to read */ public function readFrame () { @@ -516,15 +524,21 @@ class Stomp $rb = 1024; $data = ''; + $end = false; + do { - $read = fgets($this->_socket, $rb); + $read = fread($this->_socket, $rb); if ($read === false) { $this->_reconnect(); return $this->readFrame(); } $data .= $read; + if (strpos($data, "\x00") !== false) { + $end = true; + $data = rtrim($data, "\n"); + } $len = strlen($data); - } while (($len < 2 || ! ($data[$len - 2] == "\x00" && $data[$len - 1] == "\n"))); + } while ($len < 2 || $end == false); list ($header, $body) = explode("\n\n", $data, 2); $header = explode("\n", $header); @@ -538,13 +552,14 @@ class Stomp $command = $v; } } - $frame = new Stomp_Frame($command, $headers, trim($body)); - if (isset($frame->headers['amq-msg-type']) && $frame->headers['amq-msg-type'] == 'MapMessage') { + $frame = new StompFrame($command, $headers, trim($body)); + if (isset($frame->headers['transformation']) && $frame->headers['transformation'] == 'jms-map-json') { require_once 'Stomp/Message/Map.php'; - return new Stomp_Message_Map($frame); + return new StompMessageMap($frame); } else { return $frame; } + return $frame; } /** @@ -558,10 +573,14 @@ class Stomp $write = null; $except = null; - $has_frame_to_read = stream_select($read, $write, $except, $this->_read_timeout_seconds, $this->_read_timeout_milliseconds); + $has_frame_to_read = @stream_select($read, $write, $except, $this->_read_timeout_seconds, $this->_read_timeout_milliseconds); + + if ($has_frame_to_read !== false) + $has_frame_to_read = count($read); + if ($has_frame_to_read === false) { - throw new Stomp_Exception('Check failed to determin if the socket is readable'); + throw new StompException('Check failed to determine if the socket is readable'); } else if ($has_frame_to_read > 0) { return true; } else { diff --git a/extlib/Stomp/Exception.php b/extlib/Stomp/Exception.php index e6870bc15..8c479de24 100644 --- a/extlib/Stomp/Exception.php +++ b/extlib/Stomp/Exception.php @@ -23,10 +23,8 @@ * * * @package Stomp - * @author Michael Caplan <mcaplan@labnet.net> - * @version $Revision: 23 $ - */
-class Stomp_Exception extends Exception
+ */ +class StompException extends Exception { protected $_details; @@ -53,5 +51,5 @@ class Stomp_Exception extends Exception { return $this->_details; } -}
+} ?>
\ No newline at end of file diff --git a/extlib/Stomp/Frame.php b/extlib/Stomp/Frame.php index dc59c1cb7..195e3b627 100644 --- a/extlib/Stomp/Frame.php +++ b/extlib/Stomp/Frame.php @@ -1,33 +1,29 @@ -<?php -/** - * - * Copyright 2005-2006 The Apache Software Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/* vim: set expandtab tabstop=3 shiftwidth=3: */ +<?php
+/**
+ *
+ * Copyright 2005-2006 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* vim: set expandtab tabstop=3 shiftwidth=3: */
/**
- * Stomp Frames are messages that are sent and received on a StompConnection.
+ * Stomp Frames are messages that are sent and received on a stomp connection.
*
* @package Stomp
- * @author Hiram Chirino <hiram@hiramchirino.com>
- * @author Dejan Bosanac <dejan@nighttale.net>
- * @author Michael Caplan <mcaplan@labnet.net>
- * @version $Revision: 36 $
*/
-class Stomp_Frame
+class StompFrame
{
public $command;
public $headers = array();
@@ -54,27 +50,27 @@ class Stomp_Frame $this->body = $body;
if ($this->command == 'ERROR') {
- require_once 'Stomp/Exception.php';
- throw new Stomp_Exception($this->headers['message'], 0, $this->body);
+ require_once 'Exception.php';
+ throw new StompException($this->headers['message'], 0, $this->body);
+ }
+ }
+
+ /**
+ * Convert frame to transportable string
+ *
+ * @return string
+ */
+ public function __toString()
+ {
+ $data = $this->command . "\n";
+
+ foreach ($this->headers as $name => $value) {
+ $data .= $name . ": " . $value . "\n";
}
- } - - /** - * Convert frame to transportable string - * - * @return string - */ - public function __toString() - { - $data = $this->command . "\n"; - - foreach ($this->headers as $name => $value) { - $data .= $name . ": " . $value . "\n"; - } - - $data .= "\n"; - $data .= $this->body; - return $data .= "\x00\n"; +
+ $data .= "\n";
+ $data .= $this->body;
+ return $data .= "\x00";
}
}
?>
\ No newline at end of file diff --git a/extlib/Stomp/Message.php b/extlib/Stomp/Message.php index 6bcad3efd..5a064090c 100644 --- a/extlib/Stomp/Message.php +++ b/extlib/Stomp/Message.php @@ -24,10 +24,8 @@ require_once 'Stomp/Frame.php'; * Basic text stomp message * * @package Stomp - * @author Dejan Bosanac <dejan@nighttale.net> - * @version $Revision: 23 $ */ -class Stomp_Message extends Stomp_Frame +class StompMessage extends StompFrame { public function __construct ($body, $headers = null) { diff --git a/extlib/Stomp/Message/Map.php b/extlib/Stomp/Message/Map.php index 288456a84..38a32c56c 100644 --- a/extlib/Stomp/Message/Map.php +++ b/extlib/Stomp/Message/Map.php @@ -24,30 +24,28 @@ require_once 'Stomp/Message.php'; * Message that contains a set of name-value pairs * * @package Stomp - * @author Dejan Bosanac <dejan@nighttale.net> - * @version $Revision: 23 $ */ -class Stomp_Message_Map extends Stomp_Message +class StompMessageMap extends StompMessage { public $map; /** * Constructor * - * @param Stomp_Frame|string $msg + * @param StompFrame|string $msg * @param array $headers */ function __construct ($msg, $headers = null) { - if ($msg instanceof Stomp_Frame) { + if ($msg instanceof StompFrame) { $this->_init($msg->command, $msg->headers, $msg->body); - $this->map = json_decode($msg->body); + $this->map = json_decode($msg->body, true); } else { $this->_init("SEND", $headers, $msg); if ($this->headers == null) { $this->headers = array(); } - $this->headers['amq-msg-type'] = 'MapMessage'; + $this->headers['transformation'] = 'jms-map-json'; $this->body = json_encode($msg); } } @@ -68,7 +68,6 @@ function getPath($req) */ function handleError($error) { -//error_log(print_r($error,1)); if ($error->getCode() == DB_DATAOBJECT_ERROR_NODATA) { return; } diff --git a/js/util.js b/js/util.js index b90f33ec7..c59c63910 100644 --- a/js/util.js +++ b/js/util.js @@ -228,6 +228,7 @@ var SN = { // StatusNet $('#'+notice.id).fadeIn(2500); SN.U.NoticeAttachments(); SN.U.NoticeReply(); + SN.U.NoticeFavor(); } } $('#'+form_id+' #'+SN.C.S.NoticeDataText).val(''); @@ -276,6 +277,11 @@ var SN = { // StatusNet return true; }, + NoticeFavor: function() { + $('.form_favor').each(function() { SN.U.FormXHR($(this)); }); + $('.form_disfavor').each(function() { SN.U.FormXHR($(this)); }); + }, + NoticeAttachments: function() { $.fn.jOverlay.options = { method : 'GET', @@ -370,31 +376,53 @@ var SN = { // StatusNet return false; }); } - } -}; + }, -$(document).ready(function(){ - if ($('body.user_in').length > 0) { - $('.'+SN.C.S.FormNotice).each(function() { - SN.U.FormNoticeXHR($(this)); - SN.U.FormNoticeEnhancements($(this)); - }); + Init: { + NoticeForm: function() { + if ($('body.user_in').length > 0) { + $('.'+SN.C.S.FormNotice).each(function() { + SN.U.FormNoticeXHR($(this)); + SN.U.FormNoticeEnhancements($(this)); + }); + + SN.U.NoticeDataAttach(); + } + }, - $('.form_user_subscribe').each(function() { SN.U.FormXHR($(this)); }); - $('.form_user_unsubscribe').each(function() { SN.U.FormXHR($(this)); }); - $('.form_favor').each(function() { SN.U.FormXHR($(this)); }); - $('.form_disfavor').each(function() { SN.U.FormXHR($(this)); }); - $('.form_group_join').each(function() { SN.U.FormXHR($(this)); }); - $('.form_group_leave').each(function() { SN.U.FormXHR($(this)); }); - $('.form_user_nudge').each(function() { SN.U.FormXHR($(this)); }); + Notices: function() { + if ($('body.user_in').length > 0) { + SN.U.NoticeFavor(); - SN.U.NoticeReply(); + SN.U.NoticeReply(); + } + + SN.U.NoticeAttachments(); + }, - SN.U.NoticeDataAttach(); + EntityActions: function() { + if ($('body.user_in').length > 0) { + $('.form_user_subscribe').each(function() { SN.U.FormXHR($(this)); }); + $('.form_user_unsubscribe').each(function() { SN.U.FormXHR($(this)); }); + $('.form_group_join').each(function() { SN.U.FormXHR($(this)); }); + $('.form_group_leave').each(function() { SN.U.FormXHR($(this)); }); + $('.form_user_nudge').each(function() { SN.U.FormXHR($(this)); }); - SN.U.NewDirectMessage(); + SN.U.NewDirectMessage(); + } + } } +}; - SN.U.NoticeAttachments(); +$(document).ready(function(){ + if ($('.'+SN.C.S.FormNotice).length > 0) { + SN.Init.NoticeForm(); + } + if ($('#content .notices').length > 0) { + SN.Init.Notices(); + } + if ($('#content .entity_actions').length > 0) { + SN.Init.EntityActions(); + } }); diff --git a/lib/Shorturl_api.php b/lib/Shorturl_api.php deleted file mode 100644 index de4d55012..000000000 --- a/lib/Shorturl_api.php +++ /dev/null @@ -1,67 +0,0 @@ -<?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); } - -abstract class ShortUrlApi -{ - protected $service_url; - protected $long_limit = 27; - - function __construct($service_url) - { - $this->service_url = $service_url; - } - - function shorten($url) - { - if ($this->is_long($url)) return $this->shorten_imp($url); - return $url; - } - - protected abstract function shorten_imp($url); - - protected function is_long($url) { - return strlen($url) >= common_config('site', 'shorturllength'); - } - - protected function http_post($data) - { - $request = HTTPClient::start(); - $response = $request->post($this->service_url, null, $data); - return $response->getBody(); - } - - protected function http_get($url) - { - $request = HTTPClient::start(); - $response = $request->get($this->service_url . urlencode($url)); - return $response->getBody(); - } - - protected function tidy($response) { - $response = str_replace(' ', ' ', $response); - $config = array('output-xhtml' => true); - $tidy = new tidy; - $tidy->parseString($response, $config, 'utf8'); - $tidy->cleanRepair(); - return (string)$tidy; - } -} - diff --git a/lib/action.php b/lib/action.php index edb70c3d9..9c7060bba 100644 --- a/lib/action.php +++ b/lib/action.php @@ -990,6 +990,18 @@ class Action extends HTMLOutputter // lawsuit function selfUrl() { + list($action, $args) = $this->returnToArgs(); + return common_local_url($action, $args); + } + + /** + * Returns arguments sufficient for re-constructing URL + * + * @return array two elements: action, other args + */ + + function returnToArgs() + { $action = $this->trimmed('action'); $args = $this->args; unset($args['action']); @@ -1002,8 +1014,7 @@ class Action extends HTMLOutputter // lawsuit foreach (array_keys($_COOKIE) as $cookie) { unset($args[$cookie]); } - - return common_local_url($action, $args); + return array($action, $args); } /** @@ -1052,8 +1063,7 @@ class Action extends HTMLOutputter // lawsuit { // Does a little before-after block for next/prev page if ($have_before || $have_after) { - $this->elementStart('div', array('class' => 'pagination')); - $this->elementStart('dl', null); + $this->elementStart('dl', 'pagination'); $this->element('dt', null, _('Pagination')); $this->elementStart('dd', null); $this->elementStart('ul', array('class' => 'nav')); @@ -1078,7 +1088,6 @@ class Action extends HTMLOutputter // lawsuit $this->elementEnd('ul'); $this->elementEnd('dd'); $this->elementEnd('dl'); - $this->elementEnd('div'); } } diff --git a/lib/blockform.php b/lib/blockform.php index 4820d09af..b6652b1f6 100644 --- a/lib/blockform.php +++ b/lib/blockform.php @@ -32,8 +32,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } -require_once INSTALLDIR.'/lib/form.php'; - /** * Form for blocking a user * @@ -47,109 +45,38 @@ require_once INSTALLDIR.'/lib/form.php'; * @see UnblockForm */ -class BlockForm extends Form +class BlockForm extends ProfileActionForm { /** - * Profile of user to block - */ - - var $profile = null; - - /** - * Return-to args - */ - - var $args = null; - - /** - * Constructor + * Action this form provides * - * @param HTMLOutputter $out output channel - * @param Profile $profile profile of user to block - * @param array $args return-to args + * @return string Name of the action, lowercased. */ - function __construct($out=null, $profile=null, $args=null) + function target() { - parent::__construct($out); - - $this->profile = $profile; - $this->args = $args; + return 'block'; } /** - * ID of the form - * - * @return int ID of the form - */ - - function id() - { - return 'block-' . $this->profile->id; - } - - - /** - * class of the form - * - * @return string class of the form - */ - - function formClass() - { - return 'form_user_block'; - } - - - /** - * Action of the form - * - * @return string URL of the action - */ - - function action() - { - return common_local_url('block'); - } - - - /** - * Legend of the Form - * - * @return void - */ - function formLegend() - { - $this->out->element('legend', null, _('Block this user')); - } - - - /** - * Data elements of the form + * Title of the form * - * @return void + * @return string Title of the form, internationalized */ - function formData() + function title() { - $this->out->hidden('blockto-' . $this->profile->id, - $this->profile->id, - 'blockto'); - if ($this->args) { - foreach ($this->args as $k => $v) { - $this->out->hidden('returnto-' . $k, $v); - } - } + return _('Block'); } /** - * Action elements + * Description of the form * - * @return void + * @return string description of the form, internationalized */ - function formActions() + function description() { - $this->out->submit('submit', _('Block'), 'submit', null, _('Block this user')); + return _('Block this user'); } } diff --git a/lib/command.php b/lib/command.php index 2ec3320de..7e98156b6 100644 --- a/lib/command.php +++ b/lib/command.php @@ -605,6 +605,71 @@ class LoginCommand extends Command } } +class SubscriptionsCommand extends Command +{ + function execute($channel) + { + $profile = $this->user->getSubscriptions(0); + $nicknames=array(); + while ($profile->fetch()) { + $nicknames[]=$profile->nickname; + } + if(count($nicknames)==0){ + $out=_('You are not subscribed to anyone.'); + }else{ + $out = ngettext('You are subscribed to this person:', + 'You are subscribed to these people:', + count($nicknames)); + $out .= ' '; + $out .= implode(', ',$nicknames); + } + $channel->output($this->user,$out); + } +} + +class SubscribersCommand extends Command +{ + function execute($channel) + { + $profile = $this->user->getSubscribers(); + $nicknames=array(); + while ($profile->fetch()) { + $nicknames[]=$profile->nickname; + } + if(count($nicknames)==0){ + $out=_('No one is subscribed to you.'); + }else{ + $out = ngettext('This person is subscribed to you:', + 'These people are subscribed to you:', + count($nicknames)); + $out .= ' '; + $out .= implode(', ',$nicknames); + } + $channel->output($this->user,$out); + } +} + +class GroupsCommand extends Command +{ + function execute($channel) + { + $group = $this->user->getGroups(); + $groups=array(); + while ($group->fetch()) { + $groups[]=$group->nickname; + } + if(count($groups)==0){ + $out=_('You are not a member of any groups.'); + }else{ + $out = ngettext('You are a member of this group:', + 'You are a member of these groups:', + count($nicknames)); + $out.=implode(', ',$groups); + } + $channel->output($this->user,$out); + } +} + class HelpCommand extends Command { function execute($channel) @@ -615,6 +680,9 @@ class HelpCommand extends Command "off - turn off notifications\n". "help - show this help\n". "follow <nickname> - subscribe to user\n". + "groups - lists the groups you have joined\n". + "subscriptions - list the people you follow\n". + "subscribers - list the people that follow you\n". "leave <nickname> - unsubscribe from user\n". "d <nickname> <text> - direct message to user\n". "get <nickname> - get last notice from user\n". diff --git a/lib/commandinterpreter.php b/lib/commandinterpreter.php index d878fe268..665015afc 100644 --- a/lib/commandinterpreter.php +++ b/lib/commandinterpreter.php @@ -47,6 +47,24 @@ class CommandInterpreter } else { return new LoginCommand($user); } + case 'subscribers': + if ($arg) { + return null; + } else { + return new SubscribersCommand($user); + } + case 'subscriptions': + if ($arg) { + return null; + } else { + return new SubscriptionsCommand($user); + } + case 'groups': + if ($arg) { + return null; + } else { + return new GroupsCommand($user); + } case 'on': if ($arg) { list($other, $extra) = $this->split_arg($arg); diff --git a/lib/common.php b/lib/common.php index 6aac46807..063d7d9d9 100644 --- a/lib/common.php +++ b/lib/common.php @@ -19,6 +19,9 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } +//exit with 200 response, if this is checking fancy from the installer +if (isset($_REQUEST['p']) && $_REQUEST['p'] == 'check-fancy') { exit; } + define('STATUSNET_VERSION', '0.9.0dev'); define('LACONICA_VERSION', STATUSNET_VERSION); // compatibility @@ -38,12 +41,18 @@ define('FOREIGN_NOTICE_SEND_REPLY', 4); define('FOREIGN_FRIEND_SEND', 1); define('FOREIGN_FRIEND_RECV', 2); -define_syslog_variables(); - # append our extlib dir as the last-resort place to find libs set_include_path(get_include_path() . PATH_SEPARATOR . INSTALLDIR . '/extlib/'); +# To protect against upstream libraries which haven't updated +# for PHP 5.3 where dl() function may not be present... +if (!function_exists('dl')) { + function dl($library) { + return false; + } +} + # global configuration object require_once('PEAR.php'); @@ -229,7 +238,6 @@ require_once INSTALLDIR.'/lib/util.php'; require_once INSTALLDIR.'/lib/action.php'; require_once INSTALLDIR.'/lib/mail.php'; require_once INSTALLDIR.'/lib/subs.php'; -require_once INSTALLDIR.'/lib/Shorturl_api.php'; require_once INSTALLDIR.'/lib/clientexception.php'; require_once INSTALLDIR.'/lib/serverexception.php'; diff --git a/lib/deleteuserform.php b/lib/deleteuserform.php new file mode 100644 index 000000000..09ea8f68d --- /dev/null +++ b/lib/deleteuserform.php @@ -0,0 +1,79 @@ +<?php +/** + * StatusNet, the distributed open-source microblogging tool + * + * Form for deleting a user + * + * 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 Evan Prodromou <evan@status.net> + * @copyright 2009 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET')) { + exit(1); +} + +/** + * Form for deleting a user + * + * @category Form + * @package StatusNet + * @author Evan Prodromou <evan@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 DeleteUserForm extends ProfileActionForm +{ + /** + * Action this form provides + * + * @return string Name of the action, lowercased. + */ + + function target() + { + return 'deleteuser'; + } + + /** + * Title of the form + * + * @return string Title of the form, internationalized + */ + + function title() + { + return _('Delete'); + } + + /** + * Description of the form + * + * @return string description of the form, internationalized + */ + + function description() + { + return _('Delete this user'); + } +} diff --git a/lib/grouplist.php b/lib/grouplist.php index cc734bdd0..99bff9cdc 100644 --- a/lib/grouplist.php +++ b/lib/grouplist.php @@ -85,18 +85,18 @@ class GroupList extends Widget function showGroup() { - $this->out->elementStart('li', array('class' => 'profile', + $this->out->elementStart('li', array('class' => 'profile hentry', 'id' => 'group-' . $this->group->id)); $user = common_current_user(); - $this->out->elementStart('div', 'entity_profile vcard'); + $this->out->elementStart('div', 'entity_profile vcard entry-content'); $logo = ($this->group->stream_logo) ? $this->group->stream_logo : User_group::defaultLogo(AVATAR_STREAM_SIZE); $this->out->elementStart('a', array('href' => $this->group->homeUrl(), - 'class' => 'url', + 'class' => 'url entry-title', 'rel' => 'contact group')); $this->out->element('img', array('src' => $logo, 'class' => 'photo avatar', diff --git a/lib/jabber.php b/lib/jabber.php index 73f2ec660..a8e295ea5 100644 --- a/lib/jabber.php +++ b/lib/jabber.php @@ -176,7 +176,7 @@ function jabber_format_entry($profile, $notice) $xs = new XMLStringer(); $xs->elementStart('html', array('xmlns' => 'http://jabber.org/protocol/xhtml-im')); $xs->elementStart('body', array('xmlns' => 'http://www.w3.org/1999/xhtml')); - $xs->element("img", array('src'=> $profile->avatarUrl(AVATAR_MINI_SIZE) , 'alt' => $profile->nickname)); + $xs->element("img", array('src'=> $profile->avatarUrl(AVATAR_MINI_SIZE))); $xs->element('a', array('href' => $profile->profileurl), $profile->nickname); $xs->text(": "); @@ -185,11 +185,11 @@ function jabber_format_entry($profile, $notice) } else { $xs->raw(common_render_content($notice->content, $notice)); } - $xs->raw(" "); + $xs->text(" "); $xs->element('a', array( 'href'=>common_local_url('conversation', array('id' => $notice->conversation)).'#notice-'.$notice->id - ),sprintf(_('notice id: %s'),$notice->id)); + ),sprintf(_('[%s]'),$notice->id)); $xs->elementEnd('body'); $xs->elementEnd('html'); @@ -481,5 +481,5 @@ function jabber_public_notice($notice) function jabber_format_notice(&$profile, &$notice) { - return $profile->nickname . ': ' . $notice->content; + return $profile->nickname . ': ' . $notice->content . ' [' . $notice->id . ']'; } diff --git a/lib/mail.php b/lib/mail.php index 5218059e9..dffac3262 100644 --- a/lib/mail.php +++ b/lib/mail.php @@ -216,7 +216,8 @@ function mail_subscribe_notify($listenee, $listener) function mail_subscribe_notify_profile($listenee, $other) { - if ($listenee->email && $listenee->emailnotifysub) { + if ($other->hasRight(Right::EMAILONSUBSCRIBE) && + $listenee->email && $listenee->emailnotifysub) { // use the recipient's localization common_init_locale($listenee->language); @@ -545,6 +546,10 @@ function mail_notify_message($message, $from=null, $to=null) function mail_notify_fave($other, $user, $notice) { + if (!$user->hasRight(Right::EMAILONFAVE)) { + return; + } + $profile = $user->getProfile(); $bestname = $profile->getBestName(); @@ -594,10 +599,14 @@ function mail_notify_attn($user, $notice) $sender = $notice->getProfile(); + if (!$sender->hasRight(Right::EMAILONREPLY)) { + return; + } + $bestname = $sender->getBestName(); common_init_locale($user->language); - + if ($notice->conversation != $notice->id) { $conversationEmailText = "The full conversation can be read here:\n\n". "\t%5\$s\n\n "; @@ -607,9 +616,9 @@ function mail_notify_attn($user, $notice) $conversationEmailText = "%5\$s"; $conversationUrl = null; } - + $subject = sprintf(_('%s (@%s) sent a notice to your attention'), $bestname, $sender->nickname); - + $body = sprintf(_("%1\$s (@%9\$s) just sent a notice to your attention (an '@-reply') on %2\$s.\n\n". "The notice is here:\n\n". "\t%3\$s\n\n" . @@ -635,7 +644,7 @@ function mail_notify_attn($user, $notice) array('nickname' => $user->nickname)),//%7 common_local_url('emailsettings'), //%8 $sender->nickname); //%9 - + common_init_locale(); mail_to_user($user, $subject, $body); } diff --git a/lib/mailbox.php b/lib/mailbox.php index e1d384a06..90a58b4c4 100644 --- a/lib/mailbox.php +++ b/lib/mailbox.php @@ -282,7 +282,7 @@ class MailboxAction extends CurrentUserDesignAction $ns->name); $this->elementEnd('span'); } else { - $this->out->element('span', 'device', $source_name); + $this->element('span', 'device', $source_name); } break; } diff --git a/lib/oauthstore.php b/lib/oauthstore.php index a4ea5ad4d..b04bcbb8b 100644 --- a/lib/oauthstore.php +++ b/lib/oauthstore.php @@ -462,6 +462,10 @@ class StatusNetOAuthDataStore extends OAuthDataStore $subscribed = $this->_getAnyProfile($subscribed_user_uri); $subscriber = $this->_getAnyProfile($subscriber_uri); + if (!$subscriber->hasRight(Right::SUBSCRIBE)) { + return _('You have been banned from subscribing.'); + } + $sub->subscribed = $subscribed->id; $sub->subscriber = $subscriber->id; diff --git a/lib/plugin.php b/lib/plugin.php index 59bf3ba9d..87d7be5a7 100644 --- a/lib/plugin.php +++ b/lib/plugin.php @@ -76,18 +76,4 @@ class Plugin { return true; } - - /* - * the name of the shortener - * shortenerInfo associative array with additional information. One possible element is 'freeService' which can be true or false - * shortener array, first element is the name of the class, second element is an array to be passed as constructor parameters to the class - */ - function registerUrlShortener($name, $shortenerInfo, $shortener) - { - global $_shorteners; - if(!is_array($_shorteners)){ - $_shorteners=array(); - } - $_shorteners[$name]=array('info'=>$shortenerInfo, 'callInfo'=>$shortener); - } } diff --git a/lib/profileactionform.php b/lib/profileactionform.php new file mode 100644 index 000000000..24d4595c0 --- /dev/null +++ b/lib/profileactionform.php @@ -0,0 +1,187 @@ +<?php +/** + * StatusNet, the distributed open-source microblogging tool + * + * Superclass for forms that operate on a profile + * + * 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 Evan Prodromou <evan@status.net> + * @copyright 2009 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET')) { + exit(1); +} + +/** + * Superclass for forms that operate on a profile + * + * Certain forms (block, silence, userflag, sandbox, delete) work on + * a single profile and work almost the same. So, this form extracts + * a lot of the common code to simplify those forms. + * + * @category Form + * @package StatusNet + * @author Evan Prodromou <evan@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 ProfileActionForm extends Form +{ + /** + * Profile of user to act on + */ + + var $profile = null; + + /** + * Return-to args + */ + + var $args = null; + + /** + * Constructor + * + * @param HTMLOutputter $out output channel + * @param Profile $profile profile of user to act on + * @param array $args return-to args + */ + + function __construct($out=null, $profile=null, $args=null) + { + parent::__construct($out); + + $this->profile = $profile; + $this->args = $args; + } + + /** + * ID of the form + * + * @return int ID of the form + */ + + function id() + { + return $this->target() . '-' . $this->profile->id; + } + + /** + * class of the form + * + * @return string class of the form + */ + + function formClass() + { + return 'form_user_'.$this->target(); + } + + /** + * Action of the form + * + * @return string URL of the action + */ + + function action() + { + return common_local_url($this->target()); + } + + /** + * Legend of the Form + * + * @return void + */ + + function formLegend() + { + $this->out->element('legend', null, $this->description()); + } + + /** + * Data elements of the form + * + * @return void + */ + + function formData() + { + $action = $this->target(); + + $this->out->hidden($action.'to-' . $this->profile->id, + $this->profile->id, + 'profileid'); + + if ($this->args) { + foreach ($this->args as $k => $v) { + $this->out->hidden('returnto-' . $k, $v); + } + } + } + + /** + * Action elements + * + * @return void + */ + + function formActions() + { + $this->out->submit('submit', $this->title(), 'submit', + null, $this->description()); + } + + /** + * Action this form targets + * + * @return string Name of the action, lowercased. + */ + + function target() + { + return null; + } + + /** + * Title of the form + * + * @return string Title of the form, internationalized + */ + + function title() + { + return null; + } + + /** + * Description of the form + * + * @return string description of the form, internationalized + */ + + function description() + { + return null; + } +} diff --git a/lib/profileformaction.php b/lib/profileformaction.php new file mode 100644 index 000000000..8cb5f6a93 --- /dev/null +++ b/lib/profileformaction.php @@ -0,0 +1,139 @@ +<?php +/** + * Superclass for actions that operate on a user + * + * PHP version 5 + * + * StatusNet - the distributed open-source microblogging tool + * Copyright (C) 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/>. + * + * @category Action + * @package StatusNet + * @author Evan Prodromou <evan@status.net> + * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3 + * @link http://status.net/ + */ + +if (!defined('STATUSNET') && !defined('LACONICA')) { + exit(1); +} + +/** + * Superclass for actions that operate on a user + * + * @category Action + * @package StatusNet + * @author Evan Prodromou <evan@status.net> + * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3 + * @link http://status.net/ + */ + +class ProfileFormAction extends Action +{ + var $profile = null; + + /** + * Take arguments for running + * + * @param array $args $_REQUEST args + * + * @return boolean success flag + */ + + function prepare($args) + { + parent::prepare($args); + + $this->checkSessionToken(); + + if (!common_logged_in()) { + $this->clientError(_('Not logged in.')); + return false; + } + + $id = $this->trimmed('profileid'); + + if (!$id) { + $this->clientError(_('No profile specified.')); + return false; + } + + $this->profile = Profile::staticGet('id', $id); + + if (!$this->profile) { + $this->clientError(_('No profile with that ID.')); + return false; + } + + return true; + } + + /** + * Handle request + * + * Shows a page with list of favorite notices + * + * @param array $args $_REQUEST args; handled in prepare() + * + * @return void + */ + + function handle($args) + { + parent::handle($args); + + if ($_SERVER['REQUEST_METHOD'] == 'POST') { + $this->handlePost(); + $this->returnToArgs(); + } + } + + /** + * Return to the calling page based on hidden arguments + * + * @return void + */ + + function returnToArgs() + { + foreach ($this->args as $k => $v) { + if ($k == 'returnto-action') { + $action = $v; + } else if (substr($k, 0, 9) == 'returnto-') { + $args[substr($k, 9)] = $v; + } + } + + if ($action) { + common_redirect(common_local_url($action, $args), 303); + } else { + $this->clientError(_("No return-to arguments")); + } + } + + /** + * handle a POST request + * + * sub-classes should overload this request + * + * @return void + */ + + function handlePost() + { + $this->serverError(_("unimplemented method")); + } +} diff --git a/lib/profilelist.php b/lib/profilelist.php index bbb722701..3412d41d1 100644 --- a/lib/profilelist.php +++ b/lib/profilelist.php @@ -76,7 +76,7 @@ class ProfileList extends Widget function startList() { - $this->out->elementStart('ul', 'profiles'); + $this->out->elementStart('ul', 'profiles xoxo'); } function endList() @@ -140,7 +140,7 @@ class ProfileListItem extends Widget function startItem() { - $this->out->elementStart('li', array('class' => 'profile', + $this->out->elementStart('li', array('class' => 'profile hentry', 'id' => 'profile-' . $this->profile->id)); } @@ -175,14 +175,14 @@ class ProfileListItem extends Widget function startProfile() { - $this->out->elementStart('div', 'entity_profile vcard'); + $this->out->elementStart('div', 'entity_profile vcard entry-content'); } function showAvatar() { $avatar = $this->profile->getAvatar(AVATAR_STREAM_SIZE); $this->out->elementStart('a', array('href' => $this->profile->profileurl, - 'class' => 'url', + 'class' => 'url entry-title', 'rel' => 'contact')); $this->out->element('img', array('src' => ($avatar) ? $avatar->displayUrl() : Avatar::defaultImage(AVATAR_STREAM_SIZE), 'class' => 'photo avatar', diff --git a/lib/right.php b/lib/right.php index 4fc981af0..5e66eae0e 100644 --- a/lib/right.php +++ b/lib/right.php @@ -47,5 +47,15 @@ class Right { const DELETEOTHERSNOTICE = 'deleteothersnotice'; const CONFIGURESITE = 'configuresite'; + const DELETEUSER = 'deleteuser'; + const SILENCEUSER = 'silenceuser'; + const SANDBOXUSER = 'sandboxuser'; + const NEWNOTICE = 'newnotice'; + const PUBLICNOTICE = 'publicnotice'; + const NEWMESSAGE = 'newmessage'; + const SUBSCRIBE = 'subscribe'; + const EMAILONREPLY = 'emailonreply'; + const EMAILONSUBSCRIBE = 'emailonsubscribe'; + const EMAILONFAVE = 'emailonfave'; } diff --git a/lib/router.php b/lib/router.php index b143cd537..9629267ac 100644 --- a/lib/router.php +++ b/lib/router.php @@ -96,7 +96,10 @@ class Router 'unsubscribe', 'confirmaddress', 'recoverpassword', 'invite', 'favor', 'disfavor', 'sup', 'block', 'unblock', 'subedit', - 'groupblock', 'groupunblock'); + 'groupblock', 'groupunblock', + 'sandbox', 'unsandbox', + 'silence', 'unsilence', + 'deleteuser'); foreach ($main as $a) { $m->connect('main/'.$a, array('action' => $a)); diff --git a/lib/sandboxform.php b/lib/sandboxform.php new file mode 100644 index 000000000..7a98e0a5f --- /dev/null +++ b/lib/sandboxform.php @@ -0,0 +1,80 @@ +<?php +/** + * StatusNet, the distributed open-source microblogging tool + * + * Form for sandboxing a user + * + * 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 Evan Prodromou <evan@status.net> + * @copyright 2009 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET')) { + exit(1); +} + +/** + * Form for sandboxing a user + * + * @category Form + * @package StatusNet + * @author Evan Prodromou <evan@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 UnSandboxForm + */ + +class SandboxForm extends ProfileActionForm +{ + /** + * Action this form provides + * + * @return string Name of the action, lowercased. + */ + + function target() + { + return 'sandbox'; + } + + /** + * Title of the form + * + * @return string Title of the form, internationalized + */ + + function title() + { + return _('Sandbox'); + } + + /** + * Description of the form + * + * @return string description of the form, internationalized + */ + + function description() + { + return _('Sandbox this user'); + } +} diff --git a/lib/schema.php b/lib/schema.php index 1e0c1f3e9..560884d9f 100644 --- a/lib/schema.php +++ b/lib/schema.php @@ -373,6 +373,26 @@ class Schema } /** + * Ensures that the table that backs a given + * Plugin_DataObject class exists. + * + * If the table does not yet exist, it will + * create the table. If it does exist, it will + * alter the table to match the column definitions. + * + * @param Plugin_DataObject $dataObjectClass + * + * @return boolean success flag + */ + + public function ensureDataObject($dataObjectClass) + { + $obj = new $dataObjectClass(); + $tableDef = $obj->tableDef(); + return $this->ensureTable($tableDef->name,$tableDef->columns); + } + + /** * Ensures that a table exists with the given * name and the given column definitions. * @@ -544,6 +564,19 @@ class TableDef public $name; /** array of ColumnDef objects for the columns. */ public $columns; + + /** + * Constructor. + * + * @param string $name name of the table + * @param array $columns columns in the table + */ + + function __construct($name=null,$columns=null) + { + $this->name = $name; + $this->columns = $columns; + } } /** @@ -576,6 +609,8 @@ class ColumnDef /** 'extra' stuff. Returned by MySQL, largely * unused. */ public $extra; + /** auto increment this field if no value is specific for it during an insert **/ + public $auto_increment; /** * Constructor. @@ -591,7 +626,7 @@ class ColumnDef function __construct($name=null, $type=null, $size=null, $nullable=true, $key=null, $default=null, - $extra=null) + $extra=null, $auto_increment=false) { $this->name = strtolower($name); $this->type = strtolower($type); @@ -600,6 +635,7 @@ class ColumnDef $this->key = $key; $this->default = $default; $this->extra = $extra; + $this->auto_increment = $auto_increment; } /** @@ -617,7 +653,8 @@ class ColumnDef $this->_typeMatch($other) && $this->_defaultMatch($other) && $this->_nullMatch($other) && - $this->key == $other->key); + $this->key == $other->key && + $this->auto_increment == $other->auto_increment); } /** diff --git a/lib/silenceform.php b/lib/silenceform.php new file mode 100644 index 000000000..9673fa120 --- /dev/null +++ b/lib/silenceform.php @@ -0,0 +1,80 @@ +<?php +/** + * StatusNet, the distributed open-source microblogging tool + * + * Form for silencing a user + * + * 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 Evan Prodromou <evan@status.net> + * @copyright 2009 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET')) { + exit(1); +} + +/** + * Form for silencing a user + * + * @category Form + * @package StatusNet + * @author Evan Prodromou <evan@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 UnSilenceForm + */ + +class SilenceForm extends ProfileActionForm +{ + /** + * Action this form provides + * + * @return string Name of the action, lowercased. + */ + + function target() + { + return 'silence'; + } + + /** + * Title of the form + * + * @return string Title of the form, internationalized + */ + + function title() + { + return _('Silence'); + } + + /** + * Description of the form + * + * @return string description of the form, internationalized + */ + + function description() + { + return _('Silence this user'); + } +} diff --git a/lib/subs.php b/lib/subs.php index 934380b76..2fc3160de 100644 --- a/lib/subs.php +++ b/lib/subs.php @@ -44,6 +44,10 @@ function subs_subscribe_user($user, $other_nickname) function subs_subscribe_to($user, $other) { + if (!$user->hasRight(Right::SUBSCRIBE)) { + return _('You have been banned from subscribing.'); + } + if ($user->isSubscribed($other)) { return _('Already subscribed!'); } @@ -121,7 +125,7 @@ function subs_unsubscribe_user($user, $other_nickname) function subs_unsubscribe_to($user, $other) { if (!$user->isSubscribed($other)) - return _('Not subscribed!.'); + return _('Not subscribed!'); $sub = DB_DataObject::factory('subscription'); diff --git a/lib/unblockform.php b/lib/unblockform.php index f1343757c..4fe28b21a 100644 --- a/lib/unblockform.php +++ b/lib/unblockform.php @@ -28,12 +28,10 @@ * @link http://status.net/ */ -if (!defined('STATUSNET') && !defined('LACONICA')) { +if (!defined('STATUSNET')) { exit(1); } -require_once INSTALLDIR.'/lib/form.php'; - /** * Form for unblocking a user * @@ -47,106 +45,38 @@ require_once INSTALLDIR.'/lib/form.php'; * @see BlockForm */ -class UnblockForm extends Form +class UnblockForm extends ProfileActionForm { /** - * Profile of user to unblock - */ - - var $profile = null; - - /** - * Return-to args - */ - - var $args = null; - - /** - * Constructor - * - * @param HTMLOutputter $out output channel - * @param Profile $profile profile of user to unblock - * @param array $args return-to args - */ - - function __construct($out=null, $profile=null, $args=null) - { - parent::__construct($out); - - $this->profile = $profile; - $this->args = $args; - } - - /** - * ID of the form - * - * @return int ID of the form - */ - - function id() - { - return 'unblock-' . $this->profile->id; - } - - /** - * class of the form + * Action this form provides * - * @return string class of the form + * @return string Name of the action, lowercased. */ - function formClass() + function target() { - return 'form_user_unblock'; + return 'unblock'; } /** - * Action of the form - * - * @return string URL of the action - */ - - function action() - { - return common_local_url('unblock'); - } - - /** - * Legend of the Form - * - * @return void - */ - function formLegend() - { - $this->out->element('legend', null, _('Unblock this user')); - } - - - /** - * Data elements of the form + * Title of the form * - * @return void + * @return string Title of the form, internationalized */ - function formData() + function title() { - $this->out->hidden('unblockto-' . $this->profile->id, - $this->profile->id, - 'unblockto'); - if ($this->args) { - foreach ($this->args as $k => $v) { - $this->out->hidden('returnto-' . $k, $v); - } - } + return _('Unblock'); } /** - * Action elements + * Description of the form * - * @return void + * @return string description of the form, internationalized */ - function formActions() + function description() { - $this->out->submit('submit', _('Unblock'), 'submit', null, _('Unblock this user')); + return _('Unlock this user'); } } diff --git a/lib/unsandboxform.php b/lib/unsandboxform.php new file mode 100644 index 000000000..a77634244 --- /dev/null +++ b/lib/unsandboxform.php @@ -0,0 +1,82 @@ +<?php +/** + * StatusNet, the distributed open-source microblogging tool + * + * Form for unsandboxing a user + * + * 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 Evan Prodromou <evan@status.net> + * @copyright 2009 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET')) { + exit(1); +} + +/** + * Form for unsandboxing a user + * + * Removes the "sandboxed" role for a user. + * + * @category Form + * @package StatusNet + * @author Evan Prodromou <evan@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 UnSandboxForm + */ + +class UnsandboxForm extends ProfileActionForm +{ + /** + * Action this form provides + * + * @return string Name of the action, lowercased. + */ + + function target() + { + return 'unsandbox'; + } + + /** + * Title of the form + * + * @return string Title of the form, internationalized + */ + + function title() + { + return _('Unsandbox'); + } + + /** + * Description of the form + * + * @return string description of the form, internationalized + */ + + function description() + { + return _('Unsandbox this user'); + } +} diff --git a/lib/unsilenceform.php b/lib/unsilenceform.php new file mode 100644 index 000000000..ac02b8b6c --- /dev/null +++ b/lib/unsilenceform.php @@ -0,0 +1,80 @@ +<?php +/** + * StatusNet, the distributed open-source microblogging tool + * + * Form for unsilencing a user + * + * 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 Evan Prodromou <evan@status.net> + * @copyright 2009 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET')) { + exit(1); +} + +/** + * Form for unsilencing a user + * + * @category Form + * @package StatusNet + * @author Evan Prodromou <evan@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 SilenceForm + */ + +class UnSilenceForm extends ProfileActionForm +{ + /** + * Action this form provides + * + * @return string Name of the action, lowercased. + */ + + function target() + { + return 'unsilence'; + } + + /** + * Title of the form + * + * @return string Title of the form, internationalized + */ + + function title() + { + return _('Unsilence'); + } + + /** + * Description of the form + * + * @return string description of the form, internationalized + */ + + function description() + { + return _('Unsilence this user'); + } +} diff --git a/lib/userprofile.php b/lib/userprofile.php index 4f9d4984f..ee205af85 100644 --- a/lib/userprofile.php +++ b/lib/userprofile.php @@ -283,22 +283,57 @@ class UserProfile extends Widget } } + // return-to args, so we don't have to keep re-writing them + + list($action, $r2args) = $this->out->returnToArgs(); + + // push the action into the list + + $r2args['action'] = $action; + // block/unblock $blocked = $cur->hasBlocked($this->profile); $this->out->elementStart('li', 'entity_block'); if ($blocked) { - $ubf = new UnblockForm($this->out, $this->profile, - array('action' => 'showstream', - 'nickname' => $this->profile->nickname)); + $ubf = new UnblockForm($this->out, $this->profile, $r2args); $ubf->show(); } else { - $bf = new BlockForm($this->out, $this->profile, - array('action' => 'showstream', - 'nickname' => $this->profile->nickname)); + $bf = new BlockForm($this->out, $this->profile, $r2args); $bf->show(); } $this->out->elementEnd('li'); + + if ($cur->hasRight(Right::SANDBOXUSER)) { + $this->out->elementStart('li', 'entity_sandbox'); + if ($this->user->isSandboxed()) { + $usf = new UnSandboxForm($this->out, $this->profile, $r2args); + $usf->show(); + } else { + $sf = new SandboxForm($this->out, $this->profile, $r2args); + $sf->show(); + } + $this->out->elementEnd('li'); + } + + if ($cur->hasRight(Right::SILENCEUSER)) { + $this->out->elementStart('li', 'entity_silence'); + if ($this->user->isSilenced()) { + $usf = new UnSilenceForm($this->out, $this->profile, $r2args); + $usf->show(); + } else { + $sf = new SilenceForm($this->out, $this->profile, $r2args); + $sf->show(); + } + $this->out->elementEnd('li'); + } + + if ($cur->hasRight(Right::DELETEUSER)) { + $this->out->elementStart('li', 'entity_delete'); + $df = new DeleteUserForm($this->out, $this->profile, $r2args); + $df->show(); + $this->out->elementEnd('li'); + } } } diff --git a/lib/util.php b/lib/util.php index 81160d052..68f3520db 100644 --- a/lib/util.php +++ b/lib/util.php @@ -350,8 +350,11 @@ function common_current_user() common_ensure_session(); $id = isset($_SESSION['userid']) ? $_SESSION['userid'] : false; if ($id) { - $_cur = User::staticGet($id); - return $_cur; + $user = User::staticGet($id); + if ($user) { + $_cur = $user; + return $_cur; + } } } @@ -1420,25 +1423,18 @@ function common_shorten_url($long_url) if (empty($user)) { // common current user does not find a user when called from the XMPP daemon // therefore we'll set one here fix, so that XMPP given URLs may be shortened - $svc = 'ur1.ca'; + $shortenerName = 'ur1.ca'; } else { - $svc = $user->urlshorteningservice; - } - global $_shorteners; - if (!isset($_shorteners[$svc])) { - //the user selected service doesn't exist, so default to ur1.ca - $svc = 'ur1.ca'; - } - if (!isset($_shorteners[$svc])) { - // no shortener plugins installed. - return $long_url; + $shortenerName = $user->urlshorteningservice; } - $reflectionObj = new ReflectionClass($_shorteners[$svc]['callInfo'][0]); - $short_url_service = $reflectionObj->newInstanceArgs($_shorteners[$svc]['callInfo'][1]); - $short_url = $short_url_service->shorten($long_url); - - return $short_url; + if(Event::handle('StartShortenUrl', array($long_url,$shortenerName,&$shortenedUrl))){ + //URL wasn't shortened, so return the long url + return $long_url; + }else{ + //URL was shortened, so return the result + return $shortenedUrl; + } } function common_client_ip() diff --git a/locale/ar/LC_MESSAGES/statusnet.mo b/locale/ar/LC_MESSAGES/statusnet.mo Binary files differindex 396f81227..9d156ce91 100644 --- a/locale/ar/LC_MESSAGES/statusnet.mo +++ b/locale/ar/LC_MESSAGES/statusnet.mo diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po index d5000e633..8cbdb40b1 100644 --- a/locale/ar/LC_MESSAGES/statusnet.po +++ b/locale/ar/LC_MESSAGES/statusnet.po @@ -6,12 +6,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-10 20:53+0000\n" -"PO-Revision-Date: 2009-11-10 20:58:39+0000\n" +"POT-Creation-Date: 2009-11-16 19:42+0000\n" +"PO-Revision-Date: 2009-11-16 19:42:46+0000\n" "Language-Team: Arabic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ar\n" "X-Message-Group: out-statusnet\n" @@ -22,12 +22,15 @@ msgid "No such page" msgstr "لا صÙØØ© كهذه" #: actions/all.php:74 actions/allrss.php:68 -#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofilebackgroundimage.php:116 +#: actions/apiaccountupdateprofileimage.php:105 +#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 #: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 #: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 @@ -105,35 +108,41 @@ msgstr "أنت والأصدقاء" msgid "Updates from %1$s and friends on %2$s!" msgstr "" -#: actions/apiaccountratelimitstatus.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 -#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:129 actions/apigroupcreate.php:184 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120 -#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101 -#: actions/apigroupshow.php:105 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144 -#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141 -#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130 -#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163 -#: actions/apiusershow.php:101 -msgid "API method not found!" -msgstr "" +#: actions/apiaccountratelimitstatus.php:70 +#: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofilebackgroundimage.php:94 +#: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apiaccountupdateprofile.php:97 +#, fuzzy +msgid "API method not found." +msgstr "لم يوجد رمز التأكيد." -#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 +#: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofilebackgroundimage.php:86 +#: actions/apiaccountupdateprofilecolors.php:110 +#: actions/apiaccountupdateprofileimage.php:84 +#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109 +#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "" +#: actions/apiaccountupdatedeliverydevice.php:105 +msgid "" +"You must specify a parameter named 'device' with a value of one of: sms, im, " +"none" +msgstr "" + +#: actions/apiaccountupdatedeliverydevice.php:132 +msgid "Could not update user." +msgstr "تعذّر تØديث المستخدم." + +#: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 #: actions/newnotice.php:94 lib/designsettings.php:283 #, php-format msgid "" @@ -141,15 +150,35 @@ msgid "" "current configuration." msgstr "" -#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/apiaccountupdateprofilebackgroundimage.php:136 +#: actions/apiaccountupdateprofilebackgroundimage.php:146 +#: actions/apiaccountupdateprofilecolors.php:164 +#: actions/apiaccountupdateprofilecolors.php:174 +msgid "Unable to save your design settings." +msgstr "" + +#: actions/apiaccountupdateprofilebackgroundimage.php:187 +#: actions/apiaccountupdateprofilecolors.php:142 +msgid "Could not update your design." +msgstr "تعذّر تØديث تصميمك." + +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 +#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 #: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 msgid "User has no profile." msgstr "ليس للمستخدم مل٠شخصي." +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "تعذّر ØÙظ المل٠الشخصي." + #: actions/apiblockcreate.php:108 msgid "Block user failed." -msgstr "" +msgstr "Ùشل منع المستخدم." #: actions/apiblockdestroy.php:107 msgid "Unblock user failed." @@ -175,7 +204,7 @@ msgstr "" #: actions/apidirectmessage.php:89 #, php-format msgid "Direct messages from %s" -msgstr "" +msgstr "رسائل مباشرة من %s" #: actions/apidirectmessage.php:93 #, php-format @@ -185,13 +214,30 @@ msgstr "" #: actions/apidirectmessage.php:101 #, php-format msgid "Direct messages to %s" -msgstr "" +msgstr "رسالة مباشرة %s" #: actions/apidirectmessage.php:105 #, php-format msgid "All the direct messages sent to %s" msgstr "" +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 +#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 +#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 +#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149 +#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +msgid "API method not found!" +msgstr "" + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -207,7 +253,7 @@ msgstr "تعذّر إنشاء Ù…Ùضلة." #: actions/apifavoritedestroy.php:122 msgid "That status is not a favorite!" -msgstr "" +msgstr "تلك الØالة ليست Ù…Ùضلة!" #: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 msgid "Could not delete favorite." @@ -306,7 +352,7 @@ msgstr "" #: actions/newgroup.php:168 #, php-format msgid "Invalid alias: \"%s\"" -msgstr "" +msgstr "كنية غير صالØØ©: \"%s\"" #: actions/apigroupcreate.php:321 actions/editgroup.php:228 #: actions/newgroup.php:172 @@ -349,7 +395,7 @@ msgstr "مجموعات %s" #: actions/apigrouplistall.php:94 #, php-format msgid "groups on %s" -msgstr "" +msgstr "مجموعات %s" #: actions/apigrouplist.php:95 #, php-format @@ -377,17 +423,17 @@ msgstr "ØÙØ°ÙÙت الØالة." msgid "No status with that ID found." msgstr "" -#: actions/apistatusesupdate.php:152 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 #: scripts/maildaemon.php:71 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" -#: actions/apistatusesupdate.php:193 +#: actions/apistatusesupdate.php:198 msgid "Not found" msgstr "لم يوجد" -#: actions/apistatusesupdate.php:216 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:227 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -410,7 +456,7 @@ msgstr "" #: actions/grouprss.php:131 actions/userrss.php:90 #, php-format msgid "%s timeline" -msgstr "" +msgstr "مسار %s الزمني" #: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125 #: actions/userrss.php:92 @@ -441,7 +487,7 @@ msgstr "" #: actions/apitimelinetag.php:101 actions/tag.php:66 #, php-format msgid "Notices tagged with %s" -msgstr "" +msgstr "الإشعارات الموسومة ب%s" #: actions/apitimelinetag.php:107 actions/tagrss.php:64 #, php-format @@ -469,7 +515,7 @@ msgid "Invalid size." msgstr "Øجم غير صالØ." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:113 +#: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "Ø£Ùتار" @@ -492,7 +538,7 @@ msgstr "إعدادات الأÙتار" #: actions/avatarsettings.php:126 actions/avatarsettings.php:202 #: actions/grouplogo.php:199 actions/grouplogo.php:259 msgid "Original" -msgstr "" +msgstr "الأصلي" #: actions/avatarsettings.php:141 actions/avatarsettings.php:214 #: actions/grouplogo.php:210 actions/grouplogo.php:271 @@ -517,7 +563,7 @@ msgstr "" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:151 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -631,9 +677,8 @@ msgid "No" msgstr "لا" #: actions/block.php:149 -#, fuzzy msgid "Do not block this user" -msgstr "ألغ٠منع هذا المستخدم" +msgstr "لا تمنع هذا المستخدم" #: actions/block.php:150 actions/deletenotice.php:146 #: actions/groupblock.php:179 @@ -643,7 +688,7 @@ msgstr "نعم" #: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123 #: lib/blockform.php:153 msgid "Block this user" -msgstr "" +msgstr "امنع هذا المستخدم" #: actions/block.php:165 msgid "You have already blocked this user." @@ -667,7 +712,7 @@ msgstr "لم يوجد رمز التأكيد." #: actions/confirmaddress.php:85 msgid "That confirmation code is not for you!" -msgstr "" +msgstr "رمز التأكيد ليس لك!" #: actions/confirmaddress.php:90 #, php-format @@ -725,11 +770,11 @@ msgstr "" #: actions/deletenotice.php:109 actions/deletenotice.php:141 msgid "Delete notice" -msgstr "اØذ٠الملاØظة" +msgstr "اØذ٠الإشعار" #: actions/deletenotice.php:144 msgid "Are you sure you want to delete this notice?" -msgstr "أمتأكد من أنك تريد Øذ٠هذه الملاØظة؟" +msgstr "أمتأكد من أنك تريد Øذ٠هذا الإشعار؟" #: actions/deletenotice.php:145 msgid "Do not delete this notice" @@ -737,7 +782,7 @@ msgstr "لا تØذ٠هذا الإشعار" #: actions/deletenotice.php:146 lib/noticelist.php:522 msgid "Delete this notice" -msgstr "" +msgstr "اØذ٠هذا الإشعار" #: actions/deletenotice.php:157 msgid "There was a problem with your session token. Try again, please." @@ -745,7 +790,7 @@ msgstr "" #: actions/disfavor.php:81 msgid "This notice is not a favorite!" -msgstr "" +msgstr "هذا الشعار ليس Ù…Ùضلًا!" #: actions/disfavor.php:94 msgid "Add to favorites" @@ -753,12 +798,12 @@ msgstr "أض٠إلى المÙضلات" #: actions/doc.php:69 msgid "No such document." -msgstr "" +msgstr "لا مستند كهذا." #: actions/editgroup.php:56 #, php-format msgid "Edit %s group" -msgstr "" +msgstr "عدّل مجموعة %s" #: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65 msgid "You must be logged in to create a group." @@ -767,11 +812,11 @@ msgstr "" #: actions/editgroup.php:103 actions/editgroup.php:168 #: actions/groupdesignsettings.php:104 actions/grouplogo.php:106 msgid "You must be an admin to edit the group" -msgstr "" +msgstr "يجب أن تكون إداريًا لتعدّل المجموعة" #: actions/editgroup.php:154 msgid "Use this form to edit the group." -msgstr "" +msgstr "استخدم هذا النموذج لتعديل المجموعة." #: actions/editgroup.php:201 actions/newgroup.php:145 #, php-format @@ -840,7 +885,7 @@ msgstr "البريد الإلكتروني الوارد" #: actions/emailsettings.php:138 actions/smssettings.php:157 msgid "Send email to this address to post new notices." -msgstr "" +msgstr "أرسل بريدًا إلكترونيًا إلى هذا العنوان لترسل إشعارات جديدة." #: actions/emailsettings.php:145 actions/smssettings.php:162 msgid "Make a new email address for posting to; cancels the old one." @@ -934,7 +979,7 @@ msgstr "" #: actions/emailsettings.php:382 actions/imsettings.php:355 msgid "That is the wrong IM address." -msgstr "" +msgstr "هذا عنوان Ù…Øادثة Ùورية خاطئ." #: actions/emailsettings.php:394 actions/imsettings.php:367 #: actions/smssettings.php:386 @@ -948,7 +993,7 @@ msgstr "هذا ليس عنوان بريدك الإلكتروني." #: actions/emailsettings.php:431 actions/imsettings.php:408 #: actions/smssettings.php:425 msgid "The address was removed." -msgstr "" +msgstr "أزيل هذا العنوان." #: actions/emailsettings.php:445 actions/smssettings.php:518 msgid "No incoming email address." @@ -1015,7 +1060,7 @@ msgstr "" #: actions/favor.php:92 lib/disfavorform.php:140 msgid "Disfavor favorite" -msgstr "" +msgstr "ألغ٠تÙضيل المÙضلة" #: actions/featured.php:69 lib/featureduserssection.php:87 #: lib/publicgroupnav.php:89 @@ -1050,11 +1095,11 @@ msgstr "لا مرÙقات مرÙوعة" #: actions/finishremotesubscribe.php:69 msgid "Not expecting this response!" -msgstr "" +msgstr "لم أتوقع هذا الرد!" #: actions/finishremotesubscribe.php:80 msgid "User being listened to does not exist." -msgstr "" +msgstr "المستخدم الذي تستمع إليه غير موجود." #: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59 msgid "You can use the local subscription!" @@ -1066,7 +1111,7 @@ msgstr "" #: actions/finishremotesubscribe.php:106 msgid "You are not authorized." -msgstr "" +msgstr "لا تملك تصريØًا." #: actions/finishremotesubscribe.php:109 msgid "Could not convert request token to access token." @@ -1109,7 +1154,7 @@ msgstr "" #: actions/groupblock.php:100 msgid "User is not a member of group." -msgstr "" +msgstr "المستخدم ليس عضوًا ÙÙŠ المجموعة." #: actions/groupblock.php:136 actions/groupmembers.php:314 msgid "Block user from group" @@ -1141,7 +1186,7 @@ msgstr "لا هوية" #: actions/groupdesignsettings.php:68 msgid "You must be logged in to edit a group." -msgstr "" +msgstr "يجب أن تلج لتÙعدّل المجموعات." #: actions/groupdesignsettings.php:141 msgid "Group design" @@ -1156,7 +1201,7 @@ msgstr "" #: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186 #: lib/designsettings.php:434 lib/designsettings.php:464 msgid "Couldn't update your design." -msgstr "" +msgstr "تعذّر تØديث تصميمك." #: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 @@ -1184,16 +1229,16 @@ msgstr "" #: actions/grouplogo.php:396 msgid "Logo updated." -msgstr "" +msgstr "ØÙدّث الشعار." #: actions/grouplogo.php:398 msgid "Failed updating logo." -msgstr "" +msgstr "Ùشل رÙع الشعار." #: actions/groupmembers.php:93 lib/groupnav.php:92 #, php-format msgid "%s group members" -msgstr "" +msgstr "أعضاء مجموعة %s" #: actions/groupmembers.php:96 #, php-format @@ -1293,7 +1338,7 @@ msgstr "" #: actions/groupunblock.php:128 actions/unblock.php:108 msgid "Error removing the block." -msgstr "" +msgstr "خطأ أثناء منع الØجب." #: actions/imsettings.php:59 msgid "IM Settings" @@ -1358,7 +1403,7 @@ msgstr "" #: actions/imsettings.php:296 msgid "Not a valid Jabber ID" -msgstr "" +msgstr "ليست هوية جابر صالØØ©" #: actions/imsettings.php:299 msgid "That is already your Jabber ID." @@ -1409,11 +1454,11 @@ msgstr "عنوان بريد إلكتروني غير صالØ: %s" #: actions/invite.php:110 msgid "Invitation(s) sent" -msgstr "" +msgstr "Ø£Ùرسلت الدعوة" #: actions/invite.php:112 msgid "Invite new users" -msgstr "" +msgstr "ادع٠مستخدمين جددًا" #: actions/invite.php:128 msgid "You are already subscribed to these users:" @@ -1422,7 +1467,7 @@ msgstr "" #: actions/invite.php:131 actions/invite.php:139 #, php-format msgid "%s (%s)" -msgstr "" +msgstr "%s (%s)" #: actions/invite.php:136 msgid "" @@ -1516,7 +1561,7 @@ msgstr "" #: actions/joingroup.php:135 lib/command.php:239 #, php-format msgid "%s joined group %s" -msgstr "" +msgstr "%s انضم إلى مجموعة %s" #: actions/leavegroup.php:60 msgid "You must be logged in to leave a group." @@ -1573,7 +1618,7 @@ msgid "Nickname" msgstr "الاسم المستعار" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:116 msgid "Password" msgstr "كلمة السر" @@ -1623,7 +1668,7 @@ msgstr "" #: actions/microsummary.php:69 msgid "No current status" -msgstr "" +msgstr "لا Øالة Øالية" #: actions/newgroup.php:53 msgid "New group" @@ -1631,7 +1676,7 @@ msgstr "مجموعة جديدة" #: actions/newgroup.php:110 msgid "Use this form to create a new group." -msgstr "" +msgstr "استخدم هذا النموذج لإنشاء مجموعة جديدة." #: actions/newmessage.php:71 actions/newmessage.php:231 msgid "New message" @@ -1666,7 +1711,7 @@ msgstr "" #: actions/newmessage.php:210 actions/newnotice.php:233 lib/channel.php:170 msgid "Ajax Error" -msgstr "" +msgstr "خطأ أجاكس" #: actions/newnotice.php:69 msgid "New notice" @@ -1702,7 +1747,7 @@ msgstr "" #: actions/noticesearch.php:124 #, php-format msgid "" -"Why not [register an account](%%%%action.register%%%%) and be the first to " +"Why not [register an account](%%%%action.register%%%%) and be the first to " "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" msgstr "" @@ -1723,11 +1768,11 @@ msgstr "" #: actions/nudge.php:94 msgid "Nudge sent" -msgstr "" +msgstr "أرسل التنبيه" #: actions/nudge.php:97 msgid "Nudge sent!" -msgstr "" +msgstr "Ø£Ùرسل التنبيه!" #: actions/oembed.php:79 actions/shownotice.php:100 msgid "Notice has no profile" @@ -1746,18 +1791,18 @@ msgstr "نوع المØتوى " msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963 -#: lib/api.php:991 lib/api.php:1101 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 +#: lib/api.php:1027 lib/api.php:1137 msgid "Not a supported data format." msgstr "" #: actions/opensearch.php:64 msgid "People Search" -msgstr "" +msgstr "بØØ« الأشخاص" #: actions/opensearch.php:67 msgid "Notice Search" -msgstr "" +msgstr "بØØ« الإشعارات" #: actions/othersettings.php:60 msgid "Other Settings" @@ -1767,17 +1812,21 @@ msgstr "إعدادات أخرى" msgid "Manage various other options." msgstr "" -#: actions/othersettings.php:117 +#: actions/othersettings.php:108 +msgid " (free service)" +msgstr " (خدمة Øرة)" + +#: actions/othersettings.php:116 msgid "Shorten URLs with" msgstr "قصّر المسارات بـ" -#: actions/othersettings.php:118 +#: actions/othersettings.php:117 msgid "Automatic shortening service to use." -msgstr "" +msgstr "خدمة التقصير المطلوب استخدامها." #: actions/othersettings.php:122 msgid "View profile designs" -msgstr "" +msgstr "اعرض تصاميم المل٠الشخصي" #: actions/othersettings.php:123 msgid "Show or hide profile designs." @@ -1805,65 +1854,60 @@ msgstr "" msgid "Change password" msgstr "غيّر كلمة السر" -#: actions/passwordsettings.php:70 -#, fuzzy -msgid "You are not allowed to change your password" -msgstr "غير كلمة سرّك" - -#: actions/passwordsettings.php:82 +#: actions/passwordsettings.php:69 msgid "Change your password." msgstr "غيّر كلمة سرك." -#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:96 actions/recoverpassword.php:231 msgid "Password change" msgstr "تغيير كلمة السر" -#: actions/passwordsettings.php:117 +#: actions/passwordsettings.php:104 msgid "Old password" msgstr "كلمة السر القديمة" -#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:108 actions/recoverpassword.php:235 msgid "New password" msgstr "كلمة سر جديدة" -#: actions/passwordsettings.php:122 +#: actions/passwordsettings.php:109 msgid "6 or more characters" msgstr "" -#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:112 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" -msgstr "أكد" +msgstr "أكّد" -#: actions/passwordsettings.php:126 +#: actions/passwordsettings.php:113 msgid "same as password above" -msgstr "" +msgstr "Ù†Ùس كلمة السر أعلاه" -#: actions/passwordsettings.php:130 +#: actions/passwordsettings.php:117 msgid "Change" msgstr "غيّر" -#: actions/passwordsettings.php:167 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "" -#: actions/passwordsettings.php:170 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:233 msgid "Passwords don't match." msgstr "كلمتا السر غير متطابقتين." -#: actions/passwordsettings.php:178 +#: actions/passwordsettings.php:165 msgid "Incorrect old password" msgstr "كلمة السر القديمة غير صØÙŠØØ©" -#: actions/passwordsettings.php:194 +#: actions/passwordsettings.php:181 msgid "Error saving user; invalid." msgstr "خطأ أثناء ØÙظ المستخدم؛ غير صالØ." -#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 msgid "Can't save new password." -msgstr "" +msgstr "تعذّر ØÙظ كلمة السر الجديدة." -#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:192 actions/recoverpassword.php:211 msgid "Password saved." msgstr "ØÙÙظت كلمة السر." @@ -1876,7 +1920,7 @@ msgstr "" #: actions/peoplesearch.php:58 msgid "People search" -msgstr "" +msgstr "بØØ« الأشخاص" #: actions/peopletag.php:70 #, php-format @@ -1899,7 +1943,7 @@ msgstr "" #: actions/profilesettings.php:60 msgid "Profile settings" -msgstr "" +msgstr "إعدادات المل٠الشخصي" #: actions/profilesettings.php:71 msgid "" @@ -1936,7 +1980,7 @@ msgstr "" #: actions/profilesettings.php:125 actions/register.php:463 msgid "Describe yourself and your interests" -msgstr "" +msgstr "صÙÙ Ù†Ùسك واهتماماتك" #: actions/profilesettings.php:127 actions/register.php:465 msgid "Bio" @@ -2013,7 +2057,7 @@ msgstr "تعذّر ØÙظ المل٠الشخصي." #: actions/profilesettings.php:336 msgid "Couldn't save tags." -msgstr "" +msgstr "تعذّر ØÙظ الوسوم." #: actions/profilesettings.php:344 msgid "Settings saved." @@ -2022,7 +2066,7 @@ msgstr "ØÙÙظت الإعدادات." #: actions/public.php:83 #, php-format msgid "Beyond the page limit (%s)" -msgstr "" +msgstr "وراء Øد الصÙØØ© (%s)" #: actions/public.php:92 msgid "Could not retrieve public stream." @@ -2031,7 +2075,7 @@ msgstr "" #: actions/public.php:129 #, php-format msgid "Public timeline, page %d" -msgstr "" +msgstr "المسار الزمني العام، صÙØØ© %d" #: actions/public.php:131 lib/publicgroupnav.php:79 msgid "Public timeline" @@ -2074,6 +2118,10 @@ msgid "" "tool. [Join now](%%action.register%%) to share notices about yourself with " "friends, family, and colleagues! ([Read more](%%doc.help%%))" msgstr "" +"هنا %%site.name%%ØŒ خدمة [التدوين المÙصغّر](http://en.wikipedia.org/wiki/Micro-" +"blogging) المبنية على البرنامج الØر [StatusNet](http://status.net/). [انضم " +"الآن](%%action.register%%) لتشارك اشعاراتك مع أصدقائك وعائلتك وزملائك! " +"([اقرأ المزيد](%%doc.help%%))" #: actions/public.php:238 #, php-format @@ -2082,10 +2130,12 @@ msgid "" "blogging) service based on the Free Software [StatusNet](http://status.net/) " "tool." msgstr "" +"هنا %%site.name%%ØŒ خدمة [التدوين المÙصغّر](http://en.wikipedia.org/wiki/Micro-" +"blogging) المبنية على البرنامج الØر [StatusNet](http://status.net/)." #: actions/publictagcloud.php:57 msgid "Public tag cloud" -msgstr "" +msgstr "سØابة الوسوم العمومية" #: actions/publictagcloud.php:63 #, php-format @@ -2099,7 +2149,7 @@ msgstr "" #: actions/publictagcloud.php:72 msgid "Be the first to post one!" -msgstr "" +msgstr "كن أول من ÙŠÙرسل!" #: actions/publictagcloud.php:75 #, php-format @@ -2114,7 +2164,7 @@ msgstr "سØابة الوسوم" #: actions/recoverpassword.php:36 msgid "You are already logged in!" -msgstr "" +msgstr "أنت والج بالÙعل!" #: actions/recoverpassword.php:62 msgid "No such recovery code." @@ -2134,7 +2184,7 @@ msgstr "خطأ ÙÙŠ رمز التأكيد." #: actions/recoverpassword.php:97 msgid "This confirmation code is too old. Please start again." -msgstr "" +msgstr "رمز التأكيد هذا قديم جدًا. من Ùضلك ابدأ من جديد." #: actions/recoverpassword.php:111 msgid "Could not update user with confirmed email address." @@ -2152,7 +2202,7 @@ msgstr "" #: actions/recoverpassword.php:188 msgid "Password recovery" -msgstr "" +msgstr "استعادة كلمة السر" #: actions/recoverpassword.php:191 msgid "Nickname or email address" @@ -2164,7 +2214,7 @@ msgstr "" #: actions/recoverpassword.php:199 actions/recoverpassword.php:200 msgid "Recover" -msgstr "" +msgstr "استرجع" #: actions/recoverpassword.php:208 msgid "Reset password" @@ -2172,11 +2222,11 @@ msgstr "أعد ضبط كلمة السر" #: actions/recoverpassword.php:209 msgid "Recover password" -msgstr "" +msgstr "استعد كلمة السر" #: actions/recoverpassword.php:210 actions/recoverpassword.php:322 msgid "Password recovery requested" -msgstr "" +msgstr "Ø·Ùلبت استعادة كلمة السر" #: actions/recoverpassword.php:213 msgid "Unknown action" @@ -2188,15 +2238,15 @@ msgstr "" #: actions/recoverpassword.php:240 msgid "Same as password above" -msgstr "" +msgstr "Ù†Ùس كلمة السر أعلاه" #: actions/recoverpassword.php:243 msgid "Reset" -msgstr "" +msgstr "أعد الضبط" #: actions/recoverpassword.php:252 msgid "Enter a nickname or email address." -msgstr "" +msgstr "أدخل اسمًا مستعارًا أو عنوان بريد إلكتروني." #: actions/recoverpassword.php:272 msgid "No user with that email address or username." @@ -2251,7 +2301,7 @@ msgstr "سجّل" #: actions/register.php:135 msgid "Registration not allowed." -msgstr "" +msgstr "لا ÙŠÙØ³Ù…Ø Ø¨Ø§Ù„ØªØ³Ø¬ÙŠÙ„." #: actions/register.php:198 msgid "You can't register if you don't agree to the license." @@ -2288,7 +2338,7 @@ msgid "Same as password above. Required." msgstr "" #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:122 +#: lib/accountsettingsaction.php:120 msgid "Email" msgstr "البريد الإلكتروني" @@ -2306,7 +2356,7 @@ msgstr "" #: actions/register.php:495 msgid "Creative Commons Attribution 3.0" -msgstr "" +msgstr "المشاع المبدع نسبة المنص٠إلى مؤلÙÙ‡ 3.0" #: actions/register.php:496 msgid "" @@ -2353,7 +2403,7 @@ msgstr "اشتراك بعيد" #: actions/remotesubscribe.php:124 msgid "Subscribe to a remote user" -msgstr "" +msgstr "اشترك بمستخدم بعيد" #: actions/remotesubscribe.php:129 msgid "User nickname" @@ -2397,12 +2447,12 @@ msgstr "" #: lib/personalgroupnav.php:105 #, php-format msgid "Replies to %s" -msgstr "" +msgstr "الردود على %s" #: actions/replies.php:127 #, php-format msgid "Replies to %s, page %d" -msgstr "" +msgstr "الردود على %sØŒ الصÙØØ© %d" #: actions/replies.php:144 #, php-format @@ -2492,7 +2542,7 @@ msgstr "" #: actions/showfavorites.php:242 msgid "This is a way to share what you like." -msgstr "" +msgstr "إنها Ø¥Øدى وسائل مشاركة ما تØب." #: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format @@ -2597,7 +2647,7 @@ msgstr "لا رسالة كهذه." #: actions/showmessage.php:98 msgid "Only the sender and recipient may read this message." -msgstr "" +msgstr "ÙŠØÙ‚ للمÙرسل والمستلم Ùقط قراءة هذه الرسالة." #: actions/showmessage.php:108 #, php-format @@ -2781,11 +2831,11 @@ msgstr "" #: actions/subedit.php:83 msgid "Could not save subscription." -msgstr "" +msgstr "تعذّر ØÙظ الاشتراك." #: actions/subscribe.php:55 msgid "Not a local user." -msgstr "" +msgstr "ليس Ù…Ùستخدمًا Ù…Øليًا." #: actions/subscribe.php:69 msgid "Subscribed" @@ -2794,12 +2844,12 @@ msgstr "Ù…Ùشترك" #: actions/subscribers.php:50 #, php-format msgid "%s subscribers" -msgstr "" +msgstr "مشتركو %s" #: actions/subscribers.php:52 #, php-format msgid "%s subscribers, page %d" -msgstr "" +msgstr "مشتركو %sØŒ الصÙØØ© %d" #: actions/subscribers.php:63 msgid "These are the people who listen to your notices." @@ -2831,21 +2881,21 @@ msgstr "" #: actions/subscriptions.php:52 #, php-format msgid "%s subscriptions" -msgstr "" +msgstr "اشتراكات %s" #: actions/subscriptions.php:54 #, php-format msgid "%s subscriptions, page %d" -msgstr "" +msgstr "اشتراكات %sØŒ الصÙØØ© %d" #: actions/subscriptions.php:65 msgid "These are the people whose notices you listen to." -msgstr "" +msgstr "هؤلاء الأشخاص الذي تستمع إليهم." #: actions/subscriptions.php:69 #, php-format msgid "These are the people whose notices %s listens to." -msgstr "" +msgstr "هؤلاء الأشخاص الذي يستمع %s إليهم." #: actions/subscriptions.php:121 #, php-format @@ -2876,7 +2926,7 @@ msgstr "لست والجًا" #: actions/tagother.php:39 msgid "No id argument." -msgstr "" +msgstr "لا Ù…Ùدخل هوية." #: actions/tagother.php:65 #, php-format @@ -2948,7 +2998,7 @@ msgstr "" #: actions/unsubscribe.php:84 msgid "No profile with that id." -msgstr "" +msgstr "لا مل٠بهذه الهوية." #: actions/unsubscribe.php:98 msgid "Unsubscribed" @@ -2993,7 +3043,7 @@ msgstr "ارÙض هذا الاشتراك" #: actions/userauthorization.php:225 msgid "No authorization request!" -msgstr "" +msgstr "لا طلب استيثاق!" #: actions/userauthorization.php:247 msgid "Subscription authorized" @@ -3008,7 +3058,7 @@ msgstr "" #: actions/userauthorization.php:259 msgid "Subscription rejected" -msgstr "" +msgstr "رÙÙض الاشتراك" #: actions/userauthorization.php:261 msgid "" @@ -3151,36 +3201,36 @@ msgstr "مشكلة أثناء ØÙظ الإشعار." msgid "DB error inserting reply: %s" msgstr "" -#: classes/User.php:333 +#: classes/User.php:347 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" -#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 msgid "Profile" msgstr "المل٠الشخصي" -#: lib/accountsettingsaction.php:110 +#: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "غيّر إعدادات ملÙÙƒ الشخصي" -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:112 msgid "Upload an avatar" msgstr "" -#: lib/accountsettingsaction.php:119 +#: lib/accountsettingsaction.php:116 msgid "Change your password" msgstr "غير كلمة سرّك" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:120 msgid "Change email handling" msgstr "غير أسلوب التعامل مع البريد الإلكتروني" -#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 +#: lib/accountsettingsaction.php:124 lib/groupnav.php:119 msgid "Design" msgstr "التصميم" -#: lib/accountsettingsaction.php:126 +#: lib/accountsettingsaction.php:124 msgid "Design your profile" msgstr "صمّم ملÙÙƒ الشخصي" @@ -3188,7 +3238,7 @@ msgstr "صمّم ملÙÙƒ الشخصي" msgid "Other" msgstr "أخرى" -#: lib/accountsettingsaction.php:129 +#: lib/accountsettingsaction.php:128 msgid "Other options" msgstr "خيارات أخرى" @@ -3211,7 +3261,7 @@ msgstr "الرئيسية" #: lib/action.php:430 msgid "Personal profile and friends timeline" -msgstr "" +msgstr "المل٠الشخصي ومسار الأصدقاء الزمني" #: lib/action.php:432 msgid "Account" @@ -3337,6 +3387,9 @@ msgid "" "s, available under the [GNU Affero General Public License](http://www.fsf." "org/licensing/licenses/agpl-3.0.html)." msgstr "" +"تعمل على برنامج التدوين المÙصغّر [StatusNet](http://status.net/) -النسخة %s- " +"المتوÙر تØت [رخصة غنو Ø£Ùيرو العمومية](http://www.fsf.org/licensing/licenses/" +"agpl-3.0.html)." #: lib/action.php:785 msgid "Site content license" @@ -3350,25 +3403,25 @@ msgstr "" msgid "license." msgstr "الرخصة." -#: lib/action.php:1053 +#: lib/action.php:1052 msgid "Pagination" msgstr "" -#: lib/action.php:1062 +#: lib/action.php:1061 msgid "After" msgstr "بعد" -#: lib/action.php:1070 +#: lib/action.php:1069 msgid "Before" msgstr "قبل" -#: lib/action.php:1119 +#: lib/action.php:1117 msgid "There was a problem with your session token." msgstr "" #: lib/attachmentlist.php:87 msgid "Attachments" -msgstr "" +msgstr "مرÙقات" #: lib/attachmentlist.php:265 msgid "Author" @@ -3442,7 +3495,7 @@ msgstr "" #: lib/command.php:315 #, php-format msgid "%1$s (%2$s)" -msgstr "" +msgstr "%1$s (%2$s)" #: lib/command.php:318 #, php-format @@ -3485,7 +3538,7 @@ msgstr "رÙد على رسالة %s" #: lib/command.php:441 msgid "Error saving notice." -msgstr "خطأ أثناء ØÙظ الملاØظة." +msgstr "خطأ أثناء ØÙظ الإشعار." #: lib/command.php:495 msgid "Specify the name of the user to subscribe to" @@ -3494,7 +3547,7 @@ msgstr "" #: lib/command.php:502 #, php-format msgid "Subscribed to %s" -msgstr "" +msgstr "Ù…Ùشترك ب%s" #: lib/command.php:523 msgid "Specify the name of the user to unsubscribe from" @@ -3535,13 +3588,46 @@ msgstr "" msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:613 +#: lib/command.php:618 +#, fuzzy +msgid "You are not subscribed to anyone." +msgstr "لا تملك تصريØًا." + +#: lib/command.php:620 +#, fuzzy +msgid "You are subscribed to these people: " +msgstr "الأشخاص المشتركون ب%s" + +#: lib/command.php:637 +#, fuzzy +msgid "No one is subscribed to you." +msgstr "الأشخاص الذين اشترك بهم %s" + +#: lib/command.php:639 +#, fuzzy +msgid "These people are subscribed to you: " +msgstr "الأشخاص المشتركون ب%s" + +#: lib/command.php:656 +#, fuzzy +msgid "You are not a member of any groups." +msgstr "لست عضوا ÙÙŠ تلك المجموعة." + +#: lib/command.php:658 +#, fuzzy +msgid "You are a member of these groups: " +msgstr "لست عضوا ÙÙŠ تلك المجموعة." + +#: lib/command.php:670 msgid "" "Commands:\n" "on - turn on notifications\n" "off - turn off notifications\n" "help - show this help\n" "follow <nickname> - subscribe to user\n" +"groups - lists the groups you have joined\n" +"subscriptions - list the people you follow\n" +"subscribers - list the people that follow you\n" "leave <nickname> - unsubscribe from user\n" "d <nickname> <text> - direct message to user\n" "get <nickname> - get last notice from user\n" @@ -3571,19 +3657,19 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:191 +#: lib/common.php:192 msgid "No configuration file found. " msgstr "" -#: lib/common.php:192 +#: lib/common.php:193 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:193 +#: lib/common.php:194 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:194 +#: lib/common.php:195 msgid "Go to the installer." msgstr "اذهب إلى المÙثبّت." @@ -3682,15 +3768,15 @@ msgstr "استعيدت مبدئيات التصميم." #: lib/disfavorform.php:114 lib/disfavorform.php:140 msgid "Disfavor this notice" -msgstr "" +msgstr "ألغ٠تÙضيل هذا الإشعار" #: lib/favorform.php:114 lib/favorform.php:140 msgid "Favor this notice" -msgstr "" +msgstr "Ùضّل هذا الإشعار" #: lib/favorform.php:140 msgid "Favor" -msgstr "" +msgstr "Ùضّل" #: lib/feedlist.php:64 msgid "Export data" @@ -3710,7 +3796,7 @@ msgstr "أتوم" #: lib/feed.php:91 msgid "FOAF" -msgstr "" +msgstr "FOAF" #: lib/galleryaction.php:121 msgid "Filter tags" @@ -3839,11 +3925,11 @@ msgstr "" #: lib/imagefile.php:150 lib/imagefile.php:197 msgid "Unknown file type" -msgstr "" +msgstr "نوع مل٠غير معروÙ" #: lib/jabber.php:192 #, php-format -msgid "notice id: %s" +msgid "[%s]" msgstr "" #: lib/joinform.php:114 @@ -3955,7 +4041,7 @@ msgstr "" #: lib/mail.php:412 #, php-format msgid "%s status" -msgstr "" +msgstr "Øالة %s" #: lib/mail.php:438 msgid "SMS confirmation" @@ -3985,7 +4071,7 @@ msgstr "" #: lib/mail.php:509 #, php-format msgid "New private message from %s" -msgstr "" +msgstr "رسالة خاصة جديدة من %s" #: lib/mail.php:513 #, php-format @@ -4106,7 +4192,7 @@ msgstr "" #: lib/messageform.php:120 msgid "Send a direct notice" -msgstr "أرسل ملاØظة مباشرة" +msgstr "أرسل إشعارًا مباشرًا" #: lib/messageform.php:146 msgid "To" @@ -4147,11 +4233,11 @@ msgstr "رÙد" #: lib/nudgeform.php:116 msgid "Nudge this user" -msgstr "" +msgstr "نبّه هذا المستخدم" #: lib/nudgeform.php:128 msgid "Nudge" -msgstr "" +msgstr "نبّه" #: lib/nudgeform.php:128 msgid "Send a nudge to this user" @@ -4167,11 +4253,11 @@ msgstr "" #: lib/oauthstore.php:311 msgid "Error inserting remote profile" -msgstr "" +msgstr "خطأ أثناء إدراج المل٠الشخصي البعيد" #: lib/oauthstore.php:345 msgid "Duplicate notice" -msgstr "" +msgstr "ضاع٠الإشعار" #: lib/oauthstore.php:487 msgid "Couldn't insert new subscription." @@ -4187,7 +4273,7 @@ msgstr "الردود" #: lib/personalgroupnav.php:114 msgid "Favorites" -msgstr "Ù…Ùضلات" +msgstr "المÙضلات" #: lib/personalgroupnav.php:115 msgid "User" @@ -4207,7 +4293,7 @@ msgstr "صندوق الصادر" #: lib/personalgroupnav.php:130 msgid "Your sent messages" -msgstr "" +msgstr "رسائلك المÙرسلة" #: lib/personaltagcloudsection.php:56 #, php-format @@ -4272,11 +4358,11 @@ msgstr "ابØØ« ÙÙŠ المساعدة" #: lib/searchgroupnav.php:80 msgid "People" -msgstr "" +msgstr "أشخاص" #: lib/searchgroupnav.php:81 msgid "Find people on this site" -msgstr "" +msgstr "ابØØ« عن أشخاص على هذا الموقع" #: lib/searchgroupnav.php:82 msgid "Notice" @@ -4301,17 +4387,17 @@ msgstr "المزيد..." #: lib/subgroupnav.php:83 #, php-format msgid "People %s subscribes to" -msgstr "" +msgstr "الأشخاص الذين اشترك بهم %s" #: lib/subgroupnav.php:91 #, php-format msgid "People subscribed to %s" -msgstr "" +msgstr "الأشخاص المشتركون ب%s" #: lib/subgroupnav.php:99 #, php-format msgid "Groups %s is a member of" -msgstr "" +msgstr "المجموعات التي %s عضو Ùيها" #: lib/subscriberspeopleselftagcloudsection.php:48 #: lib/subscriptionspeopleselftagcloudsection.php:48 @@ -4329,7 +4415,7 @@ msgstr "(لا شيء)" #: lib/subs.php:48 msgid "Already subscribed!" -msgstr "" +msgstr "Ù…Ùشترك أصلا!" #: lib/subs.php:52 msgid "User has blocked you." @@ -4344,8 +4430,9 @@ msgid "Could not subscribe other to you." msgstr "" #: lib/subs.php:124 -msgid "Not subscribed!." -msgstr "" +#, fuzzy +msgid "Not subscribed!" +msgstr "لست Ù…Ùشتركًا!" #: lib/subs.php:136 msgid "Couldn't delete subscription." @@ -4391,54 +4478,54 @@ msgstr "أرسل رسالة مباشرة إلى هذا المستخدم" msgid "Message" msgstr "رسالة" -#: lib/util.php:818 +#: lib/util.php:821 msgid "a few seconds ago" msgstr "قبل Ù„Øظات قليلة" -#: lib/util.php:820 +#: lib/util.php:823 msgid "about a minute ago" msgstr "قبل دقيقة تقريبًا" -#: lib/util.php:822 +#: lib/util.php:825 #, php-format msgid "about %d minutes ago" msgstr "" -#: lib/util.php:824 +#: lib/util.php:827 msgid "about an hour ago" msgstr "قبل ساعة تقريبًا" -#: lib/util.php:826 +#: lib/util.php:829 #, php-format msgid "about %d hours ago" msgstr "" -#: lib/util.php:828 +#: lib/util.php:831 msgid "about a day ago" msgstr "قبل يوم تقريبا" -#: lib/util.php:830 +#: lib/util.php:833 #, php-format msgid "about %d days ago" msgstr "" -#: lib/util.php:832 +#: lib/util.php:835 msgid "about a month ago" msgstr "قبل شهر تقريبًا" -#: lib/util.php:834 +#: lib/util.php:837 #, php-format msgid "about %d months ago" msgstr "" -#: lib/util.php:836 +#: lib/util.php:839 msgid "about a year ago" msgstr "قبل سنة تقريبًا" #: lib/webcolor.php:82 #, php-format msgid "%s is not a valid color!" -msgstr "" +msgstr "%s ليس لونًا صØÙŠØًا!" #: lib/webcolor.php:123 #, php-format @@ -4447,7 +4534,7 @@ msgstr "" #: scripts/maildaemon.php:48 msgid "Could not parse message." -msgstr "" +msgstr "تعذّر تØليل الرسالة." #: scripts/maildaemon.php:53 msgid "Not a registered user." diff --git a/locale/bg/LC_MESSAGES/statusnet.mo b/locale/bg/LC_MESSAGES/statusnet.mo Binary files differindex a05e3245c..48af8295b 100644 --- a/locale/bg/LC_MESSAGES/statusnet.mo +++ b/locale/bg/LC_MESSAGES/statusnet.mo diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po index 33844a4c7..c4930c6ff 100644 --- a/locale/bg/LC_MESSAGES/statusnet.po +++ b/locale/bg/LC_MESSAGES/statusnet.po @@ -5,12 +5,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-10 20:53+0000\n" -"PO-Revision-Date: 2009-11-10 20:58:41+0000\n" +"POT-Creation-Date: 2009-11-16 19:42+0000\n" +"PO-Revision-Date: 2009-11-16 19:42:49+0000\n" "Language-Team: Bulgarian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: bg\n" "X-Message-Group: out-statusnet\n" @@ -22,12 +22,15 @@ msgid "No such page" msgstr "ÐÑма такъв етикет." #: actions/all.php:74 actions/allrss.php:68 -#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofilebackgroundimage.php:116 +#: actions/apiaccountupdateprofileimage.php:105 +#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 #: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 #: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 @@ -106,35 +109,42 @@ msgstr "%s и приÑтели" msgid "Updates from %1$s and friends on %2$s!" msgstr "Бележки от %1$s и приÑтели в %2$s." -#: actions/apiaccountratelimitstatus.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 -#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:129 actions/apigroupcreate.php:184 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120 -#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101 -#: actions/apigroupshow.php:105 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144 -#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141 -#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130 -#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163 -#: actions/apiusershow.php:101 -msgid "API method not found!" +#: actions/apiaccountratelimitstatus.php:70 +#: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofilebackgroundimage.php:94 +#: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apiaccountupdateprofile.php:97 +#, fuzzy +msgid "API method not found." msgstr "Ðе е открит методът в API." -#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 +#: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofilebackgroundimage.php:86 +#: actions/apiaccountupdateprofilecolors.php:110 +#: actions/apiaccountupdateprofileimage.php:84 +#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109 +#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "Този метод изиÑква заÑвка POST." +#: actions/apiaccountupdatedeliverydevice.php:105 +msgid "" +"You must specify a parameter named 'device' with a value of one of: sms, im, " +"none" +msgstr "" + +#: actions/apiaccountupdatedeliverydevice.php:132 +#, fuzzy +msgid "Could not update user." +msgstr "Грешка при обновÑване на потребителÑ." + +#: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 #: actions/newnotice.php:94 lib/designsettings.php:283 #, php-format msgid "" @@ -142,12 +152,34 @@ msgid "" "current configuration." msgstr "" -#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/apiaccountupdateprofilebackgroundimage.php:136 +#: actions/apiaccountupdateprofilebackgroundimage.php:146 +#: actions/apiaccountupdateprofilecolors.php:164 +#: actions/apiaccountupdateprofilecolors.php:174 +#, fuzzy +msgid "Unable to save your design settings." +msgstr "Грешка при запиÑване наÑтройките за Twitter" + +#: actions/apiaccountupdateprofilebackgroundimage.php:187 +#: actions/apiaccountupdateprofilecolors.php:142 +#, fuzzy +msgid "Could not update your design." +msgstr "Грешка при обновÑване на потребителÑ." + +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 +#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 #: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 msgid "User has no profile." msgstr "ПотребителÑÑ‚ нÑма профил." +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "Грешка при запазване на профила." + #: actions/apiblockcreate.php:108 msgid "Block user failed." msgstr "" @@ -195,6 +227,23 @@ msgstr "Преки ÑÑŠÐ¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð´Ð¾ %s" msgid "All the direct messages sent to %s" msgstr "Ð’Ñички преки ÑъобщениÑ, изпратени до %s" +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 +#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 +#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 +#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149 +#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +msgid "API method not found!" +msgstr "Ðе е открит методът в API." + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -392,17 +441,17 @@ msgstr "Ðватарът е обновен." msgid "No status with that ID found." msgstr "Ðе е открита бележка Ñ Ñ‚Ð°ÐºÑŠÐ² идентификатор." -#: actions/apistatusesupdate.php:152 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 #: scripts/maildaemon.php:71 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Твърде дълга бележка. ТрÑбва да е най-много 140 знака." -#: actions/apistatusesupdate.php:193 +#: actions/apistatusesupdate.php:198 msgid "Not found" msgstr "Ðе е открито." -#: actions/apistatusesupdate.php:216 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:227 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -486,7 +535,7 @@ msgid "Invalid size." msgstr "Ðеправилен размер." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:113 +#: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "Ðватар" @@ -534,7 +583,7 @@ msgstr "ИзрÑзване" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:151 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -1672,7 +1721,7 @@ msgid "Nickname" msgstr "ПÑевдоним" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Парола" @@ -1811,7 +1860,7 @@ msgstr "" #: actions/noticesearch.php:124 #, php-format msgid "" -"Why not [register an account](%%%%action.register%%%%) and be the first to " +"Why not [register an account](%%%%action.register%%%%) and be the first to " "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" msgstr "" @@ -1856,8 +1905,8 @@ msgstr "Свързване" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963 -#: lib/api.php:991 lib/api.php:1101 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 +#: lib/api.php:1027 lib/api.php:1137 msgid "Not a supported data format." msgstr "Ðеподдържан формат на данните" @@ -1877,11 +1926,15 @@ msgstr "Други наÑтройки" msgid "Manage various other options." msgstr "Управление на различни други наÑтройки." -#: actions/othersettings.php:117 +#: actions/othersettings.php:108 +msgid " (free service)" +msgstr "" + +#: actions/othersettings.php:116 msgid "Shorten URLs with" msgstr "" -#: actions/othersettings.php:118 +#: actions/othersettings.php:117 msgid "Automatic shortening service to use." msgstr "УÑлуга за автоматично Ñъкращаване, коÑто да Ñе ползва." @@ -1916,66 +1969,61 @@ msgstr "Това е изходÑщата ви ÐºÑƒÑ‚Ð¸Ñ Ñ Ð»Ð¸Ñ‡Ð½Ð¸ ÑÑŠÐ¾Ð±Ñ msgid "Change password" msgstr "СмÑна на паролата" -#: actions/passwordsettings.php:70 -#, fuzzy -msgid "You are not allowed to change your password" -msgstr "СмÑна на паролата" - -#: actions/passwordsettings.php:82 +#: actions/passwordsettings.php:69 msgid "Change your password." msgstr "СмÑна на паролата." -#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:96 actions/recoverpassword.php:231 #, fuzzy msgid "Password change" msgstr "Паролата е запиÑана." -#: actions/passwordsettings.php:117 +#: actions/passwordsettings.php:104 msgid "Old password" msgstr "Стара парола" -#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:108 actions/recoverpassword.php:235 msgid "New password" msgstr "Ðова парола" -#: actions/passwordsettings.php:122 +#: actions/passwordsettings.php:109 msgid "6 or more characters" msgstr "6 или повече знака" -#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:112 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Потвърждаване" -#: actions/passwordsettings.php:126 +#: actions/passwordsettings.php:113 msgid "same as password above" msgstr "Ñъщо като паролата по-горе" -#: actions/passwordsettings.php:130 +#: actions/passwordsettings.php:117 msgid "Change" msgstr "ПромÑна" -#: actions/passwordsettings.php:167 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "Паролата Ñ‚Ñ€Ñбва да е 6 или повече знака." -#: actions/passwordsettings.php:170 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:233 msgid "Passwords don't match." msgstr "Паролите не Ñъвпадат." -#: actions/passwordsettings.php:178 +#: actions/passwordsettings.php:165 msgid "Incorrect old password" msgstr "Грешна Ñтара парола" -#: actions/passwordsettings.php:194 +#: actions/passwordsettings.php:181 msgid "Error saving user; invalid." msgstr "Грешка при запазване на потребител — невалидноÑÑ‚." -#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Грешка при запазване на новата парола." -#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:192 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Паролата е запиÑана." @@ -2414,7 +2462,7 @@ msgid "Same as password above. Required." msgstr "Същото като паролата по-горе. Задължително поле." #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:122 +#: lib/accountsettingsaction.php:120 msgid "Email" msgstr "Е-поща" @@ -3341,36 +3389,36 @@ msgstr "Проблем при запиÑване на бележката." msgid "DB error inserting reply: %s" msgstr "Грешка в базата от данни — отговор при вмъкването: %s" -#: classes/User.php:333 +#: classes/User.php:347 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Съобщение до %1$s в %2$s" -#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Профил" -#: lib/accountsettingsaction.php:110 +#: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "ПромÑна наÑтройките на профила" -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:112 msgid "Upload an avatar" msgstr "Качване на аватар" -#: lib/accountsettingsaction.php:119 +#: lib/accountsettingsaction.php:116 msgid "Change your password" msgstr "СмÑна на паролата" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:120 msgid "Change email handling" msgstr "ПромÑна обработката на пиÑмата" -#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 +#: lib/accountsettingsaction.php:124 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:126 +#: lib/accountsettingsaction.php:124 #, fuzzy msgid "Design your profile" msgstr "ПотребителÑки профил" @@ -3379,7 +3427,7 @@ msgstr "ПотребителÑки профил" msgid "Other" msgstr "Друго" -#: lib/accountsettingsaction.php:129 +#: lib/accountsettingsaction.php:128 msgid "Other options" msgstr "Други наÑтройки" @@ -3553,19 +3601,19 @@ msgstr "Ð’Ñички " msgid "license." msgstr "лиценз." -#: lib/action.php:1053 +#: lib/action.php:1052 msgid "Pagination" msgstr "Страниране" -#: lib/action.php:1062 +#: lib/action.php:1061 msgid "After" msgstr "След" -#: lib/action.php:1070 +#: lib/action.php:1069 msgid "Before" msgstr "Преди" -#: lib/action.php:1119 +#: lib/action.php:1117 msgid "There was a problem with your session token." msgstr "Имаше проблем ÑÑŠÑ ÑеÑиÑта ви в Ñайта." @@ -3739,13 +3787,46 @@ msgstr "Грешка при Ñъздаване на OpenID форма: %s" msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:613 +#: lib/command.php:618 +#, fuzzy +msgid "You are not subscribed to anyone." +msgstr "Ðе Ñте абонирани за този профил" + +#: lib/command.php:620 +#, fuzzy +msgid "You are subscribed to these people: " +msgstr "Ðе Ñте абонирани за този профил" + +#: lib/command.php:637 +#, fuzzy +msgid "No one is subscribed to you." +msgstr "Грешка при абониране на друг потребител за ваÑ." + +#: lib/command.php:639 +#, fuzzy +msgid "These people are subscribed to you: " +msgstr "Ðбонирани за %s" + +#: lib/command.php:656 +#, fuzzy +msgid "You are not a member of any groups." +msgstr "Ðе членувате в тази група." + +#: lib/command.php:658 +#, fuzzy +msgid "You are a member of these groups: " +msgstr "Ðе членувате в тази група." + +#: lib/command.php:670 msgid "" "Commands:\n" "on - turn on notifications\n" "off - turn off notifications\n" "help - show this help\n" "follow <nickname> - subscribe to user\n" +"groups - lists the groups you have joined\n" +"subscriptions - list the people you follow\n" +"subscribers - list the people that follow you\n" "leave <nickname> - unsubscribe from user\n" "d <nickname> <text> - direct message to user\n" "get <nickname> - get last notice from user\n" @@ -3775,20 +3856,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:191 +#: lib/common.php:192 #, fuzzy msgid "No configuration file found. " msgstr "ÐÑма код за потвърждение." -#: lib/common.php:192 +#: lib/common.php:193 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:193 +#: lib/common.php:194 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:194 +#: lib/common.php:195 #, fuzzy msgid "Go to the installer." msgstr "Влизане в Ñайта" @@ -4060,8 +4141,8 @@ msgstr "Ðеподдържан вид файл" #: lib/jabber.php:192 #, php-format -msgid "notice id: %s" -msgstr "Ðова бележка" +msgid "[%s]" +msgstr "" #: lib/joinform.php:114 msgid "Join" @@ -4575,7 +4656,8 @@ msgid "Could not subscribe other to you." msgstr "Грешка при абониране на друг потребител за ваÑ." #: lib/subs.php:124 -msgid "Not subscribed!." +#, fuzzy +msgid "Not subscribed!" msgstr "Ðе Ñте абонирани!" #: lib/subs.php:136 @@ -4624,47 +4706,47 @@ msgstr "Изпращате на прÑко Ñъобщение до този по msgid "Message" msgstr "Съобщение" -#: lib/util.php:818 +#: lib/util.php:821 msgid "a few seconds ago" msgstr "преди нÑколко Ñекунди" -#: lib/util.php:820 +#: lib/util.php:823 msgid "about a minute ago" msgstr "преди около минута" -#: lib/util.php:822 +#: lib/util.php:825 #, php-format msgid "about %d minutes ago" msgstr "преди около %d минути" -#: lib/util.php:824 +#: lib/util.php:827 msgid "about an hour ago" msgstr "преди около чаÑ" -#: lib/util.php:826 +#: lib/util.php:829 #, php-format msgid "about %d hours ago" msgstr "преди около %d чаÑа" -#: lib/util.php:828 +#: lib/util.php:831 msgid "about a day ago" msgstr "преди около ден" -#: lib/util.php:830 +#: lib/util.php:833 #, php-format msgid "about %d days ago" msgstr "преди около %d дни" -#: lib/util.php:832 +#: lib/util.php:835 msgid "about a month ago" msgstr "преди около меÑец" -#: lib/util.php:834 +#: lib/util.php:837 #, php-format msgid "about %d months ago" msgstr "преди около %d меÑеца" -#: lib/util.php:836 +#: lib/util.php:839 msgid "about a year ago" msgstr "преди около година" diff --git a/locale/ca/LC_MESSAGES/statusnet.mo b/locale/ca/LC_MESSAGES/statusnet.mo Binary files differindex ac01d8ed9..cd6cf878e 100644 --- a/locale/ca/LC_MESSAGES/statusnet.mo +++ b/locale/ca/LC_MESSAGES/statusnet.mo diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po index 11d83cad8..417607800 100644 --- a/locale/ca/LC_MESSAGES/statusnet.po +++ b/locale/ca/LC_MESSAGES/statusnet.po @@ -5,12 +5,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-10 20:53+0000\n" -"PO-Revision-Date: 2009-11-10 20:58:44+0000\n" +"POT-Creation-Date: 2009-11-16 19:42+0000\n" +"PO-Revision-Date: 2009-11-16 19:42:52+0000\n" "Language-Team: Catalan\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ca\n" "X-Message-Group: out-statusnet\n" @@ -22,12 +22,15 @@ msgid "No such page" msgstr "No existeix aquesta etiqueta." #: actions/all.php:74 actions/allrss.php:68 -#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofilebackgroundimage.php:116 +#: actions/apiaccountupdateprofileimage.php:105 +#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 #: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 #: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 @@ -106,35 +109,42 @@ msgstr "%s i amics" msgid "Updates from %1$s and friends on %2$s!" msgstr "Actualitzacions de %1$s i amics a %2$s!" -#: actions/apiaccountratelimitstatus.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 -#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:129 actions/apigroupcreate.php:184 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120 -#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101 -#: actions/apigroupshow.php:105 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144 -#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141 -#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130 -#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163 -#: actions/apiusershow.php:101 -msgid "API method not found!" +#: actions/apiaccountratelimitstatus.php:70 +#: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofilebackgroundimage.php:94 +#: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apiaccountupdateprofile.php:97 +#, fuzzy +msgid "API method not found." msgstr "No s'ha trobat el mètode API!" -#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 +#: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofilebackgroundimage.php:86 +#: actions/apiaccountupdateprofilecolors.php:110 +#: actions/apiaccountupdateprofileimage.php:84 +#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109 +#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "Aquest mètode requereix POST." +#: actions/apiaccountupdatedeliverydevice.php:105 +msgid "" +"You must specify a parameter named 'device' with a value of one of: sms, im, " +"none" +msgstr "" + +#: actions/apiaccountupdatedeliverydevice.php:132 +#, fuzzy +msgid "Could not update user." +msgstr "No s'ha pogut actualitzar l'usuari." + +#: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 #: actions/newnotice.php:94 lib/designsettings.php:283 #, php-format msgid "" @@ -142,12 +152,34 @@ msgid "" "current configuration." msgstr "" -#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/apiaccountupdateprofilebackgroundimage.php:136 +#: actions/apiaccountupdateprofilebackgroundimage.php:146 +#: actions/apiaccountupdateprofilecolors.php:164 +#: actions/apiaccountupdateprofilecolors.php:174 +#, fuzzy +msgid "Unable to save your design settings." +msgstr "No s'ha pogut guardar la teva configuració de Twitter!" + +#: actions/apiaccountupdateprofilebackgroundimage.php:187 +#: actions/apiaccountupdateprofilecolors.php:142 +#, fuzzy +msgid "Could not update your design." +msgstr "No s'ha pogut actualitzar l'usuari." + +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 +#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 #: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 msgid "User has no profile." msgstr "L'usuari no té perfil." +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "No s'ha pogut guardar el perfil." + #: actions/apiblockcreate.php:108 msgid "Block user failed." msgstr "Ha fallat el bloqueig d'usuari." @@ -193,6 +225,23 @@ msgstr "Missatges directes a %s" msgid "All the direct messages sent to %s" msgstr "Tots els missatges directes enviats a %s" +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 +#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 +#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 +#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149 +#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +msgid "API method not found!" +msgstr "No s'ha trobat el mètode API!" + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -390,17 +439,17 @@ msgstr "Avatar actualitzat." msgid "No status with that ID found." msgstr "No s'ha trobat cap estatus amb la ID trobada." -#: actions/apistatusesupdate.php:152 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 #: scripts/maildaemon.php:71 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Massa llarg. La longitud mà xima és de 140 carà cters." -#: actions/apistatusesupdate.php:193 +#: actions/apistatusesupdate.php:198 msgid "Not found" msgstr "No s'ha trobat" -#: actions/apistatusesupdate.php:216 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:227 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -484,7 +533,7 @@ msgid "Invalid size." msgstr "Mida invà lida." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:113 +#: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "Avatar" @@ -532,7 +581,7 @@ msgstr "Crop" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:151 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -1691,7 +1740,7 @@ msgid "Nickname" msgstr "Sobrenom" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Contrasenya" @@ -1830,7 +1879,7 @@ msgstr "" #: actions/noticesearch.php:124 #, php-format msgid "" -"Why not [register an account](%%%%action.register%%%%) and be the first to " +"Why not [register an account](%%%%action.register%%%%) and be the first to " "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" msgstr "" @@ -1877,8 +1926,8 @@ msgstr "Connectar-se" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963 -#: lib/api.php:991 lib/api.php:1101 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 +#: lib/api.php:1027 lib/api.php:1137 msgid "Not a supported data format." msgstr "Format de data no suportat." @@ -1898,11 +1947,15 @@ msgstr "Altres configuracions" msgid "Manage various other options." msgstr "Gestionar altres và ries opcions." -#: actions/othersettings.php:117 +#: actions/othersettings.php:108 +msgid " (free service)" +msgstr "" + +#: actions/othersettings.php:116 msgid "Shorten URLs with" msgstr "" -#: actions/othersettings.php:118 +#: actions/othersettings.php:117 msgid "Automatic shortening service to use." msgstr "Servei d'auto-escurçament a utilitzar." @@ -1940,65 +1993,60 @@ msgstr "" msgid "Change password" msgstr "Canviar contrasenya" -#: actions/passwordsettings.php:70 -#, fuzzy -msgid "You are not allowed to change your password" -msgstr "Canviar la teva contrasenya" - -#: actions/passwordsettings.php:82 +#: actions/passwordsettings.php:69 msgid "Change your password." msgstr "Canviar contrasenya" -#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:96 actions/recoverpassword.php:231 msgid "Password change" msgstr "Contrasenya canviada." -#: actions/passwordsettings.php:117 +#: actions/passwordsettings.php:104 msgid "Old password" msgstr "Antiga contrasenya" -#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:108 actions/recoverpassword.php:235 msgid "New password" msgstr "Nova contrasenya" -#: actions/passwordsettings.php:122 +#: actions/passwordsettings.php:109 msgid "6 or more characters" msgstr "6 o més carà cters" -#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:112 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Confirmar" -#: actions/passwordsettings.php:126 +#: actions/passwordsettings.php:113 msgid "same as password above" msgstr "repeteix la contrasenya anterior" -#: actions/passwordsettings.php:130 +#: actions/passwordsettings.php:117 msgid "Change" msgstr "Canviar" -#: actions/passwordsettings.php:167 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "La contrasenya hauria de ser d'entre 6 a més carà cters." -#: actions/passwordsettings.php:170 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:233 msgid "Passwords don't match." msgstr "Les contrasenyes no coincideixen." -#: actions/passwordsettings.php:178 +#: actions/passwordsettings.php:165 msgid "Incorrect old password" msgstr "Contrasenya antiga incorrecta" -#: actions/passwordsettings.php:194 +#: actions/passwordsettings.php:181 msgid "Error saving user; invalid." msgstr "Error en guardar usuari; invà lid." -#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "No es pot guardar la nova contrasenya." -#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:192 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Contrasenya guardada." @@ -2444,7 +2492,7 @@ msgid "Same as password above. Required." msgstr "Igual a la contrasenya de dalt. Requerit." #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:122 +#: lib/accountsettingsaction.php:120 msgid "Email" msgstr "Correu electrònic" @@ -3379,36 +3427,36 @@ msgstr "Problema en guardar l'avÃs." msgid "DB error inserting reply: %s" msgstr "Error de BD en inserir resposta: %s" -#: classes/User.php:333 +#: classes/User.php:347 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Missatge per a %1$s a %2$s" -#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Perfil" -#: lib/accountsettingsaction.php:110 +#: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "Canviar les preferències del teu perfil" -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:112 msgid "Upload an avatar" msgstr "Pujar un avatar" -#: lib/accountsettingsaction.php:119 +#: lib/accountsettingsaction.php:116 msgid "Change your password" msgstr "Canviar la teva contrasenya" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:120 msgid "Change email handling" msgstr "Canviar correu electrònic" -#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 +#: lib/accountsettingsaction.php:124 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:126 +#: lib/accountsettingsaction.php:124 #, fuzzy msgid "Design your profile" msgstr "Perfil de l'usuari" @@ -3417,7 +3465,7 @@ msgstr "Perfil de l'usuari" msgid "Other" msgstr "Altres" -#: lib/accountsettingsaction.php:129 +#: lib/accountsettingsaction.php:128 msgid "Other options" msgstr "Altres opcions" @@ -3587,19 +3635,19 @@ msgstr "Tot " msgid "license." msgstr "llicència." -#: lib/action.php:1053 +#: lib/action.php:1052 msgid "Pagination" msgstr "Paginació" -#: lib/action.php:1062 +#: lib/action.php:1061 msgid "After" msgstr "Posteriors" -#: lib/action.php:1070 +#: lib/action.php:1069 msgid "Before" msgstr "Anteriors" -#: lib/action.php:1119 +#: lib/action.php:1117 msgid "There was a problem with your session token." msgstr "Ha ocorregut algun problema amb la teva sessió." @@ -3771,13 +3819,46 @@ msgstr "No s'ha pogut crear el formulari OpenID: %s" msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:613 +#: lib/command.php:618 +#, fuzzy +msgid "You are not subscribed to anyone." +msgstr "No està s subscrit a aquest perfil." + +#: lib/command.php:620 +#, fuzzy +msgid "You are subscribed to these people: " +msgstr "No està s subscrit a aquest perfil." + +#: lib/command.php:637 +#, fuzzy +msgid "No one is subscribed to you." +msgstr "No pots subscriure a un altre a tu mateix." + +#: lib/command.php:639 +#, fuzzy +msgid "These people are subscribed to you: " +msgstr "Persones subscrites a %s" + +#: lib/command.php:656 +#, fuzzy +msgid "You are not a member of any groups." +msgstr "No ets membre d'aquest grup." + +#: lib/command.php:658 +#, fuzzy +msgid "You are a member of these groups: " +msgstr "No ets membre d'aquest grup." + +#: lib/command.php:670 msgid "" "Commands:\n" "on - turn on notifications\n" "off - turn off notifications\n" "help - show this help\n" "follow <nickname> - subscribe to user\n" +"groups - lists the groups you have joined\n" +"subscriptions - list the people you follow\n" +"subscribers - list the people that follow you\n" "leave <nickname> - unsubscribe from user\n" "d <nickname> <text> - direct message to user\n" "get <nickname> - get last notice from user\n" @@ -3807,20 +3888,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:191 +#: lib/common.php:192 #, fuzzy msgid "No configuration file found. " msgstr "Cap codi de confirmació." -#: lib/common.php:192 +#: lib/common.php:193 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:193 +#: lib/common.php:194 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:194 +#: lib/common.php:195 #, fuzzy msgid "Go to the installer." msgstr "Accedir a aquest lloc" @@ -4090,8 +4171,8 @@ msgstr "Tipus de fitxer desconegut" #: lib/jabber.php:192 #, php-format -msgid "notice id: %s" -msgstr "Nou avÃs" +msgid "[%s]" +msgstr "" #: lib/joinform.php:114 msgid "Join" @@ -4613,7 +4694,8 @@ msgid "Could not subscribe other to you." msgstr "No pots subscriure a un altre a tu mateix." #: lib/subs.php:124 -msgid "Not subscribed!." +#, fuzzy +msgid "Not subscribed!" msgstr "No està s subscrit!" #: lib/subs.php:136 @@ -4662,47 +4744,47 @@ msgstr "Enviar un missatge directe a aquest usuari" msgid "Message" msgstr "Missatge" -#: lib/util.php:818 +#: lib/util.php:821 msgid "a few seconds ago" msgstr "fa pocs segons" -#: lib/util.php:820 +#: lib/util.php:823 msgid "about a minute ago" msgstr "fa un minut" -#: lib/util.php:822 +#: lib/util.php:825 #, php-format msgid "about %d minutes ago" msgstr "fa %d minuts" -#: lib/util.php:824 +#: lib/util.php:827 msgid "about an hour ago" msgstr "fa una hora" -#: lib/util.php:826 +#: lib/util.php:829 #, php-format msgid "about %d hours ago" msgstr "fa %d hores" -#: lib/util.php:828 +#: lib/util.php:831 msgid "about a day ago" msgstr "fa un dia" -#: lib/util.php:830 +#: lib/util.php:833 #, php-format msgid "about %d days ago" msgstr "fa %d dies" -#: lib/util.php:832 +#: lib/util.php:835 msgid "about a month ago" msgstr "fa un mes" -#: lib/util.php:834 +#: lib/util.php:837 #, php-format msgid "about %d months ago" msgstr "fa %d mesos" -#: lib/util.php:836 +#: lib/util.php:839 msgid "about a year ago" msgstr "fa un any" diff --git a/locale/cs/LC_MESSAGES/statusnet.mo b/locale/cs/LC_MESSAGES/statusnet.mo Binary files differindex 275a5e3a3..449e93cdc 100644 --- a/locale/cs/LC_MESSAGES/statusnet.mo +++ b/locale/cs/LC_MESSAGES/statusnet.mo diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po index 17a12027f..6bba1da17 100644 --- a/locale/cs/LC_MESSAGES/statusnet.po +++ b/locale/cs/LC_MESSAGES/statusnet.po @@ -5,12 +5,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-10 20:53+0000\n" -"PO-Revision-Date: 2009-11-10 20:58:47+0000\n" +"POT-Creation-Date: 2009-11-16 19:42+0000\n" +"PO-Revision-Date: 2009-11-16 19:42:56+0000\n" "Language-Team: Czech\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: cs\n" "X-Message-Group: out-statusnet\n" @@ -22,12 +22,15 @@ msgid "No such page" msgstr "Žádné takové oznámenÃ." #: actions/all.php:74 actions/allrss.php:68 -#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofilebackgroundimage.php:116 +#: actions/apiaccountupdateprofileimage.php:105 +#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 #: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 #: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 @@ -106,35 +109,42 @@ msgstr "%s a přátelé" msgid "Updates from %1$s and friends on %2$s!" msgstr "" -#: actions/apiaccountratelimitstatus.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 -#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:129 actions/apigroupcreate.php:184 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120 -#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101 -#: actions/apigroupshow.php:105 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144 -#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141 -#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130 -#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163 -#: actions/apiusershow.php:101 -msgid "API method not found!" -msgstr "" +#: actions/apiaccountratelimitstatus.php:70 +#: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofilebackgroundimage.php:94 +#: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apiaccountupdateprofile.php:97 +#, fuzzy +msgid "API method not found." +msgstr "PotvrzujÃcà kód nebyl nalezen" -#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 +#: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofilebackgroundimage.php:86 +#: actions/apiaccountupdateprofilecolors.php:110 +#: actions/apiaccountupdateprofileimage.php:84 +#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109 +#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "" +#: actions/apiaccountupdatedeliverydevice.php:105 +msgid "" +"You must specify a parameter named 'device' with a value of one of: sms, im, " +"none" +msgstr "" + +#: actions/apiaccountupdatedeliverydevice.php:132 +#, fuzzy +msgid "Could not update user." +msgstr "Nelze aktualizovat uživatele" + +#: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 #: actions/newnotice.php:94 lib/designsettings.php:283 #, php-format msgid "" @@ -142,12 +152,33 @@ msgid "" "current configuration." msgstr "" -#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/apiaccountupdateprofilebackgroundimage.php:136 +#: actions/apiaccountupdateprofilebackgroundimage.php:146 +#: actions/apiaccountupdateprofilecolors.php:164 +#: actions/apiaccountupdateprofilecolors.php:174 +msgid "Unable to save your design settings." +msgstr "" + +#: actions/apiaccountupdateprofilebackgroundimage.php:187 +#: actions/apiaccountupdateprofilecolors.php:142 +#, fuzzy +msgid "Could not update your design." +msgstr "Nelze aktualizovat uživatele" + +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 +#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 #: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 msgid "User has no profile." msgstr "Uživatel nemá profil." +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "Nelze uložit profil" + #: actions/apiblockcreate.php:108 msgid "Block user failed." msgstr "" @@ -193,6 +224,23 @@ msgstr "" msgid "All the direct messages sent to %s" msgstr "" +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 +#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 +#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 +#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149 +#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +msgid "API method not found!" +msgstr "" + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -387,17 +435,17 @@ msgstr "Obrázek nahrán" msgid "No status with that ID found." msgstr "" -#: actions/apistatusesupdate.php:152 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 #: scripts/maildaemon.php:71 #, 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:193 +#: actions/apistatusesupdate.php:198 msgid "Not found" msgstr "" -#: actions/apistatusesupdate.php:216 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:227 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -482,7 +530,7 @@ msgid "Invalid size." msgstr "Neplatná velikost" #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:113 +#: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "Obrázek" @@ -531,7 +579,7 @@ msgstr "" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:151 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -1637,7 +1685,7 @@ msgid "Nickname" msgstr "PÅ™ezdÃvka" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Heslo" @@ -1772,7 +1820,7 @@ msgstr "" #: actions/noticesearch.php:124 #, php-format msgid "" -"Why not [register an account](%%%%action.register%%%%) and be the first to " +"Why not [register an account](%%%%action.register%%%%) and be the first to " "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" msgstr "" @@ -1817,8 +1865,8 @@ msgstr "PÅ™ipojit" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963 -#: lib/api.php:991 lib/api.php:1101 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 +#: lib/api.php:1027 lib/api.php:1137 msgid "Not a supported data format." msgstr "" @@ -1839,11 +1887,15 @@ msgstr "NastavenÃ" msgid "Manage various other options." msgstr "" -#: actions/othersettings.php:117 +#: actions/othersettings.php:108 +msgid " (free service)" +msgstr "" + +#: actions/othersettings.php:116 msgid "Shorten URLs with" msgstr "" -#: actions/othersettings.php:118 +#: actions/othersettings.php:117 msgid "Automatic shortening service to use." msgstr "" @@ -1879,66 +1931,62 @@ msgstr "" msgid "Change password" msgstr "ZmÄ›nit heslo" -#: actions/passwordsettings.php:70 -msgid "You are not allowed to change your password" -msgstr "" - -#: actions/passwordsettings.php:82 +#: actions/passwordsettings.php:69 #, fuzzy msgid "Change your password." msgstr "ZmÄ›nit heslo" -#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:96 actions/recoverpassword.php:231 #, fuzzy msgid "Password change" msgstr "Heslo uloženo" -#: actions/passwordsettings.php:117 +#: actions/passwordsettings.php:104 msgid "Old password" msgstr "Staré heslo" -#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:108 actions/recoverpassword.php:235 msgid "New password" msgstr "Nové heslo" -#: actions/passwordsettings.php:122 +#: actions/passwordsettings.php:109 msgid "6 or more characters" msgstr "6 a vÃce znaků" -#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:112 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Heslo znovu" -#: actions/passwordsettings.php:126 +#: actions/passwordsettings.php:113 msgid "same as password above" msgstr "stejné jako heslo výše" -#: actions/passwordsettings.php:130 +#: actions/passwordsettings.php:117 msgid "Change" msgstr "ZmÄ›nit" -#: actions/passwordsettings.php:167 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "" -#: actions/passwordsettings.php:170 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:233 msgid "Passwords don't match." msgstr "Hesla nesouhlasÃ" -#: actions/passwordsettings.php:178 +#: actions/passwordsettings.php:165 msgid "Incorrect old password" msgstr "Neplatné heslo" -#: actions/passwordsettings.php:194 +#: actions/passwordsettings.php:181 msgid "Error saving user; invalid." msgstr "Chyba pÅ™i ukládanà uživatele; neplatný" -#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Nelze uložit nové heslo" -#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:192 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Heslo uloženo" @@ -2377,7 +2425,7 @@ msgid "Same as password above. Required." msgstr "" #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:122 +#: lib/accountsettingsaction.php:120 msgid "Email" msgstr "Email" @@ -3285,37 +3333,37 @@ msgstr "Problém pÅ™i ukládánà sdÄ›lenÃ" msgid "DB error inserting reply: %s" msgstr "Chyba v DB pÅ™i vkládánà odpovÄ›di: %s" -#: classes/User.php:333 +#: classes/User.php:347 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" -#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Profil" -#: lib/accountsettingsaction.php:110 +#: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "" -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:112 #, fuzzy msgid "Upload an avatar" msgstr "Nahrávánà obrázku selhalo." -#: lib/accountsettingsaction.php:119 +#: lib/accountsettingsaction.php:116 msgid "Change your password" msgstr "" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:120 msgid "Change email handling" msgstr "" -#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 +#: lib/accountsettingsaction.php:124 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:126 +#: lib/accountsettingsaction.php:124 #, fuzzy msgid "Design your profile" msgstr "Uživatel nemá profil." @@ -3324,7 +3372,7 @@ msgstr "Uživatel nemá profil." msgid "Other" msgstr "" -#: lib/accountsettingsaction.php:129 +#: lib/accountsettingsaction.php:128 msgid "Other options" msgstr "" @@ -3499,21 +3547,21 @@ msgstr "" msgid "license." msgstr "" -#: lib/action.php:1053 +#: lib/action.php:1052 msgid "Pagination" msgstr "" -#: lib/action.php:1062 +#: lib/action.php:1061 #, fuzzy msgid "After" msgstr "« NovÄ›jÅ¡Ã" -#: lib/action.php:1070 +#: lib/action.php:1069 #, fuzzy msgid "Before" msgstr "Staršà »" -#: lib/action.php:1119 +#: lib/action.php:1117 msgid "There was a problem with your session token." msgstr "" @@ -3685,13 +3733,46 @@ msgstr "Nelze vytvoÅ™it OpenID z: %s" msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:613 +#: lib/command.php:618 +#, fuzzy +msgid "You are not subscribed to anyone." +msgstr "Neodeslal jste nám profil" + +#: lib/command.php:620 +#, fuzzy +msgid "You are subscribed to these people: " +msgstr "Neodeslal jste nám profil" + +#: lib/command.php:637 +#, fuzzy +msgid "No one is subscribed to you." +msgstr "Vzdálený odbÄ›r" + +#: lib/command.php:639 +#, fuzzy +msgid "These people are subscribed to you: " +msgstr "Vzdálený odbÄ›r" + +#: lib/command.php:656 +#, fuzzy +msgid "You are not a member of any groups." +msgstr "Neodeslal jste nám profil" + +#: lib/command.php:658 +#, fuzzy +msgid "You are a member of these groups: " +msgstr "Neodeslal jste nám profil" + +#: lib/command.php:670 msgid "" "Commands:\n" "on - turn on notifications\n" "off - turn off notifications\n" "help - show this help\n" "follow <nickname> - subscribe to user\n" +"groups - lists the groups you have joined\n" +"subscriptions - list the people you follow\n" +"subscribers - list the people that follow you\n" "leave <nickname> - unsubscribe from user\n" "d <nickname> <text> - direct message to user\n" "get <nickname> - get last notice from user\n" @@ -3721,20 +3802,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:191 +#: lib/common.php:192 #, fuzzy msgid "No configuration file found. " msgstr "Žádný potvrzujÃcà kód." -#: lib/common.php:192 +#: lib/common.php:193 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:193 +#: lib/common.php:194 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:194 +#: lib/common.php:195 msgid "Go to the installer." msgstr "" @@ -4007,8 +4088,8 @@ msgstr "" #: lib/jabber.php:192 #, php-format -msgid "notice id: %s" -msgstr "Nové sdÄ›lenÃ" +msgid "[%s]" +msgstr "" #: lib/joinform.php:114 #, fuzzy @@ -4531,7 +4612,8 @@ msgid "Could not subscribe other to you." msgstr "" #: lib/subs.php:124 -msgid "Not subscribed!." +#, fuzzy +msgid "Not subscribed!" msgstr "NepÅ™ihlášen!" #: lib/subs.php:136 @@ -4580,47 +4662,47 @@ msgstr "" msgid "Message" msgstr "" -#: lib/util.php:818 +#: lib/util.php:821 msgid "a few seconds ago" msgstr "pÅ™ed pár sekundami" -#: lib/util.php:820 +#: lib/util.php:823 msgid "about a minute ago" msgstr "asi pÅ™ed minutou" -#: lib/util.php:822 +#: lib/util.php:825 #, php-format msgid "about %d minutes ago" msgstr "asi pÅ™ed %d minutami" -#: lib/util.php:824 +#: lib/util.php:827 msgid "about an hour ago" msgstr "asi pÅ™ed hodinou" -#: lib/util.php:826 +#: lib/util.php:829 #, php-format msgid "about %d hours ago" msgstr "asi pÅ™ed %d hodinami" -#: lib/util.php:828 +#: lib/util.php:831 msgid "about a day ago" msgstr "asi pÅ™ede dnem" -#: lib/util.php:830 +#: lib/util.php:833 #, php-format msgid "about %d days ago" msgstr "pÅ™ed %d dny" -#: lib/util.php:832 +#: lib/util.php:835 msgid "about a month ago" msgstr "asi pÅ™ed mÄ›sÃcem" -#: lib/util.php:834 +#: lib/util.php:837 #, php-format msgid "about %d months ago" msgstr "asi pÅ™ed %d mesÃci" -#: lib/util.php:836 +#: lib/util.php:839 msgid "about a year ago" msgstr "asi pÅ™ed rokem" diff --git a/locale/de/LC_MESSAGES/statusnet.mo b/locale/de/LC_MESSAGES/statusnet.mo Binary files differindex 9591afa0b..358fc5be4 100644 --- a/locale/de/LC_MESSAGES/statusnet.mo +++ b/locale/de/LC_MESSAGES/statusnet.mo diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po index 0cca46cb4..4480f68c1 100644 --- a/locale/de/LC_MESSAGES/statusnet.po +++ b/locale/de/LC_MESSAGES/statusnet.po @@ -6,12 +6,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-10 20:53+0000\n" -"PO-Revision-Date: 2009-11-10 20:58:49+0000\n" +"POT-Creation-Date: 2009-11-16 19:42+0000\n" +"PO-Revision-Date: 2009-11-16 19:43:12+0000\n" "Language-Team: German\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: de\n" "X-Message-Group: out-statusnet\n" @@ -23,12 +23,15 @@ msgid "No such page" msgstr "Tag nicht vorhanden." #: actions/all.php:74 actions/allrss.php:68 -#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofilebackgroundimage.php:116 +#: actions/apiaccountupdateprofileimage.php:105 +#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 #: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 #: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 @@ -107,35 +110,42 @@ msgstr "%s und Freunde" msgid "Updates from %1$s and friends on %2$s!" msgstr "Aktualisierungen von %1$s und Freunden auf %2$s!" -#: actions/apiaccountratelimitstatus.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 -#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:129 actions/apigroupcreate.php:184 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120 -#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101 -#: actions/apigroupshow.php:105 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144 -#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141 -#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130 -#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163 -#: actions/apiusershow.php:101 -msgid "API method not found!" +#: actions/apiaccountratelimitstatus.php:70 +#: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofilebackgroundimage.php:94 +#: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apiaccountupdateprofile.php:97 +#, fuzzy +msgid "API method not found." msgstr "API-Methode nicht gefunden!" -#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 +#: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofilebackgroundimage.php:86 +#: actions/apiaccountupdateprofilecolors.php:110 +#: actions/apiaccountupdateprofileimage.php:84 +#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109 +#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "Diese Methode benötigt ein POST." +#: actions/apiaccountupdatedeliverydevice.php:105 +msgid "" +"You must specify a parameter named 'device' with a value of one of: sms, im, " +"none" +msgstr "" + +#: actions/apiaccountupdatedeliverydevice.php:132 +#, fuzzy +msgid "Could not update user." +msgstr "Konnte Benutzerdaten nicht aktualisieren." + +#: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 #: actions/newnotice.php:94 lib/designsettings.php:283 #, php-format msgid "" @@ -143,12 +153,34 @@ msgid "" "current configuration." msgstr "" -#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/apiaccountupdateprofilebackgroundimage.php:136 +#: actions/apiaccountupdateprofilebackgroundimage.php:146 +#: actions/apiaccountupdateprofilecolors.php:164 +#: actions/apiaccountupdateprofilecolors.php:174 +#, fuzzy +msgid "Unable to save your design settings." +msgstr "Konnte Twitter Einstellungen nicht speichern!" + +#: actions/apiaccountupdateprofilebackgroundimage.php:187 +#: actions/apiaccountupdateprofilecolors.php:142 +#, fuzzy +msgid "Could not update your design." +msgstr "Konnte Benutzerdaten nicht aktualisieren." + +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 +#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 #: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 msgid "User has no profile." msgstr "Benutzer hat kein Profil." +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "Konnte Profil nicht speichern." + #: actions/apiblockcreate.php:108 msgid "Block user failed." msgstr "Blockieren des Benutzers fehlgeschlagen." @@ -197,6 +229,23 @@ msgstr "Direkte Nachricht an %s" msgid "All the direct messages sent to %s" msgstr "Alle an %s gesendeten direkten Nachrichten" +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 +#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 +#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 +#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149 +#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +msgid "API method not found!" +msgstr "API-Methode nicht gefunden!" + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -394,18 +443,18 @@ msgstr "Avatar aktualisiert." msgid "No status with that ID found." msgstr "Keine Nachricht mit dieser ID gefunden." -#: actions/apistatusesupdate.php:152 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 #: scripts/maildaemon.php:71 #, fuzzy, 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 140 Zeichen beschränkt." -#: actions/apistatusesupdate.php:193 +#: actions/apistatusesupdate.php:198 msgid "Not found" msgstr "Nicht gefunden" -#: actions/apistatusesupdate.php:216 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:227 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -489,7 +538,7 @@ msgid "Invalid size." msgstr "Ungültige Größe." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:113 +#: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "Avatar" @@ -538,7 +587,7 @@ msgstr "Zuschneiden" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:151 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -1698,7 +1747,7 @@ msgid "Nickname" msgstr "Nutzername" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Passwort" @@ -1837,7 +1886,7 @@ msgstr "" #: actions/noticesearch.php:124 #, php-format msgid "" -"Why not [register an account](%%%%action.register%%%%) and be the first to " +"Why not [register an account](%%%%action.register%%%%) and be the first to " "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" msgstr "" @@ -1884,8 +1933,8 @@ msgstr "Verbinden" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963 -#: lib/api.php:991 lib/api.php:1101 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 +#: lib/api.php:1027 lib/api.php:1137 msgid "Not a supported data format." msgstr "Kein unterstütztes Datenformat." @@ -1905,11 +1954,15 @@ msgstr "Andere Einstellungen" msgid "Manage various other options." msgstr "Verwalte zahlreiche andere Einstellungen." -#: actions/othersettings.php:117 +#: actions/othersettings.php:108 +msgid " (free service)" +msgstr "" + +#: actions/othersettings.php:116 msgid "Shorten URLs with" msgstr "" -#: actions/othersettings.php:118 +#: actions/othersettings.php:117 msgid "Automatic shortening service to use." msgstr "URL-Auto-Kürzungs-Dienst." @@ -1945,65 +1998,60 @@ msgstr "" msgid "Change password" msgstr "Passwort ändern" -#: actions/passwordsettings.php:70 -#, fuzzy -msgid "You are not allowed to change your password" -msgstr "Ändere dein Passwort" - -#: actions/passwordsettings.php:82 +#: actions/passwordsettings.php:69 msgid "Change your password." msgstr "Ändere dein Passwort." -#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:96 actions/recoverpassword.php:231 msgid "Password change" msgstr "Passwort geändert" -#: actions/passwordsettings.php:117 +#: actions/passwordsettings.php:104 msgid "Old password" msgstr "Altes Passwort" -#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:108 actions/recoverpassword.php:235 msgid "New password" msgstr "Neues Passwort" -#: actions/passwordsettings.php:122 +#: actions/passwordsettings.php:109 msgid "6 or more characters" msgstr "6 oder mehr Zeichen" -#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:112 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Bestätigen" -#: actions/passwordsettings.php:126 +#: actions/passwordsettings.php:113 msgid "same as password above" msgstr "Gleiches Passwort wie oben" -#: actions/passwordsettings.php:130 +#: actions/passwordsettings.php:117 msgid "Change" msgstr "Ändern" -#: actions/passwordsettings.php:167 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "Das Passwort muss aus 6 oder mehr Zeichen bestehen." -#: actions/passwordsettings.php:170 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:233 msgid "Passwords don't match." msgstr "Passwörter stimmen nicht überein." -#: actions/passwordsettings.php:178 +#: actions/passwordsettings.php:165 msgid "Incorrect old password" msgstr "Altes Passwort falsch" -#: actions/passwordsettings.php:194 +#: actions/passwordsettings.php:181 msgid "Error saving user; invalid." msgstr "Fehler beim Speichern des Nutzers, ungültig." -#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Konnte neues Passwort nicht speichern" -#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:192 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Passwort gespeichert." @@ -2450,7 +2498,7 @@ msgid "Same as password above. Required." msgstr "Gleiches Passwort wie zuvor. Pflichteingabe." #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:122 +#: lib/accountsettingsaction.php:120 msgid "Email" msgstr "E-Mail" @@ -3390,36 +3438,36 @@ msgstr "Problem bei Speichern der Nachricht." msgid "DB error inserting reply: %s" msgstr "Datenbankfehler beim Einfügen der Antwort: %s" -#: classes/User.php:333 +#: classes/User.php:347 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Nachricht an %1$s auf %2$s" -#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Profil" -#: lib/accountsettingsaction.php:110 +#: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "Ändern der Profileinstellungen" -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:112 msgid "Upload an avatar" msgstr "Avatar hochladen" -#: lib/accountsettingsaction.php:119 +#: lib/accountsettingsaction.php:116 msgid "Change your password" msgstr "Ändere dein Passwort" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:120 msgid "Change email handling" msgstr "Ändere die E-Mail Verarbeitung" -#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 +#: lib/accountsettingsaction.php:124 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:126 +#: lib/accountsettingsaction.php:124 #, fuzzy msgid "Design your profile" msgstr "Benutzerprofil" @@ -3428,7 +3476,7 @@ msgstr "Benutzerprofil" msgid "Other" msgstr "Sonstige" -#: lib/accountsettingsaction.php:129 +#: lib/accountsettingsaction.php:128 msgid "Other options" msgstr "Sonstige Optionen" @@ -3599,19 +3647,19 @@ msgstr "Alle " msgid "license." msgstr "Lizenz." -#: lib/action.php:1053 +#: lib/action.php:1052 msgid "Pagination" msgstr "Seitenerstellung" -#: lib/action.php:1062 +#: lib/action.php:1061 msgid "After" msgstr "Später" -#: lib/action.php:1070 +#: lib/action.php:1069 msgid "Before" msgstr "Vorher" -#: lib/action.php:1119 +#: lib/action.php:1117 msgid "There was a problem with your session token." msgstr "Es gab ein Problem mit deinem Sessiontoken." @@ -3783,13 +3831,46 @@ msgstr "Konnte OpenID-Formular nicht erstellen: %s" msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:613 +#: lib/command.php:618 +#, fuzzy +msgid "You are not subscribed to anyone." +msgstr "Du hast dieses Profil nicht abonniert." + +#: lib/command.php:620 +#, fuzzy +msgid "You are subscribed to these people: " +msgstr "Du hast dieses Profil nicht abonniert." + +#: lib/command.php:637 +#, fuzzy +msgid "No one is subscribed to you." +msgstr "Die Gegenseite konnte Dich nicht abonnieren." + +#: lib/command.php:639 +#, fuzzy +msgid "These people are subscribed to you: " +msgstr "Leute, die %s abonniert haben" + +#: lib/command.php:656 +#, fuzzy +msgid "You are not a member of any groups." +msgstr "Du bist kein Mitglied dieser Gruppe." + +#: lib/command.php:658 +#, fuzzy +msgid "You are a member of these groups: " +msgstr "Du bist kein Mitglied dieser Gruppe." + +#: lib/command.php:670 msgid "" "Commands:\n" "on - turn on notifications\n" "off - turn off notifications\n" "help - show this help\n" "follow <nickname> - subscribe to user\n" +"groups - lists the groups you have joined\n" +"subscriptions - list the people you follow\n" +"subscribers - list the people that follow you\n" "leave <nickname> - unsubscribe from user\n" "d <nickname> <text> - direct message to user\n" "get <nickname> - get last notice from user\n" @@ -3819,20 +3900,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:191 +#: lib/common.php:192 #, fuzzy msgid "No configuration file found. " msgstr "Kein Bestätigungs-Code." -#: lib/common.php:192 +#: lib/common.php:193 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:193 +#: lib/common.php:194 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:194 +#: lib/common.php:195 #, fuzzy msgid "Go to the installer." msgstr "Auf der Seite anmelden" @@ -4109,8 +4190,8 @@ msgstr "Unbekannter Dateityp" #: lib/jabber.php:192 #, php-format -msgid "notice id: %s" -msgstr "Neue Nachricht" +msgid "[%s]" +msgstr "" #: lib/joinform.php:114 #, fuzzy @@ -4646,7 +4727,8 @@ msgid "Could not subscribe other to you." msgstr "Die Gegenseite konnte Dich nicht abonnieren." #: lib/subs.php:124 -msgid "Not subscribed!." +#, fuzzy +msgid "Not subscribed!" msgstr "Nicht abonniert!" #: lib/subs.php:136 @@ -4695,47 +4777,47 @@ msgstr "Direkte Nachricht an Benutzer verschickt" msgid "Message" msgstr "Nachricht" -#: lib/util.php:818 +#: lib/util.php:821 msgid "a few seconds ago" msgstr "vor wenigen Sekunden" -#: lib/util.php:820 +#: lib/util.php:823 msgid "about a minute ago" msgstr "vor einer Minute" -#: lib/util.php:822 +#: lib/util.php:825 #, php-format msgid "about %d minutes ago" msgstr "vor %d Minuten" -#: lib/util.php:824 +#: lib/util.php:827 msgid "about an hour ago" msgstr "vor einer Stunde" -#: lib/util.php:826 +#: lib/util.php:829 #, php-format msgid "about %d hours ago" msgstr "vor %d Stunden" -#: lib/util.php:828 +#: lib/util.php:831 msgid "about a day ago" msgstr "vor einem Tag" -#: lib/util.php:830 +#: lib/util.php:833 #, php-format msgid "about %d days ago" msgstr "vor %d Tagen" -#: lib/util.php:832 +#: lib/util.php:835 msgid "about a month ago" msgstr "vor einem Monat" -#: lib/util.php:834 +#: lib/util.php:837 #, php-format msgid "about %d months ago" msgstr "vor %d Monaten" -#: lib/util.php:836 +#: lib/util.php:839 msgid "about a year ago" msgstr "vor einem Jahr" diff --git a/locale/el/LC_MESSAGES/statusnet.mo b/locale/el/LC_MESSAGES/statusnet.mo Binary files differindex 72dc2ce58..464aca5ea 100644 --- a/locale/el/LC_MESSAGES/statusnet.mo +++ b/locale/el/LC_MESSAGES/statusnet.mo diff --git a/locale/el/LC_MESSAGES/statusnet.po b/locale/el/LC_MESSAGES/statusnet.po index a7163a762..f8fa1eb63 100644 --- a/locale/el/LC_MESSAGES/statusnet.po +++ b/locale/el/LC_MESSAGES/statusnet.po @@ -5,12 +5,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-10 20:53+0000\n" -"PO-Revision-Date: 2009-11-10 20:58:52+0000\n" +"POT-Creation-Date: 2009-11-16 19:42+0000\n" +"PO-Revision-Date: 2009-11-16 19:43:15+0000\n" "Language-Team: Greek\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: el\n" "X-Message-Group: out-statusnet\n" @@ -22,12 +22,15 @@ msgid "No such page" msgstr "ΑδÏνατη η αποθήκευση του Ï€Ïοφίλ." #: actions/all.php:74 actions/allrss.php:68 -#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofilebackgroundimage.php:116 +#: actions/apiaccountupdateprofileimage.php:105 +#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 #: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 #: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 @@ -106,35 +109,42 @@ msgstr "%s και οι φίλοι του/της" msgid "Updates from %1$s and friends on %2$s!" msgstr "" -#: actions/apiaccountratelimitstatus.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 -#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:129 actions/apigroupcreate.php:184 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120 -#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101 -#: actions/apigroupshow.php:105 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144 -#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141 -#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130 -#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163 -#: actions/apiusershow.php:101 -msgid "API method not found!" +#: actions/apiaccountratelimitstatus.php:70 +#: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofilebackgroundimage.php:94 +#: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apiaccountupdateprofile.php:97 +#, fuzzy +msgid "API method not found." msgstr "Η μÎθοδος του ΑΡΙ δε βÏÎθηκε!" -#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 +#: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofilebackgroundimage.php:86 +#: actions/apiaccountupdateprofilecolors.php:110 +#: actions/apiaccountupdateprofileimage.php:84 +#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109 +#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "" +#: actions/apiaccountupdatedeliverydevice.php:105 +msgid "" +"You must specify a parameter named 'device' with a value of one of: sms, im, " +"none" +msgstr "" + +#: actions/apiaccountupdatedeliverydevice.php:132 +#, fuzzy +msgid "Could not update user." +msgstr "ΑπÎτυχε η ενημÎÏωση του χÏήστη." + +#: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 #: actions/newnotice.php:94 lib/designsettings.php:283 #, php-format msgid "" @@ -142,12 +152,33 @@ msgid "" "current configuration." msgstr "" -#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/apiaccountupdateprofilebackgroundimage.php:136 +#: actions/apiaccountupdateprofilebackgroundimage.php:146 +#: actions/apiaccountupdateprofilecolors.php:164 +#: actions/apiaccountupdateprofilecolors.php:174 +msgid "Unable to save your design settings." +msgstr "" + +#: actions/apiaccountupdateprofilebackgroundimage.php:187 +#: actions/apiaccountupdateprofilecolors.php:142 +#, fuzzy +msgid "Could not update your design." +msgstr "ΑπÎτυχε η ενημÎÏωση του χÏήστη." + +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 +#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 #: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 msgid "User has no profile." msgstr "" +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "ΑπÎτυχε η αποθήκευση του Ï€Ïοφίλ." + #: actions/apiblockcreate.php:108 msgid "Block user failed." msgstr "" @@ -193,6 +224,23 @@ msgstr "" msgid "All the direct messages sent to %s" msgstr "" +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 +#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 +#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 +#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149 +#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +msgid "API method not found!" +msgstr "Η μÎθοδος του ΑΡΙ δε βÏÎθηκε!" + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -386,17 +434,17 @@ msgstr "Ρυθμίσεις OpenID" msgid "No status with that ID found." msgstr "" -#: actions/apistatusesupdate.php:152 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 #: scripts/maildaemon.php:71 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" -#: actions/apistatusesupdate.php:193 +#: actions/apistatusesupdate.php:198 msgid "Not found" msgstr "" -#: actions/apistatusesupdate.php:216 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:227 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -478,7 +526,7 @@ msgid "Invalid size." msgstr "" #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:113 +#: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "" @@ -527,7 +575,7 @@ msgstr "" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:151 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -1613,7 +1661,7 @@ msgid "Nickname" msgstr "Ψευδώνυμο" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Κωδικός" @@ -1747,7 +1795,7 @@ msgstr "" #: actions/noticesearch.php:124 #, php-format msgid "" -"Why not [register an account](%%%%action.register%%%%) and be the first to " +"Why not [register an account](%%%%action.register%%%%) and be the first to " "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" msgstr "" @@ -1792,8 +1840,8 @@ msgstr "ΣÏνδεση" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963 -#: lib/api.php:991 lib/api.php:1101 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 +#: lib/api.php:1027 lib/api.php:1137 msgid "Not a supported data format." msgstr "" @@ -1814,11 +1862,15 @@ msgstr "Ρυθμίσεις OpenID" msgid "Manage various other options." msgstr "" -#: actions/othersettings.php:117 +#: actions/othersettings.php:108 +msgid " (free service)" +msgstr "" + +#: actions/othersettings.php:116 msgid "Shorten URLs with" msgstr "" -#: actions/othersettings.php:118 +#: actions/othersettings.php:117 msgid "Automatic shortening service to use." msgstr "" @@ -1853,67 +1905,62 @@ msgstr "" msgid "Change password" msgstr "Αλλαγή κωδικοÏ" -#: actions/passwordsettings.php:70 -#, fuzzy -msgid "You are not allowed to change your password" -msgstr "Αλλάξτε τον κωδικό σας" - -#: actions/passwordsettings.php:82 +#: actions/passwordsettings.php:69 #, fuzzy msgid "Change your password." msgstr "Αλλαγή κωδικοÏ" -#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:96 actions/recoverpassword.php:231 #, fuzzy msgid "Password change" msgstr "Ο κωδικός αποθηκεÏτηκε." -#: actions/passwordsettings.php:117 +#: actions/passwordsettings.php:104 msgid "Old password" msgstr "" -#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:108 actions/recoverpassword.php:235 msgid "New password" msgstr "ÎÎος κωδικός" -#: actions/passwordsettings.php:122 +#: actions/passwordsettings.php:109 msgid "6 or more characters" msgstr "6 ή πεÏισσότεÏοι χαÏακτήÏες" -#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:112 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Επιβεβαίωση" -#: actions/passwordsettings.php:126 +#: actions/passwordsettings.php:113 msgid "same as password above" msgstr "" -#: actions/passwordsettings.php:130 +#: actions/passwordsettings.php:117 msgid "Change" msgstr "Αλλαγή" -#: actions/passwordsettings.php:167 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "" -#: actions/passwordsettings.php:170 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:233 msgid "Passwords don't match." msgstr "Οι κωδικοί δεν ταυτίζονται." -#: actions/passwordsettings.php:178 +#: actions/passwordsettings.php:165 msgid "Incorrect old password" msgstr "Λάθος παλιός κωδικός" -#: actions/passwordsettings.php:194 +#: actions/passwordsettings.php:181 msgid "Error saving user; invalid." msgstr "" -#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "ΑδÏνατη η αποθήκευση του νÎου κωδικοÏ" -#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:192 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Ο κωδικός αποθηκεÏτηκε." @@ -2346,7 +2393,7 @@ msgid "Same as password above. Required." msgstr "" #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:122 +#: lib/accountsettingsaction.php:120 msgid "Email" msgstr "Email" @@ -3245,36 +3292,36 @@ msgstr "" msgid "DB error inserting reply: %s" msgstr "Σφάλμα βάσης δεδομÎνων κατά την εισαγωγή απάντησης: %s" -#: classes/User.php:333 +#: classes/User.php:347 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" -#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 msgid "Profile" msgstr "" -#: lib/accountsettingsaction.php:110 +#: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "Αλλάξτε τις Ïυθμίσεις του Ï€Ïοφίλ σας" -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:112 msgid "Upload an avatar" msgstr "" -#: lib/accountsettingsaction.php:119 +#: lib/accountsettingsaction.php:116 msgid "Change your password" msgstr "Αλλάξτε τον κωδικό σας" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:120 msgid "Change email handling" msgstr "" -#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 +#: lib/accountsettingsaction.php:124 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:126 +#: lib/accountsettingsaction.php:124 #, fuzzy msgid "Design your profile" msgstr "ΑδÏνατη η αποθήκευση του Ï€Ïοφίλ." @@ -3283,7 +3330,7 @@ msgstr "ΑδÏνατη η αποθήκευση του Ï€Ïοφίλ." msgid "Other" msgstr "" -#: lib/accountsettingsaction.php:129 +#: lib/accountsettingsaction.php:128 msgid "Other options" msgstr "" @@ -3452,19 +3499,19 @@ msgstr "" msgid "license." msgstr "" -#: lib/action.php:1053 +#: lib/action.php:1052 msgid "Pagination" msgstr "" -#: lib/action.php:1062 +#: lib/action.php:1061 msgid "After" msgstr "" -#: lib/action.php:1070 +#: lib/action.php:1069 msgid "Before" msgstr "" -#: lib/action.php:1119 +#: lib/action.php:1117 msgid "There was a problem with your session token." msgstr "" @@ -3634,13 +3681,44 @@ msgstr "Αδυναμία δημιουÏγίας φόÏμας OpenID: %s " msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:613 +#: lib/command.php:618 +#, fuzzy +msgid "You are not subscribed to anyone." +msgstr "Δεν επιτÏÎπεται να κάνεις συνδÏομητÎÏ‚ του λογαÏÎ¹Î±ÏƒÎ¼Î¿Ï ÏƒÎ¿Ï… άλλους." + +#: lib/command.php:620 +#, fuzzy +msgid "You are subscribed to these people: " +msgstr "Δεν επιτÏÎπεται να κάνεις συνδÏομητÎÏ‚ του λογαÏÎ¹Î±ÏƒÎ¼Î¿Ï ÏƒÎ¿Ï… άλλους." + +#: lib/command.php:637 +#, fuzzy +msgid "No one is subscribed to you." +msgstr "Δεν επιτÏÎπεται να κάνεις συνδÏομητÎÏ‚ του λογαÏÎ¹Î±ÏƒÎ¼Î¿Ï ÏƒÎ¿Ï… άλλους." + +#: lib/command.php:639 +msgid "These people are subscribed to you: " +msgstr "" + +#: lib/command.php:656 +#, fuzzy +msgid "You are not a member of any groups." +msgstr "Ομάδες με τα πεÏισσότεÏα μÎλη" + +#: lib/command.php:658 +msgid "You are a member of these groups: " +msgstr "" + +#: lib/command.php:670 msgid "" "Commands:\n" "on - turn on notifications\n" "off - turn off notifications\n" "help - show this help\n" "follow <nickname> - subscribe to user\n" +"groups - lists the groups you have joined\n" +"subscriptions - list the people you follow\n" +"subscribers - list the people that follow you\n" "leave <nickname> - unsubscribe from user\n" "d <nickname> <text> - direct message to user\n" "get <nickname> - get last notice from user\n" @@ -3670,20 +3748,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:191 +#: lib/common.php:192 #, fuzzy msgid "No configuration file found. " msgstr "Ο κωδικός επιβεβαίωσης δεν βÏÎθηκε." -#: lib/common.php:192 +#: lib/common.php:193 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:193 +#: lib/common.php:194 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:194 +#: lib/common.php:195 msgid "Go to the installer." msgstr "" @@ -3948,9 +4026,9 @@ msgid "Unknown file type" msgstr "" #: lib/jabber.php:192 -#, fuzzy, php-format -msgid "notice id: %s" -msgstr "Μήνυμα" +#, php-format +msgid "[%s]" +msgstr "" #: lib/joinform.php:114 #, fuzzy @@ -4459,8 +4537,9 @@ msgid "Could not subscribe other to you." msgstr "Δεν επιτÏÎπεται να κάνεις συνδÏομητÎÏ‚ του λογαÏÎ¹Î±ÏƒÎ¼Î¿Ï ÏƒÎ¿Ï… άλλους." #: lib/subs.php:124 -msgid "Not subscribed!." -msgstr "" +#, fuzzy +msgid "Not subscribed!" +msgstr "ΑπÎτυχε η συνδÏομή." #: lib/subs.php:136 msgid "Couldn't delete subscription." @@ -4507,47 +4586,47 @@ msgstr "" msgid "Message" msgstr "" -#: lib/util.php:818 +#: lib/util.php:821 msgid "a few seconds ago" msgstr "" -#: lib/util.php:820 +#: lib/util.php:823 msgid "about a minute ago" msgstr "" -#: lib/util.php:822 +#: lib/util.php:825 #, php-format msgid "about %d minutes ago" msgstr "" -#: lib/util.php:824 +#: lib/util.php:827 msgid "about an hour ago" msgstr "" -#: lib/util.php:826 +#: lib/util.php:829 #, php-format msgid "about %d hours ago" msgstr "" -#: lib/util.php:828 +#: lib/util.php:831 msgid "about a day ago" msgstr "" -#: lib/util.php:830 +#: lib/util.php:833 #, php-format msgid "about %d days ago" msgstr "" -#: lib/util.php:832 +#: lib/util.php:835 msgid "about a month ago" msgstr "" -#: lib/util.php:834 +#: lib/util.php:837 #, php-format msgid "about %d months ago" msgstr "" -#: lib/util.php:836 +#: lib/util.php:839 msgid "about a year ago" msgstr "" diff --git a/locale/en_GB/LC_MESSAGES/statusnet.mo b/locale/en_GB/LC_MESSAGES/statusnet.mo Binary files differindex b6dc8fa58..33531f33c 100644 --- a/locale/en_GB/LC_MESSAGES/statusnet.mo +++ b/locale/en_GB/LC_MESSAGES/statusnet.mo diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po index 384e60927..c65fc1c73 100644 --- a/locale/en_GB/LC_MESSAGES/statusnet.po +++ b/locale/en_GB/LC_MESSAGES/statusnet.po @@ -1,5 +1,6 @@ # Translation of StatusNet to British English # +# Author@translatewiki.net: CiaranG # -- # #-#-#-#-# statusnet.new.pot (PACKAGE VERSION) #-#-#-#-# # SOME DESCRIPTIVE TITLE. @@ -11,29 +12,31 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-10 20:53+0000\n" -"PO-Revision-Date: 2009-11-10 20:58:54+0000\n" +"POT-Creation-Date: 2009-11-16 19:42+0000\n" +"PO-Revision-Date: 2009-11-16 19:43:18+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(r58872); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: en-gb\n" "X-Message-Group: out-statusnet\n" #: actions/all.php:63 actions/public.php:97 actions/replies.php:92 #: actions/showfavorites.php:137 actions/tag.php:51 -#, fuzzy msgid "No such page" -msgstr "No such tag." +msgstr "No such page" #: actions/all.php:74 actions/allrss.php:68 -#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofilebackgroundimage.php:116 +#: actions/apiaccountupdateprofileimage.php:105 +#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 #: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 #: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 @@ -61,19 +64,19 @@ msgid "%s and friends" msgstr "%s and friends" #: actions/all.php:99 -#, fuzzy, php-format +#, php-format msgid "Feed for friends of %s (RSS 1.0)" -msgstr "Feed for friends of %s" +msgstr "Feed for friends of %s (RSS 1.0)" #: actions/all.php:107 -#, fuzzy, php-format +#, php-format msgid "Feed for friends of %s (RSS 2.0)" -msgstr "Feed for friends of %s" +msgstr "Feed for friends of %s (RSS 2.0)" #: actions/all.php:115 -#, fuzzy, php-format +#, php-format msgid "Feed for friends of %s (Atom)" -msgstr "Feed for friends of %s" +msgstr "Feed for friends of %s (Atom)" #: actions/all.php:127 #, php-format @@ -103,44 +106,49 @@ msgid "" msgstr "" #: actions/all.php:165 -#, fuzzy msgid "You and friends" -msgstr "%s and friends" +msgstr "You and friends" #: actions/allrss.php:119 actions/apitimelinefriends.php:121 #, php-format msgid "Updates from %1$s and friends on %2$s!" msgstr "Updates from %1$s and friends on %2$s!" -#: actions/apiaccountratelimitstatus.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 -#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:129 actions/apigroupcreate.php:184 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120 -#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101 -#: actions/apigroupshow.php:105 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144 -#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141 -#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130 -#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163 -#: actions/apiusershow.php:101 -msgid "API method not found!" -msgstr "API method not found!" - -#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 +#: actions/apiaccountratelimitstatus.php:70 +#: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofilebackgroundimage.php:94 +#: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apiaccountupdateprofile.php:97 +msgid "API method not found." +msgstr "API method not found." + +#: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofilebackgroundimage.php:86 +#: actions/apiaccountupdateprofilecolors.php:110 +#: actions/apiaccountupdateprofileimage.php:84 +#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109 +#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "This method requires a POST." +#: actions/apiaccountupdatedeliverydevice.php:105 +msgid "" +"You must specify a parameter named 'device' with a value of one of: sms, im, " +"none" +msgstr "" + +#: actions/apiaccountupdatedeliverydevice.php:132 +#, fuzzy +msgid "Could not update user." +msgstr "Couldn't update user." + +#: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 #: actions/newnotice.php:94 lib/designsettings.php:283 #, php-format msgid "" @@ -148,12 +156,32 @@ msgid "" "current configuration." msgstr "" -#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/apiaccountupdateprofilebackgroundimage.php:136 +#: actions/apiaccountupdateprofilebackgroundimage.php:146 +#: actions/apiaccountupdateprofilecolors.php:164 +#: actions/apiaccountupdateprofilecolors.php:174 +msgid "Unable to save your design settings." +msgstr "Unable to save your design settings!" + +#: actions/apiaccountupdateprofilebackgroundimage.php:187 +#: actions/apiaccountupdateprofilecolors.php:142 +msgid "Could not update your design." +msgstr "Could not update your design." + +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 +#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 #: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 msgid "User has no profile." msgstr "User has no profile." +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "Couldn't save profile." + #: actions/apiblockcreate.php:108 msgid "Block user failed." msgstr "Block user failed." @@ -167,9 +195,9 @@ msgid "No message text!" msgstr "No message text!" #: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 -#, fuzzy, php-format +#, php-format msgid "That's too long. Max message size is %d chars." -msgstr "That's too long. Max message size is 140 chars." +msgstr "That's too long. Max message size is %d chars." #: actions/apidirectmessagenew.php:146 msgid "Recipient user not found." @@ -180,9 +208,9 @@ msgid "Can't send direct messages to users who aren't your friend." msgstr "Can't send direct messages to users who aren't your friend." #: actions/apidirectmessage.php:89 -#, fuzzy, php-format +#, php-format msgid "Direct messages from %s" -msgstr "Direct messages to %s" +msgstr "Direct messages from %s" #: actions/apidirectmessage.php:93 #, php-format @@ -199,24 +227,39 @@ msgstr "Direct messages to %s" msgid "All the direct messages sent to %s" msgstr "All the direct messages sent to %s" +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 +#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 +#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 +#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149 +#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +msgid "API method not found!" +msgstr "API method not found!" + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." msgstr "No status found with that ID." #: actions/apifavoritecreate.php:119 -#, fuzzy msgid "This status is already a favorite!" -msgstr "This notice is already a favourite!" +msgstr "This status is already a favourite!" #: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 msgid "Could not create favorite." msgstr "Could not create favourite." #: actions/apifavoritedestroy.php:122 -#, fuzzy msgid "That status is not a favorite!" -msgstr "This notice is not a favourite!" +msgstr "That status is not a favourite!" #: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 msgid "Could not delete favorite." @@ -232,9 +275,8 @@ msgid "Could not follow user: %s is already on your list." msgstr "Could not follow user: %s is already on your list." #: actions/apifriendshipsdestroy.php:109 -#, fuzzy msgid "Could not unfollow user: User not found." -msgstr "Could not follow user: User not found." +msgstr "Could not unfollow user: User not found." #: actions/apifriendshipsdestroy.php:120 msgid "You cannot unfollow yourself!" @@ -260,9 +302,8 @@ msgstr "Could not create group." #: actions/apigroupcreate.php:147 actions/editgroup.php:259 #: actions/newgroup.php:210 -#, fuzzy msgid "Could not create aliases." -msgstr "Could not create favourite." +msgstr "Could not create aliases" #: actions/apigroupcreate.php:166 actions/newgroup.php:224 msgid "Could not set group membership." @@ -333,9 +374,8 @@ msgid "Alias can't be the same as nickname." msgstr "" #: actions/apigroupjoin.php:110 -#, fuzzy msgid "You are already a member of that group." -msgstr "You are already a member of that group" +msgstr "You are already a member of that group." #: actions/apigroupjoin.php:119 actions/joingroup.php:95 lib/command.php:221 msgid "You have been blocked from that group by the admin." @@ -393,17 +433,17 @@ msgstr "Avatar updated." msgid "No status with that ID found." msgstr "No status with that ID found." -#: actions/apistatusesupdate.php:152 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 #: scripts/maildaemon.php:71 -#, fuzzy, php-format +#, php-format msgid "That's too long. Max notice size is %d chars." -msgstr "That's too long. Max notice size is 140 chars." +msgstr "That's too long. Max notice size is %d chars." -#: actions/apistatusesupdate.php:193 +#: actions/apistatusesupdate.php:198 msgid "Not found" msgstr "Not found" -#: actions/apistatusesupdate.php:216 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:227 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -487,7 +527,7 @@ msgid "Invalid size." msgstr "Invalid size." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:113 +#: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "Avatar" @@ -535,7 +575,7 @@ msgstr "Crop" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:151 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -675,9 +715,8 @@ msgid "Failed to save block information." msgstr "Failed to save block information." #: actions/bookmarklet.php:50 -#, fuzzy msgid "Post to " -msgstr "Photo" +msgstr "Post to " #: actions/confirmaddress.php:75 msgid "No confirmation code." @@ -723,9 +762,8 @@ msgid "The address \"%s\" has been confirmed for your account." msgstr "The address \"%s\" has been confirmed for your account." #: actions/conversation.php:99 -#, fuzzy msgid "Conversation" -msgstr "Confirmation code" +msgstr "Conversation" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 #: lib/profileaction.php:206 @@ -758,9 +796,8 @@ msgid "Are you sure you want to delete this notice?" msgstr "Are you sure you want to delete this notice?" #: actions/deletenotice.php:145 -#, fuzzy msgid "Do not delete this notice" -msgstr "Can't delete this notice." +msgstr "Do not delete this notice" #: actions/deletenotice.php:146 lib/noticelist.php:522 msgid "Delete this notice" @@ -898,9 +935,8 @@ msgid "Send me email when someone sends me a private message." msgstr "Send me e-mail when someone sends me a private message." #: actions/emailsettings.php:174 -#, fuzzy msgid "Send me email when someone sends me an \"@-reply\"." -msgstr "Send me e-mail when someone sends me a private message." +msgstr "Send me e-mail when someone sends me an \"@-reply\"." #: actions/emailsettings.php:179 msgid "Allow friends to nudge me and send me an email." @@ -1017,12 +1053,15 @@ msgstr "The most popular notices on the site right now." #: actions/favorited.php:150 msgid "Favorite notices appear on this page but no one has favorited one yet." msgstr "" +"Favourite notices appear on this page but no one has favourited one yet" #: actions/favorited.php:153 msgid "" "Be the first to add a notice to your favorites by clicking the fave button " "next to any notice you like." msgstr "" +"Be the first to add a notice to your favourites by clicking the fave button " +"next to any notice you like." #: actions/favorited.php:156 #, php-format @@ -1030,6 +1069,8 @@ msgid "" "Why not [register an account](%%action.register%%) and be the first to add a " "notice to your favorites!" msgstr "" +"Why not [register an account](%%action.register%%) and be the first to add a " +"notice to your favourites!" #: actions/favoritesrss.php:111 actions/showfavorites.php:77 #: lib/personalgroupnav.php:115 @@ -1038,9 +1079,9 @@ msgid "%s's favorite notices" msgstr "%s's favourite notices" #: actions/favoritesrss.php:115 -#, fuzzy, php-format +#, php-format msgid "Updates favored by %1$s on %2$s!" -msgstr "Updates from %1$s on %2$s!" +msgstr "Updates favoured by %1$s on %2$s!" #: actions/favor.php:79 msgid "This notice is already a favorite!" @@ -1066,14 +1107,12 @@ msgid "A selection of some of the great users on %s" msgstr "A selection of some of the great users on %s" #: actions/file.php:34 -#, fuzzy msgid "No notice id" -msgstr "New notice" +msgstr "No notice id" #: actions/file.php:38 -#, fuzzy msgid "No notice" -msgstr "New notice" +msgstr "No notice." #: actions/file.php:42 msgid "No attachments" @@ -1101,9 +1140,8 @@ msgid "That user has blocked you from subscribing." msgstr "That user has blocked you from subscribing." #: actions/finishremotesubscribe.php:106 -#, fuzzy msgid "You are not authorized." -msgstr "Not authorised." +msgstr "You are not authorised." #: actions/finishremotesubscribe.php:109 #, fuzzy @@ -1146,14 +1184,12 @@ msgid "Only an admin can block group members." msgstr "" #: actions/groupblock.php:95 -#, fuzzy msgid "User is already blocked from group." -msgstr "User has blocked you." +msgstr "User is already blocked from group." #: actions/groupblock.php:100 -#, fuzzy msgid "User is not a member of group." -msgstr "You are not a member of that group." +msgstr "User is not a member of group." #: actions/groupblock.php:136 actions/groupmembers.php:314 #, fuzzy @@ -1169,9 +1205,8 @@ msgid "" msgstr "" #: actions/groupblock.php:178 -#, fuzzy msgid "Do not block this user from this group" -msgstr "A list of the users in this group." +msgstr "Do not block this user from this group" #: actions/groupblock.php:179 #, fuzzy @@ -1673,7 +1708,7 @@ msgid "Nickname" msgstr "Nickname" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Password" @@ -1698,14 +1733,13 @@ msgstr "" "changing your settings." #: actions/login.php:286 -#, fuzzy, php-format +#, php-format msgid "" "Login with your username and password. Don't have a username yet? [Register]" "(%%action.register%%) a new account." msgstr "" "Login with your username and password. Don't have a username yet? [Register]" -"(%%action.register%%) a new account, or try [OpenID](%%action.openidlogin%" -"%). " +"(%%action.register%%) a new account." #: actions/makeadmin.php:91 msgid "Only an admin can make another user an admin." @@ -1811,7 +1845,7 @@ msgstr "" #: actions/noticesearch.php:124 #, php-format msgid "" -"Why not [register an account](%%%%action.register%%%%) and be the first to " +"Why not [register an account](%%%%action.register%%%%) and be the first to " "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" msgstr "" @@ -1857,8 +1891,8 @@ msgstr "Connect" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963 -#: lib/api.php:991 lib/api.php:1101 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 +#: lib/api.php:1027 lib/api.php:1137 msgid "Not a supported data format." msgstr "Not a supported data format." @@ -1878,11 +1912,15 @@ msgstr "Other Settings" msgid "Manage various other options." msgstr "Manage various other options." -#: actions/othersettings.php:117 +#: actions/othersettings.php:108 +msgid " (free service)" +msgstr "" + +#: actions/othersettings.php:116 msgid "Shorten URLs with" msgstr "" -#: actions/othersettings.php:118 +#: actions/othersettings.php:117 msgid "Automatic shortening service to use." msgstr "Automatic shortening service to use." @@ -1917,65 +1955,60 @@ msgstr "This is your outbox, which lists private messages you have sent." msgid "Change password" msgstr "Change password" -#: actions/passwordsettings.php:70 -#, fuzzy -msgid "You are not allowed to change your password" -msgstr "Change your password" - -#: actions/passwordsettings.php:82 +#: actions/passwordsettings.php:69 msgid "Change your password." msgstr "Change your password." -#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:96 actions/recoverpassword.php:231 msgid "Password change" msgstr "Password change" -#: actions/passwordsettings.php:117 +#: actions/passwordsettings.php:104 msgid "Old password" msgstr "Old password" -#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:108 actions/recoverpassword.php:235 msgid "New password" msgstr "New password" -#: actions/passwordsettings.php:122 +#: actions/passwordsettings.php:109 msgid "6 or more characters" msgstr "6 or more characters" -#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:112 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Confirm" -#: actions/passwordsettings.php:126 +#: actions/passwordsettings.php:113 msgid "same as password above" msgstr "same as password above" -#: actions/passwordsettings.php:130 +#: actions/passwordsettings.php:117 msgid "Change" msgstr "Change" -#: actions/passwordsettings.php:167 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "Password must be 6 or more characters." -#: actions/passwordsettings.php:170 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:233 msgid "Passwords don't match." msgstr "Passwords don't match." -#: actions/passwordsettings.php:178 +#: actions/passwordsettings.php:165 msgid "Incorrect old password" msgstr "Incorrect old password" -#: actions/passwordsettings.php:194 +#: actions/passwordsettings.php:181 msgid "Error saving user; invalid." msgstr "Error saving user; invalid." -#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Can't save new password." -#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:192 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Password saved." @@ -2414,7 +2447,7 @@ msgid "Same as password above. Required." msgstr "Same as password above. Required." #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:122 +#: lib/accountsettingsaction.php:120 msgid "Email" msgstr "E-mail" @@ -3345,36 +3378,36 @@ msgstr "Problem saving notice." msgid "DB error inserting reply: %s" msgstr "DB error inserting reply: %s" -#: classes/User.php:333 +#: classes/User.php:347 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Message to %1$s on %2$s" -#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Profile" -#: lib/accountsettingsaction.php:110 +#: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "Change your profile settings" -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:112 msgid "Upload an avatar" msgstr "Upload an avatar" -#: lib/accountsettingsaction.php:119 +#: lib/accountsettingsaction.php:116 msgid "Change your password" msgstr "Change your password" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:120 msgid "Change email handling" msgstr "Change e-mail handling" -#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 +#: lib/accountsettingsaction.php:124 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:126 +#: lib/accountsettingsaction.php:124 #, fuzzy msgid "Design your profile" msgstr "User profile" @@ -3383,7 +3416,7 @@ msgstr "User profile" msgid "Other" msgstr "Other" -#: lib/accountsettingsaction.php:129 +#: lib/accountsettingsaction.php:128 msgid "Other options" msgstr "Other options" @@ -3553,19 +3586,19 @@ msgstr "All " msgid "license." msgstr "licence." -#: lib/action.php:1053 +#: lib/action.php:1052 msgid "Pagination" msgstr "Pagination" -#: lib/action.php:1062 +#: lib/action.php:1061 msgid "After" msgstr "After" -#: lib/action.php:1070 +#: lib/action.php:1069 msgid "Before" msgstr "Before" -#: lib/action.php:1119 +#: lib/action.php:1117 msgid "There was a problem with your session token." msgstr "There was a problem with your session token." @@ -3737,13 +3770,46 @@ msgstr "Could not create OpenID from: %s" msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:613 +#: lib/command.php:618 +#, fuzzy +msgid "You are not subscribed to anyone." +msgstr "You are not subscribed to that profile." + +#: lib/command.php:620 +#, fuzzy +msgid "You are subscribed to these people: " +msgstr "You are not subscribed to that profile." + +#: lib/command.php:637 +#, fuzzy +msgid "No one is subscribed to you." +msgstr "Could not subscribe other to you." + +#: lib/command.php:639 +#, fuzzy +msgid "These people are subscribed to you: " +msgstr "People subscribed to %s" + +#: lib/command.php:656 +#, fuzzy +msgid "You are not a member of any groups." +msgstr "You are not a member of that group." + +#: lib/command.php:658 +#, fuzzy +msgid "You are a member of these groups: " +msgstr "You are not a member of that group." + +#: lib/command.php:670 msgid "" "Commands:\n" "on - turn on notifications\n" "off - turn off notifications\n" "help - show this help\n" "follow <nickname> - subscribe to user\n" +"groups - lists the groups you have joined\n" +"subscriptions - list the people you follow\n" +"subscribers - list the people that follow you\n" "leave <nickname> - unsubscribe from user\n" "d <nickname> <text> - direct message to user\n" "get <nickname> - get last notice from user\n" @@ -3773,20 +3839,19 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:191 -#, fuzzy +#: lib/common.php:192 msgid "No configuration file found. " -msgstr "No confirmation code." +msgstr "No configuration file found" -#: lib/common.php:192 +#: lib/common.php:193 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:193 +#: lib/common.php:194 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:194 +#: lib/common.php:195 #, fuzzy msgid "Go to the installer." msgstr "Login to the site" @@ -3838,9 +3903,8 @@ msgid "Tile background image" msgstr "" #: lib/designsettings.php:170 -#, fuzzy msgid "Change colours" -msgstr "Change your password" +msgstr "Change colours" #: lib/designsettings.php:178 msgid "Background" @@ -3883,7 +3947,7 @@ msgstr "" #: lib/designsettings.php:372 msgid "Bad default color settings: " -msgstr "" +msgstr "Bad default colour settings: " #: lib/designsettings.php:468 msgid "Design defaults restored." @@ -3930,9 +3994,8 @@ msgid "All" msgstr "All" #: lib/galleryaction.php:139 -#, fuzzy msgid "Select tag to filter" -msgstr "Select a carrier" +msgstr "Select tag to filter" #: lib/galleryaction.php:140 msgid "Tag" @@ -3951,14 +4014,13 @@ msgid "URL of the homepage or blog of the group or topic" msgstr "URL of the homepage or blog of the group or topic" #: lib/groupeditform.php:168 -#, fuzzy msgid "Describe the group or topic" -msgstr "Describe the group or topic in 140 chars" +msgstr "Describe the group or topic" #: lib/groupeditform.php:170 -#, fuzzy, php-format +#, php-format msgid "Describe the group or topic in %d characters" -msgstr "Describe the group or topic in 140 chars" +msgstr "Describe the group or topic in %d characters" #: lib/groupeditform.php:172 msgid "Description" @@ -4026,9 +4088,9 @@ msgid "This page is not available in a media type you accept" msgstr "This page is not available in a media type you accept" #: lib/imagefile.php:75 -#, fuzzy, php-format +#, php-format msgid "That file is too big. The maximum file size is %s." -msgstr "You can upload a logo image for your group." +msgstr "That file is too big. The maximum file size is %s." #: lib/imagefile.php:80 msgid "Partial upload." @@ -4056,8 +4118,8 @@ msgstr "Unknown file type" #: lib/jabber.php:192 #, php-format -msgid "notice id: %s" -msgstr "New notice" +msgid "[%s]" +msgstr "" #: lib/joinform.php:114 msgid "Join" @@ -4364,9 +4426,8 @@ msgid "Attach a file" msgstr "" #: lib/noticelist.php:478 -#, fuzzy msgid "in context" -msgstr "No content!" +msgstr "in context" #: lib/noticelist.php:498 msgid "Reply to this notice" @@ -4579,7 +4640,8 @@ msgid "Could not subscribe other to you." msgstr "Could not subscribe other to you." #: lib/subs.php:124 -msgid "Not subscribed!." +#, fuzzy +msgid "Not subscribed!" msgstr "Not subscribed!" #: lib/subs.php:136 @@ -4603,18 +4665,16 @@ msgid "Unsubscribe" msgstr "Unsubscribe" #: lib/userprofile.php:116 -#, fuzzy msgid "Edit Avatar" -msgstr "Avatar" +msgstr "Edit Avatar" #: lib/userprofile.php:236 msgid "User actions" msgstr "User actions" #: lib/userprofile.php:248 -#, fuzzy msgid "Edit profile settings" -msgstr "Profile settings" +msgstr "Edit profile settings" #: lib/userprofile.php:249 msgid "Edit" @@ -4628,54 +4688,54 @@ msgstr "Send a direct message to this user" msgid "Message" msgstr "Message" -#: lib/util.php:818 +#: lib/util.php:821 msgid "a few seconds ago" msgstr "a few seconds ago" -#: lib/util.php:820 +#: lib/util.php:823 msgid "about a minute ago" msgstr "about a minute ago" -#: lib/util.php:822 +#: lib/util.php:825 #, php-format msgid "about %d minutes ago" msgstr "about %d minutes ago" -#: lib/util.php:824 +#: lib/util.php:827 msgid "about an hour ago" msgstr "about an hour ago" -#: lib/util.php:826 +#: lib/util.php:829 #, php-format msgid "about %d hours ago" msgstr "about %d hours ago" -#: lib/util.php:828 +#: lib/util.php:831 msgid "about a day ago" msgstr "about a day ago" -#: lib/util.php:830 +#: lib/util.php:833 #, php-format msgid "about %d days ago" msgstr "about %d days ago" -#: lib/util.php:832 +#: lib/util.php:835 msgid "about a month ago" msgstr "about a month ago" -#: lib/util.php:834 +#: lib/util.php:837 #, php-format msgid "about %d months ago" msgstr "about %d months ago" -#: lib/util.php:836 +#: lib/util.php:839 msgid "about a year ago" msgstr "about a year ago" #: lib/webcolor.php:82 -#, fuzzy, php-format +#, php-format msgid "%s is not a valid color!" -msgstr "Homepage is not a valid URL." +msgstr "%s is not a valid colour!" #: lib/webcolor.php:123 #, php-format diff --git a/locale/es/LC_MESSAGES/statusnet.mo b/locale/es/LC_MESSAGES/statusnet.mo Binary files differindex eda910548..7bc7cf1b6 100644 --- a/locale/es/LC_MESSAGES/statusnet.mo +++ b/locale/es/LC_MESSAGES/statusnet.mo diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po index d04d4f826..aa34e255c 100644 --- a/locale/es/LC_MESSAGES/statusnet.po +++ b/locale/es/LC_MESSAGES/statusnet.po @@ -2,6 +2,7 @@ # # Author@translatewiki.net: Brion # Author@translatewiki.net: Crazymadlover +# Author@translatewiki.net: Translationista # -- # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER @@ -12,12 +13,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-10 20:53+0000\n" -"PO-Revision-Date: 2009-11-10 20:58:57+0000\n" +"POT-Creation-Date: 2009-11-16 19:42+0000\n" +"PO-Revision-Date: 2009-11-16 19:43:21+0000\n" "Language-Team: Spanish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: es\n" "X-Message-Group: out-statusnet\n" @@ -28,12 +29,15 @@ msgid "No such page" msgstr "No existe tal página" #: actions/all.php:74 actions/allrss.php:68 -#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofilebackgroundimage.php:116 +#: actions/apiaccountupdateprofileimage.php:105 +#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 #: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 #: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 @@ -111,48 +115,79 @@ msgstr "Tú y amigos" msgid "Updates from %1$s and friends on %2$s!" msgstr "¡Actualizaciones de %1$s y amigos en %2$s!" -#: actions/apiaccountratelimitstatus.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 -#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:129 actions/apigroupcreate.php:184 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120 -#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101 -#: actions/apigroupshow.php:105 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144 -#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141 -#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130 -#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163 -#: actions/apiusershow.php:101 -msgid "API method not found!" +#: actions/apiaccountratelimitstatus.php:70 +#: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofilebackgroundimage.php:94 +#: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apiaccountupdateprofile.php:97 +#, fuzzy +msgid "API method not found." msgstr "¡No se encontró el método de la API!" -#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 +#: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofilebackgroundimage.php:86 +#: actions/apiaccountupdateprofilecolors.php:110 +#: actions/apiaccountupdateprofileimage.php:84 +#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109 +#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "Este método requiere PUBLICAR" +#: actions/apiaccountupdatedeliverydevice.php:105 +msgid "" +"You must specify a parameter named 'device' with a value of one of: sms, im, " +"none" +msgstr "" + +#: actions/apiaccountupdatedeliverydevice.php:132 +#, fuzzy +msgid "Could not update user." +msgstr "No se pudo actualizar el usuario." + +#: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 #: actions/newnotice.php:94 lib/designsettings.php:283 #, php-format msgid "" "The server was unable to handle that much POST data (%s bytes) due to its " "current configuration." msgstr "" +"El servidor no ha podido manejar tanta información del tipo POST (% de " +"bytes) a causa de su configuración actual." -#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/apiaccountupdateprofilebackgroundimage.php:136 +#: actions/apiaccountupdateprofilebackgroundimage.php:146 +#: actions/apiaccountupdateprofilecolors.php:164 +#: actions/apiaccountupdateprofilecolors.php:174 +#, fuzzy +msgid "Unable to save your design settings." +msgstr "¡No se pudo guardar tu configuración de Twitter!" + +#: actions/apiaccountupdateprofilebackgroundimage.php:187 +#: actions/apiaccountupdateprofilecolors.php:142 +#, fuzzy +msgid "Could not update your design." +msgstr "No se pudo actualizar el usuario." + +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 +#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 #: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 msgid "User has no profile." msgstr "El usuario no tiene un perfil." +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "No se pudo guardar el perfil." + #: actions/apiblockcreate.php:108 msgid "Block user failed." msgstr "Falló bloquear usuario." @@ -198,6 +233,23 @@ msgstr "Mensajes directos a %s" msgid "All the direct messages sent to %s" msgstr "Todos los mensajes directos enviados a %s" +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 +#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 +#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 +#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149 +#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +msgid "API method not found!" +msgstr "¡No se encontró el método de la API!" + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -393,17 +445,17 @@ msgstr "Status borrado." msgid "No status with that ID found." msgstr "No hay estado para ese ID" -#: actions/apistatusesupdate.php:152 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 #: scripts/maildaemon.php:71 #, 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:193 +#: actions/apistatusesupdate.php:198 msgid "Not found" msgstr "No encontrado" -#: actions/apistatusesupdate.php:216 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:227 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -487,7 +539,7 @@ msgid "Invalid size." msgstr "Tamaño inválido." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:113 +#: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "Avatar" @@ -535,7 +587,7 @@ msgstr "Cortar" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:151 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -1693,7 +1745,7 @@ msgid "Nickname" msgstr "Apodo" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Contraseña" @@ -1833,7 +1885,7 @@ msgstr "" #: actions/noticesearch.php:124 #, php-format msgid "" -"Why not [register an account](%%%%action.register%%%%) and be the first to " +"Why not [register an account](%%%%action.register%%%%) and be the first to " "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" msgstr "" @@ -1881,8 +1933,8 @@ msgstr "Conectarse" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963 -#: lib/api.php:991 lib/api.php:1101 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 +#: lib/api.php:1027 lib/api.php:1137 msgid "Not a supported data format." msgstr "No es un formato de dato soportado" @@ -1903,11 +1955,15 @@ msgstr "Otras configuraciones" msgid "Manage various other options." msgstr "Manejo de varias opciones adicionales." -#: actions/othersettings.php:117 +#: actions/othersettings.php:108 +msgid " (free service)" +msgstr "" + +#: actions/othersettings.php:116 msgid "Shorten URLs with" msgstr "" -#: actions/othersettings.php:118 +#: actions/othersettings.php:117 msgid "Automatic shortening service to use." msgstr "Servicio de acorte automático a usar." @@ -1944,67 +2000,62 @@ msgstr "" msgid "Change password" msgstr "Cambiar contraseña" -#: actions/passwordsettings.php:70 -#, fuzzy -msgid "You are not allowed to change your password" -msgstr "Cambia tu contraseña" - -#: actions/passwordsettings.php:82 +#: actions/passwordsettings.php:69 #, fuzzy msgid "Change your password." msgstr "Cambia tu contraseña." -#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:96 actions/recoverpassword.php:231 #, fuzzy msgid "Password change" msgstr "Cambio de contraseña " -#: actions/passwordsettings.php:117 +#: actions/passwordsettings.php:104 msgid "Old password" msgstr "Antigua contraseña" -#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:108 actions/recoverpassword.php:235 msgid "New password" msgstr "Nueva contraseña" -#: actions/passwordsettings.php:122 +#: actions/passwordsettings.php:109 msgid "6 or more characters" msgstr "6 o más caracteres" -#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:112 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Confirmar" -#: actions/passwordsettings.php:126 +#: actions/passwordsettings.php:113 msgid "same as password above" msgstr "repita la contraseña anterior" -#: actions/passwordsettings.php:130 +#: actions/passwordsettings.php:117 msgid "Change" msgstr "Cambiar" -#: actions/passwordsettings.php:167 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "Cotrnaseña debe tener 6 o más caracteres." -#: actions/passwordsettings.php:170 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:233 msgid "Passwords don't match." msgstr "Las contraseñas no coinciden" -#: actions/passwordsettings.php:178 +#: actions/passwordsettings.php:165 msgid "Incorrect old password" msgstr "Contraseña antigua incorrecta." -#: actions/passwordsettings.php:194 +#: actions/passwordsettings.php:181 msgid "Error saving user; invalid." msgstr "Error al guardar el usuario; inválido." -#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "No se puede guardar la nueva contraseña." -#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:192 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Se guardó Contraseña." @@ -2454,7 +2505,7 @@ msgid "Same as password above. Required." msgstr "Igual a la contraseña de arriba. Requerida" #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:122 +#: lib/accountsettingsaction.php:120 msgid "Email" msgstr "Correo electrónico" @@ -3402,36 +3453,36 @@ msgstr "Hubo un problema al guardar el aviso." msgid "DB error inserting reply: %s" msgstr "Error de BD al insertar respuesta: %s" -#: classes/User.php:333 +#: classes/User.php:347 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Mensaje a %1$s en %2$s" -#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Perfil" -#: lib/accountsettingsaction.php:110 +#: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "Cambia tus opciones de perfil" -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:112 msgid "Upload an avatar" msgstr "Cargar un avatar." -#: lib/accountsettingsaction.php:119 +#: lib/accountsettingsaction.php:116 msgid "Change your password" msgstr "Cambia tu contraseña" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:120 msgid "Change email handling" msgstr "Cambiar el manejo del correo." -#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 +#: lib/accountsettingsaction.php:124 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:126 +#: lib/accountsettingsaction.php:124 msgid "Design your profile" msgstr "Diseñar tu perfil" @@ -3439,7 +3490,7 @@ msgstr "Diseñar tu perfil" msgid "Other" msgstr "Otro" -#: lib/accountsettingsaction.php:129 +#: lib/accountsettingsaction.php:128 msgid "Other options" msgstr "Otras opciones" @@ -3613,19 +3664,19 @@ msgstr "Todo" msgid "license." msgstr "Licencia." -#: lib/action.php:1053 +#: lib/action.php:1052 msgid "Pagination" msgstr "Paginación" -#: lib/action.php:1062 +#: lib/action.php:1061 msgid "After" msgstr "Después" -#: lib/action.php:1070 +#: lib/action.php:1069 msgid "Before" msgstr "Antes" -#: lib/action.php:1119 +#: lib/action.php:1117 msgid "There was a problem with your session token." msgstr "Hubo problemas con tu clave de sesión." @@ -3797,13 +3848,46 @@ msgstr "No se pudo crear el formulario OpenID: %s" msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:613 +#: lib/command.php:618 +#, fuzzy +msgid "You are not subscribed to anyone." +msgstr "No estás suscrito a ese perfil." + +#: lib/command.php:620 +#, fuzzy +msgid "You are subscribed to these people: " +msgstr "No estás suscrito a ese perfil." + +#: lib/command.php:637 +#, fuzzy +msgid "No one is subscribed to you." +msgstr "No se pudo suscribir otro a ti." + +#: lib/command.php:639 +#, fuzzy +msgid "These people are subscribed to you: " +msgstr "Personas suscritas a %s" + +#: lib/command.php:656 +#, fuzzy +msgid "You are not a member of any groups." +msgstr "No eres miembro de ese grupo" + +#: lib/command.php:658 +#, fuzzy +msgid "You are a member of these groups: " +msgstr "No eres miembro de este grupo." + +#: lib/command.php:670 msgid "" "Commands:\n" "on - turn on notifications\n" "off - turn off notifications\n" "help - show this help\n" "follow <nickname> - subscribe to user\n" +"groups - lists the groups you have joined\n" +"subscriptions - list the people you follow\n" +"subscribers - list the people that follow you\n" "leave <nickname> - unsubscribe from user\n" "d <nickname> <text> - direct message to user\n" "get <nickname> - get last notice from user\n" @@ -3833,19 +3917,19 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:191 +#: lib/common.php:192 msgid "No configuration file found. " msgstr "Ningún archivo de configuración encontrado. " -#: lib/common.php:192 +#: lib/common.php:193 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:193 +#: lib/common.php:194 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:194 +#: lib/common.php:195 msgid "Go to the installer." msgstr "Ir al instalador." @@ -4110,8 +4194,8 @@ msgstr "Tipo de archivo desconocido" #: lib/jabber.php:192 #, php-format -msgid "notice id: %s" -msgstr "Nuevo aviso" +msgid "[%s]" +msgstr "" #: lib/joinform.php:114 #, fuzzy @@ -4636,7 +4720,8 @@ msgid "Could not subscribe other to you." msgstr "No se pudo suscribir otro a ti." #: lib/subs.php:124 -msgid "Not subscribed!." +#, fuzzy +msgid "Not subscribed!" msgstr "¡No estás suscrito!" #: lib/subs.php:136 @@ -4686,47 +4771,47 @@ msgstr "Enviar un mensaje directo a este usuario" msgid "Message" msgstr "Mensaje" -#: lib/util.php:818 +#: lib/util.php:821 msgid "a few seconds ago" msgstr "hace unos segundos" -#: lib/util.php:820 +#: lib/util.php:823 msgid "about a minute ago" msgstr "hace un minuto" -#: lib/util.php:822 +#: lib/util.php:825 #, php-format msgid "about %d minutes ago" msgstr "hace %d minutos" -#: lib/util.php:824 +#: lib/util.php:827 msgid "about an hour ago" msgstr "hace una hora" -#: lib/util.php:826 +#: lib/util.php:829 #, php-format msgid "about %d hours ago" msgstr "hace %d horas" -#: lib/util.php:828 +#: lib/util.php:831 msgid "about a day ago" msgstr "hace un dÃa" -#: lib/util.php:830 +#: lib/util.php:833 #, php-format msgid "about %d days ago" msgstr "hace %d dÃas" -#: lib/util.php:832 +#: lib/util.php:835 msgid "about a month ago" msgstr "hace un mes" -#: lib/util.php:834 +#: lib/util.php:837 #, php-format msgid "about %d months ago" msgstr "hace %d meses" -#: lib/util.php:836 +#: lib/util.php:839 msgid "about a year ago" msgstr "hace un año" diff --git a/locale/fi/LC_MESSAGES/statusnet.mo b/locale/fi/LC_MESSAGES/statusnet.mo Binary files differindex 61946bd6a..14026dc1e 100644 --- a/locale/fi/LC_MESSAGES/statusnet.mo +++ b/locale/fi/LC_MESSAGES/statusnet.mo diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po index 8202cd4f4..c75267286 100644 --- a/locale/fi/LC_MESSAGES/statusnet.po +++ b/locale/fi/LC_MESSAGES/statusnet.po @@ -12,12 +12,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-10 20:53+0000\n" -"PO-Revision-Date: 2009-11-10 20:59:00+0000\n" +"POT-Creation-Date: 2009-11-16 19:42+0000\n" +"PO-Revision-Date: 2009-11-16 19:43:24+0000\n" "Language-Team: Finnish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: fi\n" "X-Message-Group: out-statusnet\n" @@ -28,12 +28,15 @@ msgid "No such page" msgstr "Sivua ei ole." #: actions/all.php:74 actions/allrss.php:68 -#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofilebackgroundimage.php:116 +#: actions/apiaccountupdateprofileimage.php:105 +#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 #: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 #: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 @@ -80,6 +83,8 @@ msgstr "Käyttäjän %s kavereiden syöte (Atom)" msgid "" "This is the timeline for %s and friends but no one has posted anything yet." msgstr "" +"Tämä on käyttäjän %s ja kavereiden aikajana, mutta kukaan ei ole lähettyänyt " +"vielä mitään." #: actions/all.php:132 #, php-format @@ -87,6 +92,8 @@ msgid "" "Try subscribing to more people, [join a group](%%action.groups%%) or post " "something yourself." msgstr "" +"Kokeile useamman käyttäjän tilaamista, [liity ryhmään] (%%action.groups%%) " +"tai lähetä päivitys itse." #: actions/all.php:134 #, php-format @@ -111,35 +118,42 @@ msgstr "Sinä ja kaverit" msgid "Updates from %1$s and friends on %2$s!" msgstr "Käyttäjän %1$s ja kavereiden päivitykset palvelussa %2$s!" -#: actions/apiaccountratelimitstatus.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 -#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:129 actions/apigroupcreate.php:184 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120 -#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101 -#: actions/apigroupshow.php:105 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144 -#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141 -#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130 -#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163 -#: actions/apiusershow.php:101 -msgid "API method not found!" +#: actions/apiaccountratelimitstatus.php:70 +#: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofilebackgroundimage.php:94 +#: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apiaccountupdateprofile.php:97 +#, fuzzy +msgid "API method not found." msgstr "API-metodia ei löytynyt!" -#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 +#: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofilebackgroundimage.php:86 +#: actions/apiaccountupdateprofilecolors.php:110 +#: actions/apiaccountupdateprofileimage.php:84 +#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109 +#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "Tämä metodi edellyttää POST sanoman." +#: actions/apiaccountupdatedeliverydevice.php:105 +msgid "" +"You must specify a parameter named 'device' with a value of one of: sms, im, " +"none" +msgstr "" + +#: actions/apiaccountupdatedeliverydevice.php:132 +#, fuzzy +msgid "Could not update user." +msgstr "Ei voitu päivittää käyttäjää." + +#: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 #: actions/newnotice.php:94 lib/designsettings.php:283 #, php-format msgid "" @@ -147,12 +161,34 @@ msgid "" "current configuration." msgstr "" -#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/apiaccountupdateprofilebackgroundimage.php:136 +#: actions/apiaccountupdateprofilebackgroundimage.php:146 +#: actions/apiaccountupdateprofilecolors.php:164 +#: actions/apiaccountupdateprofilecolors.php:174 +#, fuzzy +msgid "Unable to save your design settings." +msgstr "Twitter-asetuksia ei voitu tallentaa!" + +#: actions/apiaccountupdateprofilebackgroundimage.php:187 +#: actions/apiaccountupdateprofilecolors.php:142 +#, fuzzy +msgid "Could not update your design." +msgstr "Ei voitu päivittää käyttäjää." + +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 +#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 #: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 msgid "User has no profile." msgstr "Käyttäjällä ei ole profiilia." +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "Ei voitu tallentaa profiilia." + #: actions/apiblockcreate.php:108 msgid "Block user failed." msgstr "Käyttäjän esto epäonnistui." @@ -199,6 +235,23 @@ msgstr "Suorat viestit käyttäjälle %s" msgid "All the direct messages sent to %s" msgstr "Kaikki suorat viestit käyttäjälle %s" +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 +#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 +#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 +#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149 +#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +msgid "API method not found!" +msgstr "API-metodia ei löytynyt!" + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -388,17 +441,17 @@ msgstr "Päivitys poistettu." msgid "No status with that ID found." msgstr "Käyttäjätunnukselle ei löytynyt statusviestiä." -#: actions/apistatusesupdate.php:152 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 #: scripts/maildaemon.php:71 #, 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:193 +#: actions/apistatusesupdate.php:198 msgid "Not found" msgstr "Ei löytynyt" -#: actions/apistatusesupdate.php:216 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:227 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." @@ -481,7 +534,7 @@ msgid "Invalid size." msgstr "Koko ei kelpaa." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:113 +#: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "Kuva" @@ -529,7 +582,7 @@ msgstr "Rajaa" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:151 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -592,9 +645,8 @@ msgid "%s blocked profiles, page %d" msgstr "%s ja kaverit, sivu %d" #: actions/blockedfromgroup.php:108 -#, fuzzy msgid "A list of the users blocked from joining this group." -msgstr "Lista ryhmän käyttäjistä." +msgstr "Lista käyttäjistä jotka ovat estetty liittymästä tähän ryhmään." #: actions/blockedfromgroup.php:281 msgid "Unblock user from group" @@ -646,9 +698,8 @@ msgid "No" msgstr "Ei" #: actions/block.php:149 -#, fuzzy msgid "Do not block this user" -msgstr "Poista esto tältä käyttäjältä" +msgstr "Älä estä tätä käyttäjää" #: actions/block.php:150 actions/deletenotice.php:146 #: actions/groupblock.php:179 @@ -1033,9 +1084,9 @@ msgid "%s's favorite notices" msgstr "Käyttäjän %s suosikkipäivitykset" #: actions/favoritesrss.php:115 -#, fuzzy, php-format +#, php-format msgid "Updates favored by %1$s on %2$s!" -msgstr "Käyttäjän %1$s päivitykset palvelussa %2$s!" +msgstr "Käyttäjän %1$s suosikit palvelussa %2$s!" #: actions/favor.php:79 msgid "This notice is already a favorite!" @@ -1132,7 +1183,7 @@ msgstr "Ryhmää ei ole määritelty." #: actions/groupblock.php:91 msgid "Only an admin can block group members." -msgstr "" +msgstr "Vain ylläpitäjä voi estää ryhmän jäseniä." #: actions/groupblock.php:95 #, fuzzy @@ -1140,14 +1191,12 @@ msgid "User is already blocked from group." msgstr "Käyttäjä on asettanut eston sinulle." #: actions/groupblock.php:100 -#, fuzzy msgid "User is not a member of group." -msgstr "Sinä et kuulu tähän ryhmään." +msgstr "Käyttäjä ei kuulu tähän ryhmään." #: actions/groupblock.php:136 actions/groupmembers.php:314 -#, fuzzy msgid "Block user from group" -msgstr "Estä käyttäjä" +msgstr "Estä käyttäjä ryhmästä" #: actions/groupblock.php:162 #, php-format @@ -1179,9 +1228,8 @@ msgstr "" "Sinun pitää olla kirjautunut sisään, jotta voit muuttaa ryhmän tietoja." #: actions/groupdesignsettings.php:141 -#, fuzzy msgid "Group design" -msgstr "Ryhmät" +msgstr "Ryhmän ulkoasu" #: actions/groupdesignsettings.php:152 msgid "" @@ -1191,21 +1239,18 @@ msgstr "" #: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186 #: lib/designsettings.php:434 lib/designsettings.php:464 -#, fuzzy msgid "Couldn't update your design." -msgstr "Ei voitu päivittää käyttäjää." +msgstr "Ei voitu päivittää sinun sivusi ulkoasua." #: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 -#, fuzzy msgid "Unable to save your design settings!" -msgstr "Twitter-asetuksia ei voitu tallentaa!" +msgstr "Ei voitu tallentaa sinun ulkoasuasetuksia!" #: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231 -#, fuzzy msgid "Design preferences saved." -msgstr "Synkronointiasetukset tallennettiin." +msgstr "Ulkoasuasetukset tallennettu." #: actions/grouplogo.php:139 actions/grouplogo.php:192 msgid "Group logo" @@ -1256,18 +1301,17 @@ msgid "Make user an admin of the group" msgstr "Tee tästä käyttäjästä ylläpitäjä" #: actions/groupmembers.php:473 -#, fuzzy msgid "Make Admin" -msgstr "Ylläpito" +msgstr "Tee ylläpitäjäksi" #: actions/groupmembers.php:473 msgid "Make this user an admin" msgstr "Tee tästä käyttäjästä ylläpitäjä" #: actions/grouprss.php:133 -#, fuzzy, php-format +#, php-format msgid "Updates from members of %1$s on %2$s!" -msgstr "Käyttäjän %1$s päivitykset palvelussa %2$s!" +msgstr "Ryhmän %1$s käyttäjien päivitykset palvelussa %2$s!" #: actions/groupsearch.php:52 #, fuzzy, php-format @@ -1331,9 +1375,8 @@ msgid "Only an admin can unblock group members." msgstr "Vain ylläpitäjä voi poistaa eston ryhmän jäseniltä." #: actions/groupunblock.php:95 -#, fuzzy msgid "User is not blocked from group." -msgstr "Käyttäjä on asettanut eston sinulle." +msgstr "Käyttäjää ei ole estetty ryhmästä." #: actions/groupunblock.php:128 actions/unblock.php:108 msgid "Error removing the block." @@ -1353,9 +1396,8 @@ msgstr "" "im%%) käyttäen. Alla voit määrittää osoitteesi ja asetuksesi. " #: actions/imsettings.php:89 -#, fuzzy msgid "IM is not available." -msgstr "Tämä sivu ei ole saatavilla " +msgstr "Pikaviestin ei ole käytettävissä." #: actions/imsettings.php:106 msgid "Current confirmed Jabber/GTalk address." @@ -1452,7 +1494,7 @@ msgstr "Tämä on postilaatikkosi, jossa on sinulle saapuneet yksityisviestit." #: actions/invite.php:39 msgid "Invites have been disabled." -msgstr "" +msgstr "Kutsut ovat pois käytöstä." #: actions/invite.php:41 #, php-format @@ -1664,7 +1706,7 @@ msgid "Nickname" msgstr "Tunnus" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Salasana" @@ -1702,22 +1744,22 @@ msgstr "" #: actions/makeadmin.php:91 msgid "Only an admin can make another user an admin." -msgstr "" +msgstr "Vain ylläpitäjä voi tehdä toisesta käyttäjästä ylläpitäjän." #: actions/makeadmin.php:95 #, php-format msgid "%s is already an admin for group \"%s\"." -msgstr "" +msgstr "%s on jo ryhmän \"%s\" ylläpitäjä." #: actions/makeadmin.php:132 #, php-format msgid "Can't get membership record for %s in group %s" -msgstr "" +msgstr "Ei saatu käyttäjän %s jäsenyystietoja ryhmästä %s" #: actions/makeadmin.php:145 #, php-format msgid "Can't make %s an admin for group %s" -msgstr "" +msgstr "Ei voitu tehdä käyttäjästä %s ylläpitäjää ryhmään %s" #: actions/microsummary.php:69 msgid "No current status" @@ -1798,11 +1840,13 @@ msgid "" "Be the first to [post on this topic](%%%%action.newnotice%%%%?" "status_textarea=%s)!" msgstr "" +"Ole ensimmäinen joka [lähettää päivityksen tästä aiheesta] (%%%%action." +"newnotice%%%%?status_textarea=%s)!" #: actions/noticesearch.php:124 #, php-format msgid "" -"Why not [register an account](%%%%action.register%%%%) and be the first to " +"Why not [register an account](%%%%action.register%%%%) and be the first to " "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" msgstr "" @@ -1849,8 +1893,8 @@ msgstr "Yhdistä" msgid "Only " msgstr "Vain " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963 -#: lib/api.php:991 lib/api.php:1101 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 +#: lib/api.php:1027 lib/api.php:1137 msgid "Not a supported data format." msgstr "Tuo ei ole tuettu tietomuoto." @@ -1870,11 +1914,15 @@ msgstr "Muita Asetuksia" msgid "Manage various other options." msgstr "Hallinnoi muita asetuksia." -#: actions/othersettings.php:117 +#: actions/othersettings.php:108 +msgid " (free service)" +msgstr "" + +#: actions/othersettings.php:116 msgid "Shorten URLs with" msgstr "Lyhennä URL-osoitteita" -#: actions/othersettings.php:118 +#: actions/othersettings.php:117 msgid "Automatic shortening service to use." msgstr "Käytettävä automaattinen lyhennyspalvelu." @@ -1885,7 +1933,7 @@ msgstr "Profiiliasetukset" #: actions/othersettings.php:123 msgid "Show or hide profile designs." -msgstr "" +msgstr "Näytä tai piillota profiilin ulkoasu." #: actions/othersettings.php:153 msgid "URL shortening service is too long (max 50 chars)." @@ -1909,65 +1957,60 @@ msgstr "Tämä on postilaatikkosi, jossa on lähettämäsi yksityisviestit." msgid "Change password" msgstr "Vaihda salasana" -#: actions/passwordsettings.php:70 -#, fuzzy -msgid "You are not allowed to change your password" -msgstr "Vaihda salasanasi" - -#: actions/passwordsettings.php:82 +#: actions/passwordsettings.php:69 msgid "Change your password." msgstr "Vaihda salasanasi." -#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:96 actions/recoverpassword.php:231 msgid "Password change" msgstr "Salasanan vaihto" -#: actions/passwordsettings.php:117 +#: actions/passwordsettings.php:104 msgid "Old password" msgstr "Vanha salasana" -#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:108 actions/recoverpassword.php:235 msgid "New password" msgstr "Uusi salasana" -#: actions/passwordsettings.php:122 +#: actions/passwordsettings.php:109 msgid "6 or more characters" msgstr "6 tai useampia merkkejä" -#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:112 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Vahvista" -#: actions/passwordsettings.php:126 +#: actions/passwordsettings.php:113 msgid "same as password above" msgstr "sama salasana kuin yllä" -#: actions/passwordsettings.php:130 +#: actions/passwordsettings.php:117 msgid "Change" msgstr "Vaihda" -#: actions/passwordsettings.php:167 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "Salasanassa pitää olla 6 tai useampia merkkejä." -#: actions/passwordsettings.php:170 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:233 msgid "Passwords don't match." msgstr "Salasanat eivät täsmää." -#: actions/passwordsettings.php:178 +#: actions/passwordsettings.php:165 msgid "Incorrect old password" msgstr "Väärä vanha salasana" -#: actions/passwordsettings.php:194 +#: actions/passwordsettings.php:181 msgid "Error saving user; invalid." msgstr "Virhe tapahtui käyttäjän tallentamisessa; epäkelpo." -#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Uutta salasanaa ei voida tallentaa." -#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:192 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Salasana tallennettu." @@ -2173,7 +2216,7 @@ msgstr "" #: actions/public.php:182 msgid "Be the first to post!" -msgstr "" +msgstr "Ole ensimmäinen joka lähettää päivityksen!" #: actions/public.php:186 #, php-format @@ -2213,10 +2256,12 @@ msgstr "Nämä ovat suosituimmat viimeaikaiset tagit %s -palvelussa" #, php-format msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet." msgstr "" +"Kukaan ei ole vielä lähettänyt päivitystä tagilla [hashtag] (%%doc.tags%%) " +"vielä." #: actions/publictagcloud.php:72 msgid "Be the first to post one!" -msgstr "" +msgstr "Ole ensimmäinen joka lähettää päivityksen!" #: actions/publictagcloud.php:75 #, php-format @@ -2265,11 +2310,11 @@ msgstr "" #: actions/recoverpassword.php:158 msgid "You have been identified. Enter a new password below. " -msgstr "" +msgstr "Sinut on tunnistettu. Syötä uusi salasana alapuolelle. " #: actions/recoverpassword.php:188 msgid "Password recovery" -msgstr "" +msgstr "Salasanan palautus" #: actions/recoverpassword.php:191 msgid "Nickname or email address" @@ -2358,9 +2403,8 @@ msgid "Sorry, only invited people can register." msgstr "Valitettavasti vain kutsutut ihmiset voivat rekisteröityä." #: actions/register.php:92 -#, fuzzy msgid "Sorry, invalid invitation code." -msgstr "Virhe vahvistuskoodin kanssa." +msgstr "Virheellinen kutsukoodin." #: actions/register.php:112 msgid "Registration successful" @@ -2412,7 +2456,7 @@ msgid "Same as password above. Required." msgstr "Sama kuin ylläoleva salasana. Pakollinen." #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:122 +#: lib/accountsettingsaction.php:120 msgid "Email" msgstr "Sähköposti" @@ -2437,12 +2481,11 @@ msgid "Creative Commons Attribution 3.0" msgstr "" #: actions/register.php:496 -#, fuzzy msgid "" " except this private data: password, email address, IM address, and phone " "number." msgstr "" -" poislukien yksityinen tieto: salasana, sähköpostiosoite, IM osoite, " +"poislukien yksityinen tieto: salasana, sähköpostiosoite, IM osoite, " "puhelinnumero." #: actions/register.php:537 @@ -2503,9 +2546,8 @@ msgid "Remote subscribe" msgstr "Etätilaus" #: actions/remotesubscribe.php:124 -#, fuzzy msgid "Subscribe to a remote user" -msgstr "Tilaa tämä käyttäjä" +msgstr "Tilaa tämä etäkäyttäjä" #: actions/remotesubscribe.php:129 msgid "User nickname" @@ -2541,13 +2583,11 @@ msgstr "" "löytynyt)." #: actions/remotesubscribe.php:176 -#, fuzzy msgid "That’s a local profile! Login to subscribe." msgstr "" "Tämä on paikallinen profiili. Kirjaudu sisään, jotta voit tilata päivitykset." #: actions/remotesubscribe.php:183 -#, fuzzy msgid "Couldn’t get a request token." msgstr "Ei saatu request tokenia." @@ -2678,26 +2718,26 @@ msgstr "Huomaa" #: actions/showgroup.php:284 lib/groupeditform.php:184 msgid "Aliases" -msgstr "" +msgstr "Aliakset" #: actions/showgroup.php:293 msgid "Group actions" msgstr "Ryhmän toiminnot" #: actions/showgroup.php:328 -#, fuzzy, php-format +#, php-format msgid "Notice feed for %s group (RSS 1.0)" -msgstr "Päivityssyöte ryhmälle %s" +msgstr "Syöte ryhmän %s päivityksille (RSS 1.0)" #: actions/showgroup.php:334 -#, fuzzy, php-format +#, php-format msgid "Notice feed for %s group (RSS 2.0)" -msgstr "Päivityssyöte ryhmälle %s" +msgstr "Syöte ryhmän %s päivityksille (RSS 2.0)" #: actions/showgroup.php:340 -#, fuzzy, php-format +#, php-format msgid "Notice feed for %s group (Atom)" -msgstr "Päivityssyöte ryhmälle %s" +msgstr "Syöte ryhmän %s päivityksille (Atom)" #: actions/showgroup.php:345 #, php-format @@ -2748,9 +2788,8 @@ msgstr "" "(http://en.wikipedia.org/wiki/Micro-blogging)" #: actions/showgroup.php:482 -#, fuzzy msgid "Admins" -msgstr "Ylläpito" +msgstr "Ylläpitäjät" #: actions/showmessage.php:81 msgid "No such message." @@ -2771,9 +2810,8 @@ msgid "Message from %1$s on %2$s" msgstr "Viesti käyttäjältä %1$s, %2$s" #: actions/shownotice.php:90 -#, fuzzy msgid "Notice deleted." -msgstr "Päivitys lähetetty" +msgstr "Päivitys on poistettu." #: actions/showstream.php:73 #, fuzzy, php-format @@ -2814,6 +2852,8 @@ msgstr "Käyttäjän %s lähetetyt viestit" #, php-format msgid "This is the timeline for %s but %s hasn't posted anything yet." msgstr "" +"Tämä on käyttäjän %s aikajana, mutta %s ei ole lähettänyt vielä yhtään " +"päivitystä." #: actions/showstream.php:196 msgid "" @@ -2858,9 +2898,8 @@ msgstr "" "Voit saada SMS viestit sähköpostin välityksellä %%site.name%% -palvelusta." #: actions/smssettings.php:91 -#, fuzzy msgid "SMS is not available." -msgstr "Tämä sivu ei ole saatavilla " +msgstr "SMS ei ole käytettävissä." #: actions/smssettings.php:112 msgid "Current confirmed SMS-enabled phone number." @@ -2911,13 +2950,12 @@ msgid "That phone number already belongs to another user." msgstr "Tämä puhelinnumero kuuluu jo toiselle käyttäjälle." #: actions/smssettings.php:347 -#, fuzzy msgid "" "A confirmation code was sent to the phone number you added. Check your phone " "for the code and instructions on how to use it." msgstr "" "Vahvistuskoodi on lähetetty puhelinnumeroosi. Katso tekstiviesteistäsi " -"vahvistuskoodisi ja miten sitä käytetään. " +"vahvistuskoodisi ja ohjeet miten sitä käytetään." #: actions/smssettings.php:374 msgid "That is the wrong confirmation number." @@ -3032,9 +3070,9 @@ msgid "" msgstr "" #: actions/subscriptions.php:123 actions/subscriptions.php:127 -#, fuzzy, php-format +#, php-format msgid "%s is not listening to anyone." -msgstr "%1$s seuraa nyt käyttäjää" +msgstr "%s ei seuraa ketään käyttäjää." #: actions/subscriptions.php:194 msgid "Jabber" @@ -3155,9 +3193,8 @@ msgstr "" "paina \"Peruuta\"." #: actions/userauthorization.php:188 -#, fuzzy msgid "License" -msgstr "lisenssi." +msgstr "Lisenssi" #: actions/userauthorization.php:209 msgid "Accept" @@ -3350,36 +3387,36 @@ msgstr "Ongelma päivityksen tallentamisessa." msgid "DB error inserting reply: %s" msgstr "Tietokantavirhe tallennettaessa vastausta: %s" -#: classes/User.php:333 +#: classes/User.php:347 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Viesti käyttäjälle %1$s, %2$s" -#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Profiili" -#: lib/accountsettingsaction.php:110 +#: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "Vaihda profiiliasetuksesi" -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:112 msgid "Upload an avatar" msgstr "Lataa kuva" -#: lib/accountsettingsaction.php:119 +#: lib/accountsettingsaction.php:116 msgid "Change your password" msgstr "Vaihda salasanasi" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:120 msgid "Change email handling" msgstr "Muuta sähköpostin käsittelyasetuksia." -#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 +#: lib/accountsettingsaction.php:124 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:126 +#: lib/accountsettingsaction.php:124 #, fuzzy msgid "Design your profile" msgstr "Käyttäjän profiili" @@ -3388,7 +3425,7 @@ msgstr "Käyttäjän profiili" msgid "Other" msgstr "Muut" -#: lib/accountsettingsaction.php:129 +#: lib/accountsettingsaction.php:128 msgid "Other options" msgstr "Muita asetuksia" @@ -3558,19 +3595,19 @@ msgstr "Kaikki " msgid "license." msgstr "lisenssi." -#: lib/action.php:1053 +#: lib/action.php:1052 msgid "Pagination" msgstr "Sivutus" -#: lib/action.php:1062 +#: lib/action.php:1061 msgid "After" msgstr "Myöhemmin" -#: lib/action.php:1070 +#: lib/action.php:1069 msgid "Before" msgstr "Aiemmin" -#: lib/action.php:1119 +#: lib/action.php:1117 msgid "There was a problem with your session token." msgstr "Istuntoavaimesi kanssa oli ongelma." @@ -3742,13 +3779,46 @@ msgstr "Ei voitu luoda OpenID lomaketta: %s" msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:613 +#: lib/command.php:618 +#, fuzzy +msgid "You are not subscribed to anyone." +msgstr "Et ole tilannut tämän käyttäjän päivityksiä." + +#: lib/command.php:620 +#, fuzzy +msgid "You are subscribed to these people: " +msgstr "Et ole tilannut tämän käyttäjän päivityksiä." + +#: lib/command.php:637 +#, fuzzy +msgid "No one is subscribed to you." +msgstr "Toista ei voitu asettaa tilaamaan sinua." + +#: lib/command.php:639 +#, fuzzy +msgid "These people are subscribed to you: " +msgstr "Ihmiset jotka ovat käyttäjän %s tilaajia" + +#: lib/command.php:656 +#, fuzzy +msgid "You are not a member of any groups." +msgstr "Sinä et kuulu tähän ryhmään." + +#: lib/command.php:658 +#, fuzzy +msgid "You are a member of these groups: " +msgstr "Sinä et kuulu tähän ryhmään." + +#: lib/command.php:670 msgid "" "Commands:\n" "on - turn on notifications\n" "off - turn off notifications\n" "help - show this help\n" "follow <nickname> - subscribe to user\n" +"groups - lists the groups you have joined\n" +"subscriptions - list the people you follow\n" +"subscribers - list the people that follow you\n" "leave <nickname> - unsubscribe from user\n" "d <nickname> <text> - direct message to user\n" "get <nickname> - get last notice from user\n" @@ -3778,20 +3848,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:191 +#: lib/common.php:192 #, fuzzy msgid "No configuration file found. " msgstr "Varmistuskoodia ei ole annettu." -#: lib/common.php:192 +#: lib/common.php:193 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:193 +#: lib/common.php:194 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:194 +#: lib/common.php:195 #, fuzzy msgid "Go to the installer." msgstr "Kirjaudu sisään palveluun" @@ -4062,8 +4132,8 @@ msgstr "Tunnistamaton tiedoston tyyppi" #: lib/jabber.php:192 #, php-format -msgid "notice id: %s" -msgstr "Uusi päivitys" +msgid "[%s]" +msgstr "" #: lib/joinform.php:114 msgid "Join" @@ -4589,7 +4659,8 @@ msgid "Could not subscribe other to you." msgstr "Toista ei voitu asettaa tilaamaan sinua." #: lib/subs.php:124 -msgid "Not subscribed!." +#, fuzzy +msgid "Not subscribed!" msgstr "Ei ole tilattu!." #: lib/subs.php:136 @@ -4638,47 +4709,47 @@ msgstr "Lähetä suora viesti tälle käyttäjälle" msgid "Message" msgstr "Viesti" -#: lib/util.php:818 +#: lib/util.php:821 msgid "a few seconds ago" msgstr "muutama sekunti sitten" -#: lib/util.php:820 +#: lib/util.php:823 msgid "about a minute ago" msgstr "noin minuutti sitten" -#: lib/util.php:822 +#: lib/util.php:825 #, php-format msgid "about %d minutes ago" msgstr "noin %d minuuttia sitten" -#: lib/util.php:824 +#: lib/util.php:827 msgid "about an hour ago" msgstr "noin tunti sitten" -#: lib/util.php:826 +#: lib/util.php:829 #, php-format msgid "about %d hours ago" msgstr "noin %d tuntia sitten" -#: lib/util.php:828 +#: lib/util.php:831 msgid "about a day ago" msgstr "noin päivä sitten" -#: lib/util.php:830 +#: lib/util.php:833 #, php-format msgid "about %d days ago" msgstr "noin %d päivää sitten" -#: lib/util.php:832 +#: lib/util.php:835 msgid "about a month ago" msgstr "noin kuukausi sitten" -#: lib/util.php:834 +#: lib/util.php:837 #, php-format msgid "about %d months ago" msgstr "noin %d kuukautta sitten" -#: lib/util.php:836 +#: lib/util.php:839 msgid "about a year ago" msgstr "noin vuosi sitten" diff --git a/locale/fr/LC_MESSAGES/statusnet.mo b/locale/fr/LC_MESSAGES/statusnet.mo Binary files differindex 59b7812fc..6328e2ed9 100644 --- a/locale/fr/LC_MESSAGES/statusnet.mo +++ b/locale/fr/LC_MESSAGES/statusnet.mo diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po index 7507e44db..62ffbe99f 100644 --- a/locale/fr/LC_MESSAGES/statusnet.po +++ b/locale/fr/LC_MESSAGES/statusnet.po @@ -1,35 +1,40 @@ # Translation of StatusNet to French # # Author@translatewiki.net: IAlex +# Author@translatewiki.net: Isoph # Author@translatewiki.net: Jean-Frédéric +# Author@translatewiki.net: Peter17 +# Author@translatewiki.net: Zetud # -- msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-10 20:53+0000\n" -"PO-Revision-Date: 2009-11-10 20:59:03+0000\n" +"POT-Creation-Date: 2009-11-16 19:42+0000\n" +"PO-Revision-Date: 2009-11-16 19:43:27+0000\n" "Language-Team: French\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: fr\n" "X-Message-Group: out-statusnet\n" #: actions/all.php:63 actions/public.php:97 actions/replies.php:92 #: actions/showfavorites.php:137 actions/tag.php:51 -#, fuzzy msgid "No such page" -msgstr "Aucun marquage trouvé." +msgstr "Page non trouvée" #: actions/all.php:74 actions/allrss.php:68 -#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofilebackgroundimage.php:116 +#: actions/apiaccountupdateprofileimage.php:105 +#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 #: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 #: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 @@ -76,6 +81,8 @@ msgstr "Flux pour les amis de %s (Atom)" msgid "" "This is the timeline for %s and friends but no one has posted anything yet." msgstr "" +"Ceci est le flux pour %s et ses amis mais personne n’a rien posté pour le " +"moment." #: actions/all.php:132 #, php-format @@ -83,6 +90,8 @@ msgid "" "Try subscribing to more people, [join a group](%%action.groups%%) or post " "something yourself." msgstr "" +"Essayez de vous abonner à plus d’utilisateurs, de vous [inscrire à un groupe]" +"(%%action.groups%%) ou de publier quelque chose vous-même." #: actions/all.php:134 #, php-format @@ -107,35 +116,40 @@ msgstr "Vous et vos amis" msgid "Updates from %1$s and friends on %2$s!" msgstr "Statuts de %1$s et ses amis dans %2$s!" -#: actions/apiaccountratelimitstatus.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 -#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:129 actions/apigroupcreate.php:184 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120 -#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101 -#: actions/apigroupshow.php:105 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144 -#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141 -#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130 -#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163 -#: actions/apiusershow.php:101 -msgid "API method not found!" +#: actions/apiaccountratelimitstatus.php:70 +#: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofilebackgroundimage.php:94 +#: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apiaccountupdateprofile.php:97 +msgid "API method not found." msgstr "Méthode API non trouvée !" -#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 +#: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofilebackgroundimage.php:86 +#: actions/apiaccountupdateprofilecolors.php:110 +#: actions/apiaccountupdateprofileimage.php:84 +#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109 +#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "Ce processus requiert un POST." +#: actions/apiaccountupdatedeliverydevice.php:105 +msgid "" +"You must specify a parameter named 'device' with a value of one of: sms, im, " +"none" +msgstr "" + +#: actions/apiaccountupdatedeliverydevice.php:132 +msgid "Could not update user." +msgstr "Impossible de mettre à jour l’utilisateur." + +#: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 #: actions/newnotice.php:94 lib/designsettings.php:283 #, php-format msgid "" @@ -143,28 +157,47 @@ msgid "" "current configuration." msgstr "" -#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/apiaccountupdateprofilebackgroundimage.php:136 +#: actions/apiaccountupdateprofilebackgroundimage.php:146 +#: actions/apiaccountupdateprofilecolors.php:164 +#: actions/apiaccountupdateprofilecolors.php:174 +msgid "Unable to save your design settings." +msgstr "Impossible de sauvegarder les parmètres de la conception." + +#: actions/apiaccountupdateprofilebackgroundimage.php:187 +#: actions/apiaccountupdateprofilecolors.php:142 +msgid "Could not update your design." +msgstr "Impossible de mettre à jour votre conception." + +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 +#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 #: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 msgid "User has no profile." msgstr "Aucun profil ne correspond à cet utilisateur." +#: actions/apiaccountupdateprofile.php:147 +msgid "Could not save profile." +msgstr "Impossible d’enregistrer le profil." + #: actions/apiblockcreate.php:108 msgid "Block user failed." -msgstr "Le blocage de l'utilisateur a échoué." +msgstr "Le blocage de l’utilisateur a échoué." #: actions/apiblockdestroy.php:107 msgid "Unblock user failed." -msgstr "Le déblocage de l'utilisateur a échoué." +msgstr "Le déblocage de l’utilisateur a échoué." #: actions/apidirectmessagenew.php:126 msgid "No message text!" msgstr "Message sans texte !" #: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 -#, fuzzy, php-format +#, php-format msgid "That's too long. Max message size is %d chars." -msgstr "C'est trop long ! Vous n'avez droit qu'à 140 caractères." +msgstr "C’est trop long ! La taille maximale du message est de %d caractères." #: actions/apidirectmessagenew.php:146 msgid "Recipient user not found." @@ -173,13 +206,13 @@ msgstr "Destinataire non trouvé." #: actions/apidirectmessagenew.php:150 msgid "Can't send direct messages to users who aren't your friend." msgstr "" -"Vous ne pouvez envoyer des messages personnels qu'aux utilisateurs inscrits " +"Vous ne pouvez envoyer des messages personnels qu’aux utilisateurs inscrits " "comme amis." #: actions/apidirectmessage.php:89 -#, fuzzy, php-format +#, php-format msgid "Direct messages from %s" -msgstr "Messages envoyés à %s" +msgstr "Messages direct depuis %s" #: actions/apidirectmessage.php:93 #, php-format @@ -196,6 +229,23 @@ msgstr "Messages envoyés à %s" msgid "All the direct messages sent to %s" msgstr "Tous les messages envoyés à %s" +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 +#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 +#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 +#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149 +#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +msgid "API method not found!" +msgstr "Méthode API non trouvée !" + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -211,7 +261,7 @@ msgstr "Impossible de créer le favori." #: actions/apifavoritedestroy.php:122 msgid "That status is not a favorite!" -msgstr "Ce statut n'est pas un favori !" +msgstr "Ce statut n’est pas un favori !" #: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 msgid "Could not delete favorite." @@ -219,34 +269,32 @@ msgstr "Impossible de supprimer le favori." #: actions/apifriendshipscreate.php:109 msgid "Could not follow user: User not found." -msgstr "Impossible de suivre l'utilisateur : Utilisateur non trouvé." +msgstr "Impossible de suivre l’utilisateur : Utilisateur non trouvé." #: actions/apifriendshipscreate.php:118 #, php-format msgid "Could not follow user: %s is already on your list." -msgstr "Impossible de suivre l'utilisateur : %s est déjà dans votre liste." +msgstr "Impossible de suivre l’utilisateur : %s est déjà dans votre liste." #: actions/apifriendshipsdestroy.php:109 -#, fuzzy msgid "Could not unfollow user: User not found." -msgstr "Impossible de suivre l'utilisateur : Utilisateur non trouvé." +msgstr "Impossible de ne plus suivre l’utilisateur : utilisateur non trouvé." #: actions/apifriendshipsdestroy.php:120 msgid "You cannot unfollow yourself!" -msgstr "" +msgstr "Vous ne pouvez pas ne plus vous suivre vous-même !" #: actions/apifriendshipsexists.php:94 msgid "Two user ids or screen_names must be supplied." msgstr "Vous devez fournir 2 identifiants ou pseudos." #: actions/apifriendshipsshow.php:135 -#, fuzzy msgid "Could not determine source user." -msgstr "Impossible de récupérer le flux public." +msgstr "Impossible de déterminer l’utilisateur source." #: actions/apifriendshipsshow.php:143 msgid "Could not find target user." -msgstr "Impossible de trouver l'utilisateur cible." +msgstr "Impossible de trouver l’utilisateur cible." #: actions/apigroupcreate.php:136 actions/newgroup.php:204 msgid "Could not create group." @@ -254,13 +302,12 @@ msgstr "Impossible de créer le groupe." #: actions/apigroupcreate.php:147 actions/editgroup.php:259 #: actions/newgroup.php:210 -#, fuzzy msgid "Could not create aliases." -msgstr "Impossible de créer le favori." +msgstr "Impossible de créer les alias." #: actions/apigroupcreate.php:166 actions/newgroup.php:224 msgid "Could not set group membership." -msgstr "Impossible d'établir l'inscription au groupe." +msgstr "Impossible d'établir l’inscription au groupe." #: actions/apigroupcreate.php:212 actions/editgroup.php:182 #: actions/newgroup.php:126 actions/profilesettings.php:208 @@ -286,7 +333,7 @@ msgstr "Pseudo invalide." #: actions/newgroup.php:139 actions/profilesettings.php:215 #: actions/register.php:217 msgid "Homepage is not a valid URL." -msgstr "L'adresse du site personnel n'est pas un URL valide. " +msgstr "L’adresse du site personnel n’est pas un URL valide. " #: actions/apigroupcreate.php:253 actions/editgroup.php:198 #: actions/newgroup.php:142 actions/profilesettings.php:218 @@ -295,9 +342,9 @@ msgid "Full name is too long (max 255 chars)." msgstr "Nom complet trop long (maximum de 255 caractères)." #: actions/apigroupcreate.php:261 -#, fuzzy, php-format +#, php-format msgid "Description is too long (max %d chars)." -msgstr "la description est trop longue (140 caractères maximum)." +msgstr "La description est trop longue (%d caractères maximum)." #: actions/apigroupcreate.php:272 actions/editgroup.php:204 #: actions/newgroup.php:148 actions/profilesettings.php:225 @@ -309,48 +356,46 @@ msgstr "Emplacement trop long (maximum de 255 caractères)." #: actions/newgroup.php:159 #, php-format msgid "Too many aliases! Maximum %d." -msgstr "" +msgstr "Trop d’alias ! Maximum %d." #: actions/apigroupcreate.php:312 actions/editgroup.php:224 #: actions/newgroup.php:168 -#, fuzzy, php-format +#, php-format msgid "Invalid alias: \"%s\"" -msgstr "Marquage invalide : \"%s\"" +msgstr "Alias invalide : « %s »" #: actions/apigroupcreate.php:321 actions/editgroup.php:228 #: actions/newgroup.php:172 -#, fuzzy, php-format +#, php-format msgid "Alias \"%s\" already in use. Try another one." -msgstr "Pseudo déjà utilisé. Essayez-en un autre." +msgstr "Alias « %s » déjà utilisé. Essayez-en un autre." #: actions/apigroupcreate.php:334 actions/editgroup.php:234 #: actions/newgroup.php:178 msgid "Alias can't be the same as nickname." -msgstr "" +msgstr "L’alias ne peut pas être le même que le pseudo." #: actions/apigroupjoin.php:110 -#, fuzzy msgid "You are already a member of that group." -msgstr "Vous êtes déjà membre de ce groupe " +msgstr "Vous êtes déjà membre de ce groupe." #: actions/apigroupjoin.php:119 actions/joingroup.php:95 lib/command.php:221 msgid "You have been blocked from that group by the admin." -msgstr "" +msgstr "Vous avez été bloqué de ce groupe par l’administrateur." #: actions/apigroupjoin.php:138 -#, fuzzy, php-format +#, php-format msgid "Could not join user %s to group %s." -msgstr "Impossible d'inscrire l'utilisateur %s au groupe %s" +msgstr "Impossible de joindre l’utilisateur %s au groupe %s." #: actions/apigroupleave.php:114 -#, fuzzy msgid "You are not a member of this group." msgstr "Vous n'êtes pas membre de ce groupe." #: actions/apigroupleave.php:124 -#, fuzzy, php-format +#, php-format msgid "Could not remove user %s to group %s." -msgstr "Impossible de retirer l'utilisateur %s du groupe %s" +msgstr "Impossible de retirer l’utilisateur %s du groupe %s" #: actions/apigrouplistall.php:90 actions/usergroups.php:62 #, php-format @@ -358,12 +403,12 @@ msgid "%s groups" msgstr "Groupes de %s" #: actions/apigrouplistall.php:94 -#, fuzzy, php-format +#, php-format msgid "groups on %s" -msgstr "Actions du groupe" +msgstr "groupes sur %s" #: actions/apigrouplist.php:95 -#, fuzzy, php-format +#, php-format msgid "%s's groups" msgstr "Groupes de %s" @@ -378,36 +423,36 @@ msgstr "Ce processus requiert un POST ou un DELETE." #: actions/apistatusesdestroy.php:130 msgid "You may not delete another user's status." -msgstr "Vous ne pouvez pas supprimer le statut d'un autre utilisateur." +msgstr "Vous ne pouvez pas supprimer le statut d’un autre utilisateur." #: actions/apistatusesshow.php:138 -#, fuzzy msgid "Status deleted." -msgstr "Avatar supprimé." +msgstr "Statut supprimé." #: actions/apistatusesshow.php:144 msgid "No status with that ID found." msgstr "Aucun statut trouvé avec cet identifiant." -#: actions/apistatusesupdate.php:152 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 #: scripts/maildaemon.php:71 -#, fuzzy, php-format +#, php-format msgid "That's too long. Max notice size is %d chars." -msgstr "C'est trop long ! Vous n'avez droit qu'à 140 caractères." +msgstr "C’est trop long ! La taille maximale de l’avis est de %d caractères." -#: actions/apistatusesupdate.php:193 +#: actions/apistatusesupdate.php:198 msgid "Not found" msgstr "Non trouvé" -#: actions/apistatusesupdate.php:216 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:227 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" +"La taille maximale du statut est de %d caractères, en incluant l’URL de la " +"pièce jointe." #: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261 -#, fuzzy msgid "Unsupported format." -msgstr "Format de fichier d'image non supporté." +msgstr "Format non supporté." #: actions/apitimelinefavorites.php:107 #, php-format @@ -432,9 +477,9 @@ msgid "Updates from %1$s on %2$s!" msgstr "Statuts de %1$s dans %2$s!" #: actions/apitimelinementions.php:116 -#, fuzzy, php-format +#, php-format msgid "%1$s / Updates mentioning %2$s" -msgstr "%1$s / Réponses à %2$s" +msgstr "%1$s / Mises à jour mentionnant %2$s" #: actions/apitimelinementions.php:126 #, php-format @@ -457,9 +502,9 @@ msgid "Notices tagged with %s" msgstr "Statuts marqués avec %s" #: actions/apitimelinetag.php:107 actions/tagrss.php:64 -#, fuzzy, php-format +#, php-format msgid "Updates tagged with %1$s on %2$s!" -msgstr "Statuts de %1$s dans %2$s!" +msgstr "Mises à jour marquées avec %1$s dans %2$s !" #: actions/apiusershow.php:96 msgid "Not found." @@ -482,14 +527,16 @@ msgid "Invalid size." msgstr "Taille incorrecte." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:113 +#: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "Avatar" #: actions/avatarsettings.php:78 -#, fuzzy, php-format +#, php-format msgid "You can upload your personal avatar. The maximum file size is %s." -msgstr "Vous pouvez associer un « avatar » (image personnelle) à votre profil." +msgstr "" +"Vous pouvez associer un « avatar » (image personnelle) à votre profil. La " +"taille maximale du fichier est de %s." #: actions/avatarsettings.php:106 actions/avatarsettings.php:182 #: actions/grouplogo.php:178 actions/remotesubscribe.php:191 @@ -500,7 +547,7 @@ msgstr "Utilisateur sans profil correspondant" #: actions/avatarsettings.php:119 actions/avatarsettings.php:194 #: actions/grouplogo.php:251 msgid "Avatar settings" -msgstr "Paramètres de l'avatar" +msgstr "Paramètres de l’avatar" #: actions/avatarsettings.php:126 actions/avatarsettings.php:202 #: actions/grouplogo.php:199 actions/grouplogo.php:259 @@ -530,7 +577,7 @@ msgstr "Recadrer" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:151 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -562,7 +609,7 @@ msgstr "Avatar mis à jour." #: actions/avatarsettings.php:363 msgid "Failed updating avatar." -msgstr "La mise à jour de l'avatar a échoué." +msgstr "La mise à jour de l’avatar a échoué." #: actions/avatarsettings.php:387 msgid "Avatar deleted." @@ -583,24 +630,22 @@ msgid "No such group" msgstr "Aucun groupe trouvé" #: actions/blockedfromgroup.php:90 -#, fuzzy, php-format +#, php-format msgid "%s blocked profiles" -msgstr "Profil de l'utilisateur" +msgstr "%s profils bloqués" #: actions/blockedfromgroup.php:93 -#, fuzzy, php-format +#, php-format msgid "%s blocked profiles, page %d" -msgstr "%s et ses amis - page %d" +msgstr "%s profils bloqués, page %d" #: actions/blockedfromgroup.php:108 -#, fuzzy msgid "A list of the users blocked from joining this group." -msgstr "Liste des utilisateurs inscrits à ce groupe." +msgstr "Une liste des utilisateurs dont l’inscription à ce groupe est bloquée." #: actions/blockedfromgroup.php:281 -#, fuzzy msgid "Unblock user from group" -msgstr "Le déblocage de l'utilisateur a échoué." +msgstr "Débloquer l’utilisateur du groupe" #: actions/blockedfromgroup.php:313 lib/unblockform.php:150 msgid "Unblock" @@ -623,7 +668,7 @@ msgstr "Non connecté." #: actions/block.php:69 actions/groupblock.php:71 actions/groupunblock.php:71 #: actions/makeadmin.php:71 actions/subedit.php:46 actions/unblock.php:70 msgid "No profile specified." -msgstr "Aucun profil n'a été spécifié." +msgstr "Aucun profil n’a été spécifié." #: actions/block.php:74 actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 @@ -651,9 +696,8 @@ msgid "No" msgstr "Non" #: actions/block.php:149 -#, fuzzy msgid "Do not block this user" -msgstr "Débloquer cet utilisateur" +msgstr "Ne pas bloquer cet utilisateur" #: actions/block.php:150 actions/deletenotice.php:146 #: actions/groupblock.php:179 @@ -663,7 +707,7 @@ msgstr "Oui" #: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123 #: lib/blockform.php:153 msgid "Block this user" -msgstr "Bloquer cet utilisateur " +msgstr "Bloquer cet utilisateur" #: actions/block.php:165 msgid "You have already blocked this user." @@ -671,12 +715,11 @@ msgstr "Vous avez déjà bloqué cet utilisateur." #: actions/block.php:170 msgid "Failed to save block information." -msgstr "Impossible d'enregistrer les informations de blocage." +msgstr "Impossible d’enregistrer les informations de blocage." #: actions/bookmarklet.php:50 -#, fuzzy msgid "Post to " -msgstr "Photo" +msgstr "Poster sur " #: actions/confirmaddress.php:75 msgid "No confirmation code." @@ -688,12 +731,12 @@ msgstr "Code de confirmation non trouvé." #: actions/confirmaddress.php:85 msgid "That confirmation code is not for you!" -msgstr "Ce code de confirmation n'est pas pour vous !" +msgstr "Ce code de confirmation n’est pas pour vous !" #: actions/confirmaddress.php:90 #, php-format msgid "Unrecognized address type %s" -msgstr "Type d'adresse non reconnu : %s" +msgstr "Type d’adresse non reconnu : %s" #: actions/confirmaddress.php:94 msgid "That address has already been confirmed." @@ -705,7 +748,7 @@ msgstr "Cette adresse a déjà été confirmée." #: actions/profilesettings.php:276 actions/smssettings.php:278 #: actions/smssettings.php:420 msgid "Couldn't update user." -msgstr "Impossible de mettre à jour l'utilisateur." +msgstr "Impossible de mettre à jour l’utilisateur." #: actions/confirmaddress.php:126 actions/emailsettings.php:390 #: actions/imsettings.php:363 actions/smssettings.php:382 @@ -714,7 +757,7 @@ msgstr "Impossible de supprimer le courriel de confirmation." #: actions/confirmaddress.php:144 msgid "Confirm Address" -msgstr "Confirmer l'adresse" +msgstr "Confirmer l’adresse" #: actions/confirmaddress.php:159 #, php-format @@ -722,9 +765,8 @@ msgid "The address \"%s\" has been confirmed for your account." msgstr "L'adresse \"%s\" a été validée pour votre compte." #: actions/conversation.php:99 -#, fuzzy msgid "Conversation" -msgstr "Code de confirmation" +msgstr "Conversation" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 #: lib/profileaction.php:206 @@ -733,20 +775,19 @@ msgstr "Statuts" #: actions/deletenotice.php:52 actions/shownotice.php:92 msgid "No such notice." -msgstr "Statut non trouvé. " +msgstr "Statut non trouvé." #: actions/deletenotice.php:71 msgid "Can't delete this notice." msgstr "Impossible de supprimer ce statut." #: actions/deletenotice.php:103 -#, fuzzy msgid "" "You are about to permanently delete a notice. Once this is done, it cannot " "be undone." msgstr "" -"Ce message va être définitivement supprimé. Il sera impossible de le " -"récupérer." +"Vous êtes sur le point de supprimer définitivement un message. Une fois cela " +"fait, il est impossible de l’annuler." #: actions/deletenotice.php:109 actions/deletenotice.php:141 msgid "Delete notice" @@ -765,7 +806,6 @@ msgid "Delete this notice" msgstr "Supprimer ce statut" #: actions/deletenotice.php:157 -#, fuzzy 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 à " @@ -773,7 +813,7 @@ msgstr "" #: actions/disfavor.php:81 msgid "This notice is not a favorite!" -msgstr "Ce statut n'est pas un favori !" +msgstr "Ce statut n’est pas un favori !" #: actions/disfavor.php:94 msgid "Add to favorites" @@ -781,7 +821,7 @@ msgstr "Ajouter aux favoris" #: actions/doc.php:69 msgid "No such document." -msgstr "Document non trouvé. " +msgstr "Document non trouvé." #: actions/editgroup.php:56 #, php-format @@ -795,16 +835,16 @@ msgstr "Vous devez ouvrir une session pour créer un groupe." #: actions/editgroup.php:103 actions/editgroup.php:168 #: actions/groupdesignsettings.php:104 actions/grouplogo.php:106 msgid "You must be an admin to edit the group" -msgstr "Seuls les administrateurs d'un groupe peuvent le modifier." +msgstr "Seuls les administrateurs d’un groupe peuvent le modifier." #: actions/editgroup.php:154 msgid "Use this form to edit the group." msgstr "Remplissez ce formulaire pour modifier les options du groupe." #: actions/editgroup.php:201 actions/newgroup.php:145 -#, fuzzy, php-format +#, php-format msgid "description is too long (max %d chars)." -msgstr "la description est trop longue (140 caractères maximum)." +msgstr "la description est trop longue (%d caractères maximum)." #: actions/editgroup.php:253 msgid "Could not update group." @@ -836,14 +876,14 @@ msgstr "Adresse courriel actuellement confirmée." #: actions/imsettings.php:108 actions/smssettings.php:115 #: actions/smssettings.php:158 msgid "Remove" -msgstr "Retirer " +msgstr "Retirer" #: actions/emailsettings.php:113 msgid "" "Awaiting confirmation on this address. Check your inbox (and spam box!) for " "a message with further instructions." msgstr "" -"En attente d'une confirmation pour cette adresse. Vérifiez votre compte " +"En attente d’une confirmation pour cette adresse. Vérifiez votre compte " "Jabber/GTalk pour recevoir de nouvelles instructions." #: actions/emailsettings.php:117 actions/imsettings.php:120 @@ -853,11 +893,11 @@ msgstr "Annuler" #: actions/emailsettings.php:121 msgid "Email Address" -msgstr "Adresse courriel" +msgstr "Adresse de courriel" #: actions/emailsettings.php:123 msgid "Email address, like \"UserName@example.org\"" -msgstr "Adresse courriel (ex : nom@example.org)" +msgstr "Adresse de courriel (ex : nom@example.org)" #: actions/emailsettings.php:126 actions/imsettings.php:133 #: actions/smssettings.php:145 @@ -874,7 +914,7 @@ msgstr "Écrivez à cette adresse courriel pour publier de nouveaux statuts. " #: actions/emailsettings.php:145 actions/smssettings.php:162 msgid "Make a new email address for posting to; cancels the old one." -msgstr "Nouvelle adresse courriel pour poster ; annule l'ancienne." +msgstr "Nouvelle adresse courriel pour poster ; annule l’ancienne." #: actions/emailsettings.php:148 actions/smssettings.php:164 msgid "New" @@ -897,16 +937,15 @@ msgstr "" #: actions/emailsettings.php:169 msgid "Send me email when someone sends me a private message." -msgstr "Envoyez-moi un courriel quand quelqu'un m'envoie un message personnel." +msgstr "Envoyez-moi un courriel quand quelqu’un m’envoie un message personnel." #: actions/emailsettings.php:174 -#, fuzzy msgid "Send me email when someone sends me an \"@-reply\"." -msgstr "Envoyez-moi un courriel quand quelqu'un m'envoie un message personnel." +msgstr "Envoyez-moi un courriel quand quelqu’un m’envoie une réponse « @ »." #: actions/emailsettings.php:179 msgid "Allow friends to nudge me and send me an email." -msgstr "Autoriser mes amis à m'envoyer des courriels et des clins d'oeil." +msgstr "Autoriser mes amis à m’envoyer des courriels et des clins d’œil." #: actions/emailsettings.php:185 msgid "I want to post notices by email." @@ -935,7 +974,7 @@ msgstr "Aucune adresse courriel." #: actions/emailsettings.php:326 msgid "Cannot normalize that email address" -msgstr "Impossible d'utiliser cette adresse courriel" +msgstr "Impossible d’utiliser cette adresse courriel" #: actions/emailsettings.php:330 msgid "Not a valid email address" @@ -952,14 +991,14 @@ msgstr "Cette adresse courriel appartient déjà à un autre utilisateur." #: actions/emailsettings.php:352 actions/imsettings.php:317 #: actions/smssettings.php:337 msgid "Couldn't insert confirmation code." -msgstr "Impossible d'insérer le code de confirmation." +msgstr "Impossible d’insérer le code de confirmation." #: actions/emailsettings.php:358 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 "" -"Un code de confirmation a été envoyé à l'adresse courriel indiquée. Vérifiez " +"Un code de confirmation a été envoyé à l’adresse courriel indiquée. Vérifiez " "votre boîte de réception pour récupérer le code et les instructions." #: actions/emailsettings.php:378 actions/imsettings.php:351 @@ -978,12 +1017,12 @@ msgstr "Confirmation annulée." #: actions/emailsettings.php:412 msgid "That is not your email address." -msgstr "Ceci n'est pas votre adresse courriel." +msgstr "Ceci n’est pas votre adresse courriel." #: actions/emailsettings.php:431 actions/imsettings.php:408 #: actions/smssettings.php:425 msgid "The address was removed." -msgstr "L'adresse a été supprimée." +msgstr "L’adresse a été supprimée." #: actions/emailsettings.php:445 actions/smssettings.php:518 msgid "No incoming email address." @@ -992,11 +1031,11 @@ msgstr "Aucune adresse pour le courriel entrant." #: actions/emailsettings.php:455 actions/emailsettings.php:477 #: actions/smssettings.php:528 actions/smssettings.php:552 msgid "Couldn't update user record." -msgstr "Impossible de mettre à jour le dossier de l'utilisateur." +msgstr "Impossible de mettre à jour le dossier de l’utilisateur." #: actions/emailsettings.php:458 actions/smssettings.php:531 msgid "Incoming email address removed." -msgstr "L'adresse de courriel entrant a été supprimée." +msgstr "L’adresse de courriel entrant a été supprimée." #: actions/emailsettings.php:480 actions/smssettings.php:555 msgid "New incoming email address added." @@ -1019,12 +1058,16 @@ msgstr "Statuts les plus populaires sur le site en ce moment." #: actions/favorited.php:150 msgid "Favorite notices appear on this page but no one has favorited one yet." msgstr "" +"Les statuts favoris apparaissent sur cette page mais personne ne n’en a mis " +"un en favori actuellement." #: actions/favorited.php:153 msgid "" "Be the first to add a notice to your favorites by clicking the fave button " "next to any notice you like." msgstr "" +"Soyez le premier à un statut dans vos favoris en cliquant sur le bouton " +"favori à côté d’un statut que vous aimez." #: actions/favorited.php:156 #, php-format @@ -1032,6 +1075,8 @@ msgid "" "Why not [register an account](%%action.register%%) and be the first to add a " "notice to your favorites!" msgstr "" +"Pourquoi ne pas [créer un nouveau compte](%%action.register%%) et être le " +"premier à ajouter un avis à vos favoris !" #: actions/favoritesrss.php:111 actions/showfavorites.php:77 #: lib/personalgroupnav.php:115 @@ -1068,13 +1113,12 @@ msgid "A selection of some of the great users on %s" msgstr "Les utilisateurs à ne pas manquer dans %s" #: actions/file.php:34 -#, fuzzy msgid "No notice id" -msgstr "Nouveau statut" +msgstr "Pas d’identifiant de statut" #: actions/file.php:38 msgid "No notice" -msgstr "Aucun avis" +msgstr "Aucun statut" #: actions/file.php:42 msgid "No attachments" @@ -1082,39 +1126,35 @@ msgstr "Aucune pièce jointe" #: actions/file.php:51 msgid "No uploaded attachments" -msgstr "" +msgstr "Aucune pièce jointe importée" #: actions/finishremotesubscribe.php:69 msgid "Not expecting this response!" msgstr "Réponse inattendue !" #: actions/finishremotesubscribe.php:80 -#, fuzzy msgid "User being listened to does not exist." -msgstr "L'utilisateur suivi n'existe pas." +msgstr "L’utilisateur suivi n’existe pas." #: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59 msgid "You can use the local subscription!" -msgstr "Vous pouvez utiliser l'abonnement local." +msgstr "Vous pouvez utiliser l’abonnement local." #: actions/finishremotesubscribe.php:96 msgid "That user has blocked you from subscribing." msgstr "Cet utilisateur vous a empêché de vous inscrire." #: actions/finishremotesubscribe.php:106 -#, fuzzy msgid "You are not authorized." -msgstr "Non autorisé." +msgstr "Vous n'êtes pas autorisé." #: actions/finishremotesubscribe.php:109 -#, fuzzy msgid "Could not convert request token to access token." -msgstr "Impossible de convertir les jetons de requête en jetons d'accès" +msgstr "Impossible de convertir le jeton de requête en jeton d’accès." #: actions/finishremotesubscribe.php:114 -#, fuzzy msgid "Remote service uses unknown version of OMB protocol." -msgstr "Version inconnue du protocole OMB" +msgstr "Le service distant utilise une version inconnue du protocole OMB." #: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306 msgid "Error updating remote profile" @@ -1127,9 +1167,8 @@ msgid "No such group." msgstr "Aucun groupe trouvé." #: actions/getfile.php:75 -#, fuzzy msgid "No such file." -msgstr "Statut non trouvé. " +msgstr "Fichier non trouvé." #: actions/getfile.php:79 msgid "Cannot read file." @@ -1138,20 +1177,19 @@ msgstr "Impossible de lire le fichier" #: actions/groupblock.php:81 actions/groupunblock.php:81 #: actions/makeadmin.php:81 msgid "No group specified." -msgstr "Aucun groupe n'a été spécifié." +msgstr "Aucun groupe n’a été spécifié." #: actions/groupblock.php:91 msgid "Only an admin can block group members." -msgstr "" +msgstr "Seul un administrateur peut bloquer des membres du groupe." #: actions/groupblock.php:95 -#, fuzzy msgid "User is already blocked from group." -msgstr "Cet utilisateur vous a bloqué." +msgstr "Cet utilisateur est déjà bloqué pour le groupe." #: actions/groupblock.php:100 msgid "User is not a member of group." -msgstr "L'utilisateur n'est pas membre du groupe." +msgstr "L’utilisateur n’est pas membre du groupe." #: actions/groupblock.php:136 actions/groupmembers.php:314 msgid "Block user from group" @@ -1164,20 +1202,22 @@ msgid "" "be removed from the group, unable to post, and unable to subscribe to the " "group in the future." msgstr "" +"Êtes-vous sûr(e) de vouloir bloquer l’utilisateur \"%s\" du groupe \"%s\"? " +"Ils seront supprimés du groupe, il leur sera interdit d’y publier, et de s’y " +"abonner à l’avenir." #: actions/groupblock.php:178 -#, fuzzy msgid "Do not block this user from this group" -msgstr "Liste des utilisateurs inscrits à ce groupe." +msgstr "Ne pas bloquer cet utilisateur pour ce groupe" #: actions/groupblock.php:179 -#, fuzzy msgid "Block this user from this group" -msgstr "Liste des utilisateurs inscrits à ce groupe." +msgstr "Bloquer cet utilisateur de de groupe" #: actions/groupblock.php:196 msgid "Database error blocking user from group." msgstr "" +"Erreur de la base de données lors du blocage de l’utilisateur du groupe." #: actions/groupbyid.php:74 msgid "No ID" @@ -1188,9 +1228,8 @@ msgid "You must be logged in to edit a group." msgstr "Vous devez ouvrir une session pour modifier un groupe." #: actions/groupdesignsettings.php:141 -#, fuzzy msgid "Group design" -msgstr "Groupes" +msgstr "Conception du groupe" #: actions/groupdesignsettings.php:152 msgid "" @@ -1200,16 +1239,15 @@ msgstr "" #: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186 #: lib/designsettings.php:434 lib/designsettings.php:464 -#, fuzzy msgid "Couldn't update your design." -msgstr "Impossible de mettre à jour l'utilisateur." +msgstr "Impossible de mettre à jour votre conception." #: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 #, fuzzy msgid "Unable to save your design settings!" -msgstr "L'enregistrement de votre configuration Twitter a échoué !" +msgstr "L’enregistrement de votre configuration Twitter a échoué !" #: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231 #, fuzzy @@ -1221,15 +1259,16 @@ msgid "Group logo" msgstr "Logo du groupe" #: actions/grouplogo.php:150 -#, fuzzy, php-format +#, php-format msgid "" "You can upload a logo image for your group. The maximum file size is %s." -msgstr "Choisissez un logo pour votre groupe." +msgstr "" +"Vous pouvez choisir un logo pour votre groupe. La taille maximale du fichier " +"est de %s." #: actions/grouplogo.php:362 -#, fuzzy msgid "Pick a square area of the image to be the logo." -msgstr "Sélectionnez une zone de forme carrée pour définir votre avatar" +msgstr "Sélectionnez une zone de forme carrée sur l’image qui sera le logo." #: actions/grouplogo.php:396 msgid "Logo updated." @@ -1266,13 +1305,12 @@ msgid "Make user an admin of the group" msgstr "Faire de cet utilisateur un administrateur du groupe" #: actions/groupmembers.php:473 -#, fuzzy msgid "Make Admin" -msgstr "Administrer" +msgstr "Faire un administrateur" #: actions/groupmembers.php:473 msgid "Make this user an admin" -msgstr "" +msgstr "Faire de cet utilisateur un administrateur" #: actions/grouprss.php:133 #, fuzzy, php-format @@ -1338,16 +1376,15 @@ msgstr "Créer un nouveau groupe" #: actions/groupunblock.php:91 msgid "Only an admin can unblock group members." -msgstr "" +msgstr "Seul un administrateur peut débloquer les membres du groupes." #: actions/groupunblock.php:95 -#, fuzzy msgid "User is not blocked from group." -msgstr "Cet utilisateur vous a bloqué." +msgstr "Cet utilisateur n’est pas bloqué du groupe." #: actions/groupunblock.php:128 actions/unblock.php:108 msgid "Error removing the block." -msgstr "Erreur lors de l'annulation du blocage." +msgstr "Erreur lors de l’annulation du blocage." #: actions/imsettings.php:59 msgid "IM Settings" @@ -1364,9 +1401,8 @@ msgstr "" "dessous." #: actions/imsettings.php:89 -#, fuzzy msgid "IM is not available." -msgstr "Cette page n'est pas disponible dans " +msgstr "La messagerie instantanée n’est pas disponible." #: actions/imsettings.php:106 msgid "Current confirmed Jabber/GTalk address." @@ -1378,7 +1414,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 "" -"En attente d'une confirmation pour cette adresse. Vérifiez votre compte " +"En attente d’une confirmation pour cette adresse. Vérifiez votre compte " "Jabber/GTalk pour recevoir de nouvelles instructions. (Avez-vous ajouté %s à " "votre liste de contacts ?)" @@ -1392,8 +1428,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 "" -"Adresse Jabber ou GTalk (ex : nom@mondomaine.com). Assurez-vous d'ajouter %s " -"à votre liste d'amis dans votre logiciel de messagerie instantanée ou dans " +"Adresse Jabber ou GTalk (ex : nom@mondomaine.com). Assurez-vous d’ajouter %s " +"à votre liste d’amis dans votre logiciel de messagerie instantanée ou dans " "GTalk." #: actions/imsettings.php:143 @@ -1421,7 +1457,7 @@ msgstr "Aucun identifiant Jabber" #: actions/imsettings.php:292 msgid "Cannot normalize that Jabber ID" -msgstr "Impossible d'utiliser cet identifiant Jabber" +msgstr "Impossible d’utiliser cet identifiant Jabber" #: actions/imsettings.php:296 msgid "Not a valid Jabber ID" @@ -1446,7 +1482,7 @@ msgstr "" #: actions/imsettings.php:387 msgid "That is not your Jabber ID." -msgstr "Ceci n'est pas votre identifiant Jabber." +msgstr "Ceci n’est pas votre identifiant Jabber." #: actions/inbox.php:59 #, php-format @@ -1466,13 +1502,13 @@ msgstr "" #: actions/invite.php:39 msgid "Invites have been disabled." -msgstr "" +msgstr "Les invitation ont été désactivées." #: actions/invite.php:41 #, php-format msgid "You must be logged in to invite other users to use %s" msgstr "" -"Vous devez ouvrir une session pour inviter d'autres utilisateurs dans %s" +"Vous devez ouvrir une session pour inviter d’autres utilisateurs dans %s" #: actions/invite.php:72 #, php-format @@ -1527,7 +1563,7 @@ msgstr "Adresses courriel" #: actions/invite.php:189 msgid "Addresses of friends to invite (one per line)" -msgstr "Adresses d'amis à inviter (un par ligne)" +msgstr "Adresses d’amis à inviter (un par ligne)" #: actions/invite.php:192 msgid "Personal message" @@ -1535,7 +1571,7 @@ msgstr "Message personnel" #: actions/invite.php:194 msgid "Optionally add a personal message to the invitation." -msgstr "Ajouter un message personnel à l'invitation (optionnel)." +msgstr "Ajouter un message personnel à l’invitation (optionnel)." #: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:208 msgid "Send" @@ -1583,7 +1619,7 @@ msgstr "" "intéressent.\n" "\n" "Vous pouvez aussi partager des informations sur vous, vos idées, ou votre " -"vie en ligne avec les personnes qui vous connaissent. C'est également un " +"vie en ligne avec les personnes qui vous connaissent. C’est également un " "outil utile pour rencontrer de nouvelles personnes qui partagent vos " "intérêts.\n" "\n" @@ -1596,7 +1632,7 @@ msgstr "" "%5$s\n" "\n" "Si vous souhaitez essayez ce service, cliquez sur le lien ci-dessous pour " -"accepter l'invitation\n" +"accepter l’invitation\n" "\n" "%6$s\n" "\n" @@ -1611,12 +1647,12 @@ msgstr "Vous devez ouvrir une session pour rejoindre un groupe." #: actions/joingroup.php:90 lib/command.php:217 msgid "You are already a member of that group" -msgstr "Vous êtes déjà membre de ce groupe " +msgstr "Vous êtes déjà membre de ce groupe" #: actions/joingroup.php:128 lib/command.php:234 #, php-format msgid "Could not join user %s to group %s" -msgstr "Impossible d'inscrire l'utilisateur %s au groupe %s" +msgstr "Impossible d’inscrire l’utilisateur %s au groupe %s" #: actions/joingroup.php:135 lib/command.php:239 #, php-format @@ -1633,12 +1669,12 @@ msgstr "Vous n'êtes pas membre de ce groupe." #: actions/leavegroup.php:119 lib/command.php:278 msgid "Could not find membership record." -msgstr "Aucun enregistrement à ce groupe n'a été trouvé." +msgstr "Aucun enregistrement à ce groupe n’a été trouvé." #: actions/leavegroup.php:127 lib/command.php:284 #, php-format msgid "Could not remove user %s to group %s" -msgstr "Impossible de retirer l'utilisateur %s du groupe %s" +msgstr "Impossible de retirer l’utilisateur %s du groupe %s" #: actions/leavegroup.php:134 lib/command.php:289 #, php-format @@ -1650,9 +1686,8 @@ msgid "Already logged in." msgstr "Déjà connecté." #: actions/login.php:110 actions/login.php:120 -#, fuzzy msgid "Invalid or expired token." -msgstr "Contenu invalide" +msgstr "Jeton invalide ou expiré." #: actions/login.php:143 msgid "Incorrect username or password." @@ -1661,7 +1696,7 @@ msgstr "Identifiant ou mot de passe incorrect." #: actions/login.php:149 actions/recoverpassword.php:375 #: actions/register.php:248 msgid "Error setting user." -msgstr "Erreur lors de la configuration de l'utilisateur." +msgstr "Erreur lors de la configuration de l’utilisateur." #: actions/login.php:204 actions/login.php:257 lib/action.php:453 #: lib/logingroupnav.php:79 @@ -1679,7 +1714,7 @@ msgid "Nickname" msgstr "Pseudo" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Mot de passe" @@ -1690,7 +1725,7 @@ msgstr "Se souvenir de moi" #: actions/login.php:253 actions/register.php:479 msgid "Automatically login in the future; not for shared computers!" msgstr "" -"Ouvrir automatiquement ma session à l'avenir (déconseillé pour les " +"Ouvrir automatiquement ma session à l’avenir (déconseillé pour les " "ordinateurs publics ou partagés)" #: actions/login.php:263 @@ -1703,7 +1738,7 @@ msgid "" "changing your settings." msgstr "" "Pour des raisons de sécurité, veuillez entrer à nouveau votre identifiant et " -"votre mot de passe afin d'enregistrer vos préférences." +"votre mot de passe afin d’enregistrer vos préférences." #: actions/login.php:286 #, fuzzy, php-format @@ -1718,11 +1753,12 @@ msgstr "" #: actions/makeadmin.php:91 msgid "Only an admin can make another user an admin." msgstr "" +"Seul un administrateur peut faire d’un autre utilisateur un administrateur." #: actions/makeadmin.php:95 #, php-format msgid "%s is already an admin for group \"%s\"." -msgstr "" +msgstr "%s est déjà un administrateur du groupe « %s »." #: actions/makeadmin.php:132 #, php-format @@ -1732,11 +1768,11 @@ msgstr "" #: actions/makeadmin.php:145 #, php-format msgid "Can't make %s an admin for group %s" -msgstr "" +msgstr "Impossible de faire %s un administrateur du groupe %s" #: actions/microsummary.php:69 msgid "No current status" -msgstr "Aucun statut " +msgstr "Aucun statut actuel" #: actions/newgroup.php:53 msgid "New group" @@ -1761,13 +1797,13 @@ msgstr "Aucun contenu !" #: actions/newmessage.php:158 msgid "No recipient specified." -msgstr "Aucun destinataire n'a été spécifié." +msgstr "Aucun destinataire n’a été spécifié." #: actions/newmessage.php:164 lib/command.php:370 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" -"N'envoyez pas de message à vous-même ; dites-le plutôt dans votre tête..." +"N’envoyez pas de message à vous-même ; dites-le plutôt dans votre tête..." #: actions/newmessage.php:181 msgid "Message sent" @@ -1804,9 +1840,9 @@ msgid "Text search" msgstr "Recherche de texte" #: actions/noticesearch.php:91 -#, fuzzy, php-format +#, php-format msgid "Search results for \"%s\" on %s" -msgstr " Flux de recherche pour « %s »" +msgstr "Résultat de la recherche pour « %s » sur %s" #: actions/noticesearch.php:121 #, php-format @@ -1818,14 +1854,14 @@ msgstr "" #: actions/noticesearch.php:124 #, php-format msgid "" -"Why not [register an account](%%%%action.register%%%%) and be the first to " +"Why not [register an account](%%%%action.register%%%%) and be the first to " "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" msgstr "" #: actions/noticesearchrss.php:89 -#, fuzzy, php-format +#, php-format msgid "Updates with \"%s\"" -msgstr "Statuts de %1$s dans %2$s!" +msgstr "Mises à jour avec « %s »" #: actions/noticesearchrss.php:91 #, fuzzy, php-format @@ -1836,20 +1872,20 @@ msgstr "Statuts correspondant au(x) terme(s) \"%s\"" msgid "" "This user doesn't allow nudges or hasn't confirmed or set his email yet." msgstr "" -"Cet utilisateur n'accepte pas les clins d'Å“il ou n'a pas encore validé son " +"Cet utilisateur n’accepte pas les clins d’œil ou n’a pas encore validé son " "adresse courriel." #: actions/nudge.php:94 msgid "Nudge sent" -msgstr "Clin d'Å“il envoyé" +msgstr "Clin d’œil envoyé" #: actions/nudge.php:97 msgid "Nudge sent!" -msgstr "Clin d'Å“il envoyé !" +msgstr "Clin d’œil envoyé !" #: actions/oembed.php:79 actions/shownotice.php:100 msgid "Notice has no profile" -msgstr "Le statut n'a pas de profil" +msgstr "Le statut n’a pas de profil" #: actions/oembed.php:86 actions/shownotice.php:180 #, php-format @@ -1857,16 +1893,15 @@ msgid "%1$s's status on %2$s" msgstr "Statut de %1$s sur %2$s" #: actions/oembed.php:157 -#, fuzzy msgid "content type " -msgstr "Contenu" +msgstr "type de contenu " #: actions/oembed.php:160 msgid "Only " -msgstr "" +msgstr "Seulement " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963 -#: lib/api.php:991 lib/api.php:1101 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 +#: lib/api.php:1027 lib/api.php:1137 msgid "Not a supported data format." msgstr "Format de données non supporté." @@ -1886,13 +1921,17 @@ msgstr "Autres paramètres" msgid "Manage various other options." msgstr "Autres options à configurer" -#: actions/othersettings.php:117 +#: actions/othersettings.php:108 +msgid " (free service)" +msgstr " (service gratuit)" + +#: actions/othersettings.php:116 msgid "Shorten URLs with" -msgstr "" +msgstr "Raccourcir les URL avec" -#: actions/othersettings.php:118 +#: actions/othersettings.php:117 msgid "Automatic shortening service to use." -msgstr "Sélectionnez un service de réduction d'URL." +msgstr "Sélectionnez un service de réduction d’URL." #: actions/othersettings.php:122 #, fuzzy @@ -1905,86 +1944,81 @@ msgstr "" #: actions/othersettings.php:153 msgid "URL shortening service is too long (max 50 chars)." -msgstr "Le service de réduction d'URL est trop long (50 caractères maximum)." +msgstr "Le service de réduction d’URL est trop long (50 caractères maximum)." #: actions/outbox.php:58 #, php-format msgid "Outbox for %s - page %d" -msgstr "Boîte d'envoi de %s - page %d" +msgstr "Boîte d’envoi de %s - page %d" #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" -msgstr "Boîte d'envoi de %s" +msgstr "Boîte d’envoi de %s" #: actions/outbox.php:116 msgid "This is your outbox, which lists private messages you have sent." msgstr "" -"Cette boîte d'envoi regroupe les messages personnels que vous avez envoyés." +"Cette boîte d’envoi regroupe les messages personnels que vous avez envoyés." #: actions/passwordsettings.php:58 msgid "Change password" msgstr "Modifier le mot de passe" -#: actions/passwordsettings.php:70 -#, fuzzy -msgid "You are not allowed to change your password" -msgstr "Modifier votre mot de passe" - -#: actions/passwordsettings.php:82 +#: actions/passwordsettings.php:69 msgid "Change your password." msgstr "Modifier votre mot de passe." -#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:96 actions/recoverpassword.php:231 msgid "Password change" msgstr "Modification du mot de passe" -#: actions/passwordsettings.php:117 +#: actions/passwordsettings.php:104 msgid "Old password" msgstr "Ancien mot de passe" -#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:108 actions/recoverpassword.php:235 msgid "New password" msgstr "Nouveau mot de passe" -#: actions/passwordsettings.php:122 +#: actions/passwordsettings.php:109 msgid "6 or more characters" msgstr "6 caractères ou plus" -#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:112 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Confirmer" -#: actions/passwordsettings.php:126 +#: actions/passwordsettings.php:113 msgid "same as password above" msgstr "identique au mot de passe ci-dessus" -#: actions/passwordsettings.php:130 +#: actions/passwordsettings.php:117 msgid "Change" msgstr "Modifier" -#: actions/passwordsettings.php:167 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "Votre mot de passe doit contenir au moins 6 caractères." -#: actions/passwordsettings.php:170 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:233 msgid "Passwords don't match." msgstr "Les mots de passe ne correspondent pas." -#: actions/passwordsettings.php:178 +#: actions/passwordsettings.php:165 msgid "Incorrect old password" msgstr "Ancien mot de passe incorrect" -#: actions/passwordsettings.php:194 +#: actions/passwordsettings.php:181 msgid "Error saving user; invalid." -msgstr "Erreur lors de l'enregistrement de l'utilisateur ; invalide." +msgstr "Erreur lors de l’enregistrement de l’utilisateur ; invalide." -#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Impossible de sauvegarder le nouveau mot de passe." -#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:192 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Mot de passe enregistré." @@ -2029,7 +2063,7 @@ msgstr "Paramètres du profil" msgid "" "You can update your personal profile info here so people know more about you." msgstr "" -"Vous pouvez mettre à jour les informations de votre profil pour qu'on en " +"Vous pouvez mettre à jour les informations de votre profil pour qu’on en " "sache plus à votre sujet." #: actions/profilesettings.php:99 @@ -2056,14 +2090,13 @@ msgid "URL of your homepage, blog, or profile on another site" msgstr "Adresse de votre site Web, blogue, ou profil dans un autre site" #: actions/profilesettings.php:122 actions/register.php:460 -#, fuzzy, php-format +#, php-format msgid "Describe yourself and your interests in %d chars" -msgstr "Décrivez vos intérêts en 140 caractères" +msgstr "Décrivez vous et vos intérêts en %d caractères" #: actions/profilesettings.php:125 actions/register.php:463 -#, fuzzy msgid "Describe yourself and your interests" -msgstr "Décrivez qui vous êtes et vos " +msgstr "Décrivez vous et vos interêts" #: actions/profilesettings.php:127 actions/register.php:465 msgid "Bio" @@ -2078,7 +2111,7 @@ msgstr "Emplacement" #: actions/profilesettings.php:134 actions/register.php:472 msgid "Where you are, like \"City, State (or Region), Country\"" -msgstr "Indiquez votre emplacement, ex.: \"Ville, État (ou région), Pays\"" +msgstr "Indiquez votre emplacement, ex.: « Ville, État (ou région), Pays »" #: actions/profilesettings.php:138 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 @@ -2112,17 +2145,17 @@ msgstr "Quel est votre fuseau horaire habituel ?" msgid "" "Automatically subscribe to whoever subscribes to me (best for non-humans)" msgstr "" -"M'abonner automatiquement à tous ceux qui s'abonnent à moi (recommandé pour " +"M’abonner automatiquement à tous ceux qui s’abonnent à moi (recommandé pour " "les utilisateurs non-humains)" #: actions/profilesettings.php:221 actions/register.php:223 -#, fuzzy, php-format +#, php-format msgid "Bio is too long (max %d chars)." -msgstr "La bio est trop longue (140 caractères maximum)." +msgstr "La bio est trop longue (%d caractères maximum)." #: actions/profilesettings.php:228 msgid "Timezone not selected." -msgstr "Aucun fuseau horaire n'a été choisi." +msgstr "Aucun fuseau horaire n’a été choisi." #: actions/profilesettings.php:234 msgid "Language is too long (max 50 chars)." @@ -2131,19 +2164,19 @@ msgstr "La langue est trop longue (255 caractères maximum)." #: actions/profilesettings.php:246 actions/tagother.php:178 #, php-format msgid "Invalid tag: \"%s\"" -msgstr "Marquage invalide : \"%s\"" +msgstr "Marquage invalide : « %s »" #: actions/profilesettings.php:295 msgid "Couldn't update user for autosubscribe." -msgstr "Impossible de mettre à jour l'auto-abonnement." +msgstr "Impossible de mettre à jour l’auto-abonnement." #: actions/profilesettings.php:328 msgid "Couldn't save profile." -msgstr "Impossible d'enregistrer le profil." +msgstr "Impossible d’enregistrer le profil." #: actions/profilesettings.php:336 msgid "Couldn't save tags." -msgstr "Impossible d'enregistrer les marquages. " +msgstr "Impossible d’enregistrer les marquages." #: actions/profilesettings.php:344 msgid "Settings saved." @@ -2168,19 +2201,16 @@ msgid "Public timeline" msgstr "Flux public" #: actions/public.php:151 -#, fuzzy msgid "Public Stream Feed (RSS 1.0)" -msgstr "Fil du flux public" +msgstr "Fil du flux public (RSS 1.0)" #: actions/public.php:155 -#, fuzzy msgid "Public Stream Feed (RSS 2.0)" -msgstr "Fil du flux public" +msgstr "Fil du flux public (RSS 2.0)" #: actions/public.php:159 -#, fuzzy msgid "Public Stream Feed (Atom)" -msgstr "Fil du flux public" +msgstr "Fil du flux public (Atom)" #: actions/public.php:179 #, php-format @@ -2191,7 +2221,7 @@ msgstr "" #: actions/public.php:182 msgid "Be the first to post!" -msgstr "" +msgstr "Soyez le premier à poster !" #: actions/public.php:186 #, php-format @@ -2224,9 +2254,8 @@ msgstr "" "wiki/Microblog) " #: actions/publictagcloud.php:57 -#, fuzzy msgid "Public tag cloud" -msgstr "Marquages publics" +msgstr "Nuage de mots clefs public" #: actions/publictagcloud.php:63 #, php-format @@ -2240,7 +2269,7 @@ msgstr "" #: actions/publictagcloud.php:72 msgid "Be the first to post one!" -msgstr "" +msgstr "Soyez le premier à en poster une !" #: actions/publictagcloud.php:75 #, php-format @@ -2250,9 +2279,8 @@ msgid "" msgstr "" #: actions/publictagcloud.php:135 -#, fuzzy msgid "Tag cloud" -msgstr "Marquages " +msgstr "Nuage de mots clefs" #: actions/recoverpassword.php:36 msgid "You are already logged in!" @@ -2260,15 +2288,15 @@ msgstr "Votre session est déjà ouverte !" #: actions/recoverpassword.php:62 msgid "No such recovery code." -msgstr "Code de récupération non trouvé. " +msgstr "Code de récupération non trouvé." #: actions/recoverpassword.php:66 msgid "Not a recovery code." -msgstr "Ceci n'est pas un code de récupération." +msgstr "Ceci n’est pas un code de récupération." #: actions/recoverpassword.php:73 msgid "Recovery code for unknown user." -msgstr "Code de récupération d'un utilisateur inconnu." +msgstr "Code de récupération d’un utilisateur inconnu." #: actions/recoverpassword.php:86 msgid "Error with confirmation code." @@ -2276,12 +2304,12 @@ msgstr "Erreur dans le code de confirmation." #: actions/recoverpassword.php:97 msgid "This confirmation code is too old. Please start again." -msgstr "Ce code de validation est périmé. Veuillez recommencer. " +msgstr "Ce code de validation est périmé. Veuillez recommencer." #: actions/recoverpassword.php:111 msgid "Could not update user with confirmed email address." msgstr "" -"Impossible de mettre l'utilisateur à jour avec l'adresse courriel confirmée." +"Impossible de mettre l’utilisateur à jour avec l’adresse courriel confirmée." #: actions/recoverpassword.php:152 msgid "" @@ -2291,20 +2319,20 @@ msgstr "" #: actions/recoverpassword.php:158 msgid "You have been identified. Enter a new password below. " -msgstr "" +msgstr "Vous avez été identifié. Entrez un nouveau mot de passe ci-dessous. " #: actions/recoverpassword.php:188 msgid "Password recovery" -msgstr "" +msgstr "Récupération de mot de passe" #: actions/recoverpassword.php:191 msgid "Nickname or email address" -msgstr "" +msgstr "Pseudo ou adresse de courriel" #: actions/recoverpassword.php:193 msgid "Your nickname on this server, or your registered email address." msgstr "" -"Votre pseudo sur ce serveur, ou l'adresse courriel que vous avez enregistrée." +"Votre pseudo sur ce serveur, ou l’adresse courriel que vous avez enregistrée." #: actions/recoverpassword.php:199 actions/recoverpassword.php:200 msgid "Recover" @@ -2328,7 +2356,7 @@ msgstr "Action inconnue" #: actions/recoverpassword.php:236 msgid "6 or more characters, and don't forget it!" -msgstr "6 caractères ou plus, et ne l'oubliez pas !" +msgstr "6 caractères ou plus, et ne l’oubliez pas !" #: actions/recoverpassword.php:240 msgid "Same as password above" @@ -2352,7 +2380,7 @@ msgstr "Aucune adresse courriel enregistrée pour cet utilisateur." #: actions/recoverpassword.php:301 msgid "Error saving address confirmation." -msgstr "Erreur lors de l'enregistrement de la confirmation du courriel." +msgstr "Erreur lors de l’enregistrement de la confirmation du courriel." #: actions/recoverpassword.php:325 msgid "" @@ -2360,7 +2388,7 @@ msgid "" "address registered to your account." msgstr "" "Les instructions pour récupérer votre mot de passe ont été envoyées à " -"l'adresse courriel indiquée dans votre compte." +"l’adresse courriel indiquée dans votre compte." #: actions/recoverpassword.php:344 msgid "Unexpected password reset." @@ -2381,12 +2409,11 @@ msgstr "" #: actions/register.php:85 actions/register.php:189 actions/register.php:404 msgid "Sorry, only invited people can register." -msgstr "Désolé ! Seules les personnes invitées peuvent s'inscrire." +msgstr "Désolé ! Seules les personnes invitées peuvent s’inscrire." #: actions/register.php:92 -#, fuzzy msgid "Sorry, invalid invitation code." -msgstr "Erreur dans le code de confirmation." +msgstr "Désolé, code d’invitation invalide." #: actions/register.php:112 msgid "Registration successful" @@ -2437,7 +2464,7 @@ msgid "Same as password above. Required." msgstr "Identique au mot de passe ci-dessus. Requis." #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:122 +#: lib/accountsettingsaction.php:120 msgid "Email" msgstr "Courriel" @@ -2460,13 +2487,12 @@ msgid "Creative Commons Attribution 3.0" msgstr "Creative Commons Paternité 3.0" #: actions/register.php:496 -#, fuzzy msgid "" " except this private data: password, email address, IM address, and phone " "number." msgstr "" -"à l'exception de ces données personnelles : mot de passe, adresse e-mail, " -"adresse de messagerie instantanée, numéro de téléphone. " +" à l’exception de ces données personnelles : mot de passe, adresse e-mail, " +"adresse de messagerie instantanée, numéro de téléphone." #: actions/register.php:537 #, php-format @@ -2491,7 +2517,7 @@ msgstr "" "\n" "* Visiter [votre profil](%s) et publier votre premier statut.\n" "* Ajouter une adresse [Jabber/GTalk](%%%%action.imsettings%%%%) afin " -"d'envoyer et recevoir vos statuts par messagerie instantanée.\n" +"d’envoyer et recevoir vos statuts par messagerie instantanée.\n" "* [Chercher des personnes](%%%%action.peoplesearch%%%%) que vous pourriez " "connaître ou qui partagent vos intêrets.\n" "* Mettre votre [profil](%%%%action.profilesettings%%%%) à jour pour en dire " @@ -2499,7 +2525,7 @@ msgstr "" "* Parcourir la [documentation](%%%%doc.help%%%%) en ligne pour en savoir " "plus sur le fonctionnement du service.\n" "\n" -"Merci pour votre inscription ! Nous vous souhaitons d'apprécier notre " +"Merci pour votre inscription ! Nous vous souhaitons d’apprécier notre " "service." #: actions/register.php:561 @@ -2519,25 +2545,24 @@ msgid "" msgstr "" "Pour vous abonner, vous devez [ouvrir une session](%%action.login%%), ou " "[créer un nouveau compte](%%action.register%%). Si vous avez déjà un compte " -"sur un [site de micro-blogging compatible](%%doc.openmublog%%), entrez l'URL " +"sur un [site de micro-blogging compatible](%%doc.openmublog%%), entrez l’URL " "de votre profil ci-dessous." #: actions/remotesubscribe.php:112 msgid "Remote subscribe" -msgstr "Abonnement à distance " +msgstr "Abonnement à distance" #: actions/remotesubscribe.php:124 -#, fuzzy msgid "Subscribe to a remote user" -msgstr "S'abonner à cet utilisateur" +msgstr "S’abonner à un utilisateur distant" #: actions/remotesubscribe.php:129 msgid "User nickname" -msgstr "Pseudo de l'utilisateur" +msgstr "Pseudo de l’utilisateur" #: actions/remotesubscribe.php:130 msgid "Nickname of the user you want to follow" -msgstr "Pseudo de l'utilisateur que vous voulez suivre" +msgstr "Pseudo de l’utilisateur que vous voulez suivre" #: actions/remotesubscribe.php:133 msgid "Profile URL" @@ -2550,27 +2575,25 @@ msgstr "URL de votre profil sur un autre service de micro-blogging compatible" #: actions/remotesubscribe.php:137 lib/subscribeform.php:139 #: lib/userprofile.php:321 msgid "Subscribe" -msgstr "S'abonner" +msgstr "S’abonner" #: actions/remotesubscribe.php:159 msgid "Invalid profile URL (bad format)" msgstr "URL du profil invalide (mauvais format)" #: actions/remotesubscribe.php:168 -#, fuzzy msgid "" "Not a valid profile URL (no YADIS document or no or invalid XRDS defined)." -msgstr "URL de profil invalide (aucun document YADIS)." +msgstr "" +"URL de profil invalide (aucun document YADIS ou définition XRDS invalide)." #: actions/remotesubscribe.php:176 -#, fuzzy msgid "That’s a local profile! Login to subscribe." -msgstr "Ce profil est local ! Ouvrez une session pour vous abonner." +msgstr "Ce profil est local ! Connectez-vous pour vous abonner." #: actions/remotesubscribe.php:183 -#, fuzzy msgid "Couldn’t get a request token." -msgstr "Impossible d'obtenir le jeton de requête." +msgstr "Impossible d’obtenir un jeton de requête." #: actions/replies.php:125 actions/repliesrss.php:68 #: lib/personalgroupnav.php:105 @@ -2584,19 +2607,19 @@ msgid "Replies to %s, page %d" msgstr "Réponses à %s - page %d" #: actions/replies.php:144 -#, fuzzy, php-format +#, php-format msgid "Replies feed for %s (RSS 1.0)" -msgstr "Flux des statuts de %s" +msgstr "Flux des réponses pour %s (RSS 1.0)" #: actions/replies.php:151 -#, fuzzy, php-format +#, php-format msgid "Replies feed for %s (RSS 2.0)" -msgstr "Flux des statuts de %s" +msgstr "Flux des réponses pour %s (RSS 2.0)" #: actions/replies.php:158 #, php-format msgid "Replies feed for %s (Atom)" -msgstr "Flux des statuts de %s" +msgstr "Flux des réponses pour %s (Atom)" #: actions/replies.php:198 #, php-format @@ -2618,6 +2641,8 @@ msgid "" "You can try to [nudge %s](../%s) or [post something to his or her attention]" "(%%%%action.newnotice%%%%?status_textarea=%s)." msgstr "" +"Vous pouvez essayer de [faire un clin d’œil à %s](../%s) ou de [publier " +"quelque chose à son attention](%%%%action.newnotice%%%%?status_textarea=%s)" #: actions/repliesrss.php:72 #, fuzzy, php-format @@ -2625,13 +2650,13 @@ msgid "Replies to %1$s on %2$s!" msgstr "Message adressé à %1$s le %2$s" #: actions/showfavorites.php:79 -#, fuzzy, php-format +#, php-format msgid "%s's favorite notices, page %d" -msgstr "Statuts favoris de %s - page %d" +msgstr "Avis favoris de %s, page %d" #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." -msgstr "Impossible d'afficher les favoris." +msgstr "Impossible d’afficher les favoris." #: actions/showfavorites.php:170 #, php-format @@ -2653,6 +2678,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 "" +"Vous n’avez pas choisi d’avis favori pour le moment. Cliquez sur le bouton " +"favori sur les avis que vous aimez pour les mémoriser à l’avenir ou les " +"mettre en lumière." #: actions/showfavorites.php:207 #, php-format @@ -2660,6 +2688,8 @@ msgid "" "%s hasn't added any notices to his favorites yet. Post something interesting " "they would add to their favorites :)" msgstr "" +"%s n’a pas ajouté d’avis à ses favoris pour le moment. Publiez quelque chose " +"d’intéressant, et cela pourrait être ajouté à ses favoris :)" #: actions/showfavorites.php:211 #, php-format @@ -2668,10 +2698,13 @@ msgid "" "account](%%%%action.register%%%%) and then post something interesting they " "would add to their favorites :)" msgstr "" +"%s n’a pas ajouté d’avis à ses favoris pour le moment. Vous pourriez [créer " +"un compte](%%%%action.register%%%%), puis publier quelque chose " +"d’intéressant, qui serait ajouté à ses favoris :)" #: actions/showfavorites.php:242 msgid "This is a way to share what you like." -msgstr "" +msgstr "C’est un moyen de partager ce que vous aimez." #: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format @@ -2699,31 +2732,31 @@ msgstr "Note" #: actions/showgroup.php:284 lib/groupeditform.php:184 msgid "Aliases" -msgstr "" +msgstr "Alias" #: actions/showgroup.php:293 msgid "Group actions" msgstr "Actions du groupe" #: actions/showgroup.php:328 -#, fuzzy, php-format +#, php-format msgid "Notice feed for %s group (RSS 1.0)" -msgstr "Fil des statuts du groupe %s" +msgstr "Fil des avis du groupe %s (RSS 1.0)" #: actions/showgroup.php:334 -#, fuzzy, php-format +#, php-format msgid "Notice feed for %s group (RSS 2.0)" -msgstr "Fil des statuts du groupe %s" +msgstr "Fil des avis du groupe %s (RSS 2.0)" #: actions/showgroup.php:340 -#, fuzzy, php-format +#, php-format msgid "Notice feed for %s group (Atom)" -msgstr "Fil des statuts du groupe %s" +msgstr "Fil des avis du groupe %s (Atom)" #: actions/showgroup.php:345 #, php-format msgid "FOAF for %s group" -msgstr "Boîte d'envoi de %s" +msgstr "ami d’un ami pour le groupe %s" #: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91 msgid "Members" @@ -2765,7 +2798,7 @@ msgid "" "[StatusNet](http://status.net/) tool. Its members share short messages about " "their life and interests. " msgstr "" -"**%s** est un groupe d'utilisateurs du service de [micro-blogging](http://fr." +"**%s** est un groupe d’utilisateurs du service de [micro-blogging](http://fr." "wikipedia.org/wiki/Microblog) %%%%site.name%%%%" #: actions/showgroup.php:482 @@ -2793,14 +2826,13 @@ msgid "Message from %1$s on %2$s" msgstr "Message reçu de %1$s le %2$s" #: actions/shownotice.php:90 -#, fuzzy msgid "Notice deleted." -msgstr "Statut publié" +msgstr "Avis supprimé." #: actions/showstream.php:73 -#, fuzzy, php-format +#, php-format msgid " tagged %s" -msgstr "Statuts marqués avec %s" +msgstr " marqué %s" #: actions/showstream.php:79 #, php-format @@ -2808,40 +2840,42 @@ msgid "%s, page %d" msgstr "%s - page %d" #: actions/showstream.php:122 -#, fuzzy, php-format +#, php-format msgid "Notice feed for %s tagged %s (RSS 1.0)" -msgstr "Fil des statuts du groupe %s" +msgstr "Fil des statuts pour %s marqués %s (RSS 1.0)" #: actions/showstream.php:129 -#, fuzzy, php-format +#, php-format msgid "Notice feed for %s (RSS 1.0)" -msgstr "Flux des statuts de %s" +msgstr "Flux des statuts de %s (RSS 1.0)" #: actions/showstream.php:136 -#, fuzzy, php-format +#, php-format msgid "Notice feed for %s (RSS 2.0)" -msgstr "Flux des statuts de %s" +msgstr "Flux des statuts de %s (RSS 2.0)" #: actions/showstream.php:143 -#, fuzzy, php-format +#, php-format msgid "Notice feed for %s (Atom)" -msgstr "Flux des statuts de %s" +msgstr "Flux des statuts de %s (Atom)" #: actions/showstream.php:148 -#, fuzzy, php-format +#, php-format msgid "FOAF for %s" -msgstr "Boîte d'envoi de %s" +msgstr "ami d’un ami pour %s" #: actions/showstream.php:191 #, php-format msgid "This is the timeline for %s but %s hasn't posted anything yet." -msgstr "" +msgstr "C’est le flux de %s mais %s n’a rien publié pour le moment." #: actions/showstream.php:196 msgid "" "Seen anything interesting recently? You haven't posted any notices yet, now " "would be a good time to start :)" msgstr "" +"Avez-vous vu quelque chose d’intéressant récemment ? Vous n’avez pas publié " +"d’avis pour le moment, vous pourriez commencer maintenant :)" #: actions/showstream.php:198 #, php-format @@ -2849,6 +2883,8 @@ msgid "" "You can try to nudge %s or [post something to his or her attention](%%%%" "action.newnotice%%%%?status_textarea=%s)." msgstr "" +"Vous pouvez essayer de faire un clin d’œil à %s ou de [publier quelque chose " +"à son attention](%%%%action.newnotice%%%%?status_textarea=%s)." #: actions/showstream.php:234 #, php-format @@ -2881,9 +2917,8 @@ msgstr "" "name%%." #: actions/smssettings.php:91 -#, fuzzy msgid "SMS is not available." -msgstr "Cette page n'est pas disponible dans " +msgstr "Les SMS ne sont pas disponibles." #: actions/smssettings.php:112 msgid "Current confirmed SMS-enabled phone number." @@ -2935,13 +2970,13 @@ msgid "That phone number already belongs to another user." msgstr "Ce numéro de téléphone est déjà utilisé." #: actions/smssettings.php:347 -#, fuzzy msgid "" "A confirmation code was sent to the phone number you added. Check your phone " "for the code and instructions on how to use it." msgstr "" "Un code de confirmation a été envoyé au numéro de téléphone indiqué. " -"Vérifiez votre boîte de réception pour récupérer le code et les instructions." +"Vérifiez votre boîte de réception pour récupérer le code et les instructions " +"pour son utilisation." #: actions/smssettings.php:374 msgid "That is the wrong confirmation number." @@ -2949,7 +2984,7 @@ msgstr "Ce code de confirmation est incorrect." #: actions/smssettings.php:405 msgid "That is not your phone number." -msgstr "Ceci n'est pas votre numéro de téléphone." +msgstr "Ceci n’est pas votre numéro de téléphone." #: actions/smssettings.php:465 msgid "Mobile carrier" @@ -2966,7 +3001,7 @@ msgid "" "email but isn't listed here, send email to let us know at %s." msgstr "" "Votre fournisseur de téléphonie mobile. Si vous connaissez un fournisseur " -"qui accepte la réception de SMS par courriel mais qui n'est pas listé ici, " +"qui accepte la réception de SMS par courriel mais qui n’est pas listé ici, " "écrivez-nous à %s." #: actions/smssettings.php:498 @@ -2979,11 +3014,11 @@ msgstr "Vous n'êtes pas abonné(e) à ce profil." #: actions/subedit.php:83 msgid "Could not save subscription." -msgstr "Impossible d'enregistrer l'abonnement." +msgstr "Impossible d’enregistrer l’abonnement." #: actions/subscribe.php:55 msgid "Not a local user." -msgstr "Ceci n'est pas un utilisateur local." +msgstr "Ceci n’est pas un utilisateur local." #: actions/subscribe.php:69 msgid "Subscribed" @@ -3001,7 +3036,7 @@ msgstr "Abonnés à %s - page &d" #: actions/subscribers.php:63 msgid "These are the people who listen to your notices." -msgstr "Ces personnes suivent vos statuts. " +msgstr "Ces personnes suivent vos statuts." #: actions/subscribers.php:67 #, php-format @@ -3013,11 +3048,13 @@ msgid "" "You have no subscribers. Try subscribing to people you know and they might " "return the favor" msgstr "" +"Vous n’avez pas d’abonnés. Essayez de vous abonner à des gens que vous " +"connaissez et ils pourraient vous retourner la faveur." #: actions/subscribers.php:110 #, php-format msgid "%s has no subscribers. Want to be the first?" -msgstr "" +msgstr "%s n’a pas d’abonnés. Voulez-vous être le premier ?" #: actions/subscribers.php:114 #, php-format @@ -3025,6 +3062,8 @@ msgid "" "%s has no subscribers. Why not [register an account](%%%%action.register%%%" "%) and be the first?" msgstr "" +"%s n’a pas d’abonnés. Vous pourriez [créer un compte](%%%%action.register%%%" +"%) et être le premier ?" #: actions/subscriptions.php:52 #, php-format @@ -3054,6 +3093,12 @@ msgid "" "featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can " "automatically subscribe to people you already follow there." msgstr "" +"Vous ne suivez les avis de personne pour le moment, essayez de vous abonnez " +"à des gens que vous connaissez. Essayez la [recherche de personnes](%%action." +"peoplesearch%%), cherchez les membres de groupes auquels vous vous " +"intéressez et nos [utilisateurs en vedette](%%action.featured%%). Si vous " +"êtes un [utilisateur de Twitter](%%action.twittersettings%%), vous pouvez " +"vous abonner automatiquement aux gens auquels vous êtes déjà abonné là -bas." #: actions/subscriptions.php:123 actions/subscriptions.php:127 #, php-format @@ -3074,7 +3119,7 @@ msgstr "Aucune session ouverte" #: actions/tagother.php:39 msgid "No id argument." -msgstr "Aucun argument d'identification." +msgstr "Aucun argument d’identification." #: actions/tagother.php:65 #, php-format @@ -3083,7 +3128,7 @@ msgstr "Marquage %s" #: actions/tagother.php:77 lib/userprofile.php:75 msgid "User profile" -msgstr "Profil de l'utilisateur" +msgstr "Profil de l’utilisateur" #: actions/tagother.php:81 lib/userprofile.php:102 msgid "Photo" @@ -3091,7 +3136,7 @@ msgstr "Photo" #: actions/tagother.php:141 msgid "Tag user" -msgstr "Marquer l'utilisateur" +msgstr "Marquer l’utilisateur" #: actions/tagother.php:151 msgid "" @@ -3108,7 +3153,7 @@ msgstr "" #: actions/tagother.php:200 msgid "Could not save tags." -msgstr "Impossible d'enregistrer les marquages." +msgstr "Impossible d’enregistrer les marquages." #: actions/tagother.php:236 msgid "Use this form to add tags to your subscribers or subscriptions." @@ -3121,19 +3166,19 @@ msgid "Notices tagged with %s, page %d" msgstr "Statuts marqués %s - page %d" #: actions/tag.php:86 -#, fuzzy, php-format +#, php-format msgid "Notice feed for tag %s (RSS 1.0)" -msgstr "Flux des statuts de %s" +msgstr "Flux des statuts pour le marquage %s (RSS 1.0)" #: actions/tag.php:92 -#, fuzzy, php-format +#, php-format msgid "Notice feed for tag %s (RSS 2.0)" -msgstr "Flux des statuts de %s" +msgstr "Flux des statuts pour le marquage %s (RSS 2.0)" #: actions/tag.php:98 -#, fuzzy, php-format +#, php-format msgid "Notice feed for tag %s (Atom)" -msgstr "Flux des statuts de %s" +msgstr "Flux des statuts pour le marquage %s (Atom)" #: actions/tagrss.php:35 msgid "No such tag." @@ -3159,21 +3204,22 @@ msgstr "Désabonné" #, php-format msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’." msgstr "" +"La licence du flux auquel vous avez souscrit ‘%s’ n’est pas compatible avec " +"la licence du site ‘%s’." #: actions/userauthorization.php:105 msgid "Authorize subscription" -msgstr "Autoriser l'abonnement" +msgstr "Autoriser l’abonnement" #: actions/userauthorization.php:110 -#, fuzzy msgid "" "Please check these details to make sure that you want to subscribe to this " "user’s notices. If you didn’t just ask to subscribe to someone’s notices, " "click “Rejectâ€." msgstr "" "Veuillez vérifier ces détails pour vous assurer que vous souhaitez vous " -"abonner aux statuts de cet utilisateur. Si vous n'avez pas demandé à vous " -"abonner aux statuts de quelqu'un, cliquez \"Annuler\"." +"abonner aux statuts de cet utilisateur. Si vous n’avez pas demandé à vous " +"abonner aux statuts de quelqu’un, cliquez « Rejeter »." #: actions/userauthorization.php:188 msgid "License" @@ -3186,7 +3232,7 @@ msgstr "Accepter" #: actions/userauthorization.php:210 lib/subscribeform.php:115 #: lib/subscribeform.php:139 msgid "Subscribe to this user" -msgstr "S'abonner à cet utilisateur" +msgstr "S’abonner à cet utilisateur" #: actions/userauthorization.php:211 msgid "Reject" @@ -3194,11 +3240,11 @@ msgstr "Refuser" #: actions/userauthorization.php:212 msgid "Reject this subscription" -msgstr "Rejeter cet souscription" +msgstr "Rejeter cette souscription" #: actions/userauthorization.php:225 msgid "No authorization request!" -msgstr "Pas de requête d'autorisation !" +msgstr "Pas de requête d’autorisation !" #: actions/userauthorization.php:247 msgid "Subscription authorized" @@ -3211,59 +3257,58 @@ msgid "" "with the site’s instructions for details on how to authorize the " "subscription. Your subscription token is:" msgstr "" -"L'abonnement a été autorisé, mais l'URL de rappel n'a pas été validé. " +"L’abonnement a été autorisé, mais l’URL de rappel n’a pas été validé. " "Vérifiez les instructions du site pour savoir comment compléter " -"l'autorisation de l'abonnement. Votre jeton d'abonnement est :" +"l’autorisation de l’abonnement. Votre jeton d’abonnement est :" #: actions/userauthorization.php:259 msgid "Subscription rejected" msgstr "Abonnement refusé" #: actions/userauthorization.php:261 -#, fuzzy msgid "" "The subscription has been rejected, but no callback URL was passed. Check " "with the site’s instructions for details on how to fully reject the " "subscription." msgstr "" -"L'abonnement a été refusé, mais l'URL de rappel n'a pas été validé. Vérifiez " -"les instructions du site pour savoir comment refuser pleinement " -"l'abonnement. " +"L’abonnement a été refusé, mais aucune URL de rappel n’a pas été passée. " +"Vérifiez les instructions du site pour savoir comment refuser pleinement " +"l’abonnement." #: actions/userauthorization.php:296 #, php-format msgid "Listener URI ‘%s’ not found here" -msgstr "" +msgstr "L’URI de l’auditeur ‘%s’ n’a pas été trouvée" #: actions/userauthorization.php:301 #, php-format msgid "Listenee URI ‘%s’ is too long." -msgstr "" +msgstr "L’URI à laquelle vous avez souscrit ‘%s’ est trop longue." #: actions/userauthorization.php:307 #, php-format msgid "Listenee URI ‘%s’ is a local user." -msgstr "" +msgstr "L’URI à laquelle vous avez souscrit ‘%s’ est un utilisateur local." #: actions/userauthorization.php:322 #, php-format msgid "Profile URL ‘%s’ is for a local user." -msgstr "" +msgstr "L’URL du profil ‘%s’ est pour un utilisateur local." #: actions/userauthorization.php:338 #, php-format msgid "Avatar URL ‘%s’ is not valid." -msgstr "" +msgstr "L’URL de l’avatar ‘%s’ n’est pas valide." #: actions/userauthorization.php:343 -#, fuzzy, php-format +#, php-format msgid "Can’t read avatar URL ‘%s’." -msgstr "Impossible de lire l'URL '%s'" +msgstr "Impossible de lire l’URL de l’avatar « %s »." #: actions/userauthorization.php:348 -#, fuzzy, php-format +#, php-format msgid "Wrong image type for avatar URL ‘%s’." -msgstr "Format d'image invalide pour '%s'" +msgstr "Format d’image invalide pour l’URL de l’avatar « %s »." #: actions/userbyid.php:70 msgid "No id." @@ -3271,17 +3316,19 @@ msgstr "Aucun identifiant." #: actions/userdesignsettings.php:76 lib/designsettings.php:65 msgid "Profile design" -msgstr "Conception de profile" +msgstr "Conception de profil" #: actions/userdesignsettings.php:87 lib/designsettings.php:76 msgid "" "Customize the way your profile looks with a background image and a colour " "palette of your choice." msgstr "" +"Personnalisez l’apparence de votre profil avec une image d’arrière plan et " +"une palette de couleurs de votre choix." #: actions/userdesignsettings.php:282 msgid "Enjoy your hotdog!" -msgstr "" +msgstr "Bon appétit !" #: actions/usergroups.php:64 #, php-format @@ -3289,19 +3336,20 @@ msgid "%s groups, page %d" msgstr "Groupes de %s - page %d" #: actions/usergroups.php:130 -#, fuzzy msgid "Search for more groups" -msgstr "Rechercher des personnes ou du texte" +msgstr "Rechercher pour plus de groupes" #: actions/usergroups.php:153 #, php-format msgid "%s is not a member of any group." -msgstr "%s n'est pas membre d'aucun groupe." +msgstr "%s n’est pas membre d’un groupe." #: actions/usergroups.php:158 #, php-format msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" +"Essayez de [rechercher un groupe](%%action.groupsearch%%) et de vous y " +"inscrire." #: classes/File.php:137 #, php-format @@ -3309,20 +3357,22 @@ msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" +"Un fichier ne peut pas être plus gros que %d octets et le fichier que vous " +"avez envoyé pesait %d octets. Essayez d’importer une version moins grosse." #: classes/File.php:147 #, php-format msgid "A file this large would exceed your user quota of %d bytes." -msgstr "" +msgstr "Un fichier aussi gros dépasserai votre quota utilisateur de %d octets." #: classes/File.php:154 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." -msgstr "" +msgstr "Un fichier aussi gros dépasserai votre quota mensuel de %d octets." #: classes/Message.php:55 msgid "Could not insert message." -msgstr "Impossible d'insérer le message." +msgstr "Impossible d’insérer le message." #: classes/Message.php:65 msgid "Could not update message with new URI." @@ -3334,13 +3384,12 @@ msgid "DB error inserting hashtag: %s" msgstr "Erreur de base de donnée en insérant le hashtag : %s" #: classes/Notice.php:179 -#, fuzzy msgid "Problem saving notice. Too long." -msgstr "Problème lors de l'enregistrement du statut." +msgstr "Problème lors de l’enregistrement de l’avis ; trop long." #: classes/Notice.php:183 msgid "Problem saving notice. Unknown user." -msgstr "Erreur lors de l'enregistrement du statut. Utilisateur inconnu." +msgstr "Erreur lors de l’enregistrement du statut. Utilisateur inconnu." #: classes/Notice.php:188 msgid "" @@ -3364,51 +3413,51 @@ msgstr "Il vous est interdit de publier des statuts dans ce site." #: classes/Notice.php:268 classes/Notice.php:293 msgid "Problem saving notice." -msgstr "Problème lors de l'enregistrement du statut." +msgstr "Problème lors de l’enregistrement du statut." #: classes/Notice.php:1120 #, php-format msgid "DB error inserting reply: %s" msgstr "Erreur de base de donnée en insérant la réponse :%s" -#: classes/User.php:333 -#, fuzzy, php-format +#: classes/User.php:347 +#, php-format msgid "Welcome to %1$s, @%2$s!" -msgstr "Message adressé à %1$s le %2$s" +msgstr "Bienvenu à %1$s, %2$s !" -#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Profil" -#: lib/accountsettingsaction.php:110 +#: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "Modifier vos paramètres de profil" -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:112 msgid "Upload an avatar" msgstr "Ajouter un avatar" -#: lib/accountsettingsaction.php:119 +#: lib/accountsettingsaction.php:116 msgid "Change your password" msgstr "Modifier votre mot de passe" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:120 msgid "Change email handling" msgstr "Modifier le traitement des courriels" -#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 +#: lib/accountsettingsaction.php:124 lib/groupnav.php:119 msgid "Design" msgstr "Conception" -#: lib/accountsettingsaction.php:126 +#: lib/accountsettingsaction.php:124 msgid "Design your profile" -msgstr "Concevez votre profile" +msgstr "Concevez votre profil" #: lib/accountsettingsaction.php:128 msgid "Other" msgstr "Autres " -#: lib/accountsettingsaction.php:129 +#: lib/accountsettingsaction.php:128 msgid "Other options" msgstr "Autres options " @@ -3438,18 +3487,16 @@ msgid "Account" msgstr "Compte" #: lib/action.php:432 -#, fuzzy msgid "Change your email, avatar, password, profile" -msgstr "Modifier votre courriel, avatar, mot de passe, profil " +msgstr "Modifier votre courriel, avatar, mot de passe, profil" #: lib/action.php:435 msgid "Connect" msgstr "Connecter" #: lib/action.php:435 -#, fuzzy msgid "Connect to services" -msgstr "Impossible de rediriger vers le serveur : %s" +msgstr "Se connecter aux services" #: lib/action.php:439 lib/subgroupnav.php:105 msgid "Invite" @@ -3482,7 +3529,7 @@ msgstr "Aide" #: lib/action.php:456 msgid "Help me!" -msgstr "À l'aide !" +msgstr "À l’aide !" #: lib/action.php:459 msgid "Search" @@ -3501,9 +3548,8 @@ msgid "Local views" msgstr "Vues locales" #: lib/action.php:612 -#, fuzzy msgid "Page notice" -msgstr "Notice de la page" +msgstr "Avis de la page" #: lib/action.php:714 msgid "Secondary site navigation" @@ -3519,7 +3565,7 @@ msgstr "FAQ" #: lib/action.php:727 msgid "TOS" -msgstr "" +msgstr "CGU" #: lib/action.php:730 msgid "Privacy" @@ -3536,7 +3582,7 @@ msgstr "Contact" #: lib/action.php:736 #, fuzzy msgid "Badge" -msgstr "Clin d'Å“il" +msgstr "Clin d’œil" #: lib/action.php:764 msgid "StatusNet software license" @@ -3568,31 +3614,30 @@ msgstr "" "(http://www.fsf.org/licensing/licenses/agpl-3.0.html)." #: lib/action.php:785 -#, fuzzy msgid "Site content license" -msgstr "Licence du logiciel StatusNet" +msgstr "Licence du contenu du site" #: lib/action.php:794 msgid "All " -msgstr "Tous" +msgstr "Tous " #: lib/action.php:799 msgid "license." msgstr "licence." -#: lib/action.php:1053 +#: lib/action.php:1052 msgid "Pagination" msgstr "Pagination" -#: lib/action.php:1062 +#: lib/action.php:1061 msgid "After" msgstr "Après" -#: lib/action.php:1070 +#: lib/action.php:1069 msgid "Before" msgstr "Avant" -#: lib/action.php:1119 +#: lib/action.php:1117 msgid "There was a problem with your session token." msgstr "Un problème est survenu avec votre jeton de session." @@ -3610,11 +3655,11 @@ msgstr "Fournisseur" #: lib/attachmentnoticesection.php:67 msgid "Notices where this attachment appears" -msgstr "" +msgstr "Statuts sur lesquels cette pièce jointe apparait." #: lib/attachmenttagcloudsection.php:48 msgid "Tags for this attachment" -msgstr "" +msgstr "Marques de cette pièce jointe" #: lib/channel.php:138 lib/channel.php:158 msgid "Command results" @@ -3630,22 +3675,22 @@ msgstr "Échec de la commande" #: lib/command.php:44 msgid "Sorry, this command is not yet implemented." -msgstr "Désolé, cette commande n'a pas encore été implémantée." +msgstr "Désolé, cette commande n’a pas encore été implémentée." #: lib/command.php:88 #, fuzzy, php-format msgid "Could not find a user with nickname %s" msgstr "" -"Impossible de mettre l'utilisateur à jour avec l'adresse courriel confirmée." +"Impossible de mettre l’utilisateur à jour avec l’adresse courriel confirmée." #: lib/command.php:92 msgid "It does not make a lot of sense to nudge yourself!" -msgstr "" +msgstr "Ça n’a pas de sens de se faire un clin d’œil à soi-même !" #: lib/command.php:99 #, fuzzy, php-format msgid "Nudge sent to %s" -msgstr "Clin d'Å“il envoyé" +msgstr "Clin d’œil envoyé" #: lib/command.php:126 #, php-format @@ -3660,7 +3705,7 @@ msgstr "" #: lib/command.php:152 lib/command.php:400 msgid "Notice with that id does not exist" -msgstr "" +msgstr "Aucun statut avec cet identifiant n’existe" #: lib/command.php:168 lib/command.php:416 lib/command.php:471 msgid "User has no last notice" @@ -3696,36 +3741,35 @@ msgid "About: %s" msgstr "À propos : %s" #: lib/command.php:358 scripts/xmppdaemon.php:321 -#, fuzzy, php-format +#, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" -"Message trop long ! La taille maximale est de 140 caractères ; vous en avez " +"Message trop long ! La taille maximale est de %d caractères ; vous en avez " "entré %d." #: lib/command.php:377 msgid "Error sending direct message." -msgstr "Une erreur est survenue pendant l'envoi de votre message." +msgstr "Une erreur est survenue pendant l’envoi de votre message." #: lib/command.php:431 -#, fuzzy, php-format +#, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -"Message trop long ! La taille maximale est de 140 caractères ; vous en avez " +"Avis trop long ! La taille maximale est de %d caractères ; vous en avez " "entré %d." #: lib/command.php:439 -#, fuzzy, php-format +#, php-format msgid "Reply to %s sent" -msgstr "Répondre à ce statut" +msgstr "Réponse à %s envoyée" #: lib/command.php:441 -#, fuzzy msgid "Error saving notice." -msgstr "Problème lors de l'enregistrement du statut." +msgstr "Problème lors de l’enregistrement de l’avis." #: lib/command.php:495 msgid "Specify the name of the user to subscribe to" -msgstr "Indiquez le nom de l'utilisateur auquel vous souhaitez vous abonner " +msgstr "Indiquez le nom de l’utilisateur auquel vous souhaitez vous abonner" #: lib/command.php:502 #, php-format @@ -3734,7 +3778,7 @@ msgstr "Abonné à %s" #: lib/command.php:523 msgid "Specify the name of the user to unsubscribe from" -msgstr "Indiquez le nom de l'utilisateur duquel vous souhaitez vous désabonner" +msgstr "Indiquez le nom de l’utilisateur duquel vous souhaitez vous désabonner" #: lib/command.php:530 #, php-format @@ -3743,7 +3787,7 @@ msgstr "Désabonné de %s" #: lib/command.php:548 lib/command.php:571 msgid "Command not yet implemented." -msgstr "Cette commande n'a pas encore été implémantée." +msgstr "Cette commande n’a pas encore été implémentée." #: lib/command.php:551 msgid "Notification off." @@ -3759,25 +3803,61 @@ msgstr "Avertissements activés." #: lib/command.php:576 msgid "Can't turn on notification." -msgstr "Impossible d'activer les avertissements." +msgstr "Impossible d’activer les avertissements." #: lib/command.php:597 -#, fuzzy, php-format +#, php-format msgid "Could not create login token for %s" -msgstr "Impossible de créer le formulaire OpenID : %s" +msgstr "Impossible de créer le jeton de connexion pour %s" #: lib/command.php:602 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" +"Ce lien n’est utilisable qu’une seule fois, et est valable uniquement " +"pendant 2 minutes : %s" + +#: lib/command.php:618 +#, fuzzy +msgid "You are not subscribed to anyone." +msgstr "Vous n'êtes pas abonné(e) à ce profil." + +#: lib/command.php:620 +#, fuzzy +msgid "You are subscribed to these people: " +msgstr "Vous n'êtes pas abonné(e) à ce profil." + +#: lib/command.php:637 +#, fuzzy +msgid "No one is subscribed to you." +msgstr "Impossible d’abonner une autre personne à votre profil." + +#: lib/command.php:639 +#, fuzzy +msgid "These people are subscribed to you: " +msgstr "Abonnés de %s" + +#: lib/command.php:656 +#, fuzzy +msgid "You are not a member of any groups." +msgstr "Vous n'êtes pas membre de ce groupe." + +#: lib/command.php:658 +#, fuzzy +msgid "You are a member of these groups: " +msgstr "Vous n'êtes pas membre de ce groupe." -#: lib/command.php:613 +#: lib/command.php:670 +#, fuzzy msgid "" "Commands:\n" "on - turn on notifications\n" "off - turn off notifications\n" "help - show this help\n" "follow <nickname> - subscribe to user\n" +"groups - lists the groups you have joined\n" +"subscriptions - list the people you follow\n" +"subscribers - list the people that follow you\n" "leave <nickname> - unsubscribe from user\n" "d <nickname> <text> - direct message to user\n" "get <nickname> - get last notice from user\n" @@ -3806,24 +3886,55 @@ msgid "" "tracks - not yet implemented.\n" "tracking - not yet implemented.\n" msgstr "" +"Commandes :\n" +"on - activer les notifications\n" +"off - désactiver les notifications\n" +"help - montrer l’aide\n" +"follow <nickname> - s’abonner à l’utilisateur\n" +"leave <nickname> - se désabonner de l’utilisateur\n" +"d <nickname> <text> - message direct à l’utilisateur\n" +"get <nickname> - obtenir le dernier avis de l’utilisateur\n" +"whois <nickname> - obtenir le profil de cet utilisateur\n" +"fav <nickname> - ajouter de dernier avis de l’utilisateur comme favori\n" +"fav #<notice_id> - ajouter l’avis correspondant à l’id comme favori\n" +"reply #<notice_id> - répondre à l’avis correspondant à l’id\n" +"reply <nickname> - répondre au dernier avis de l’utilisateur\n" +"join <group> - s’inscrire au groupe\n" +"login - Obtenir un lien pour s’identifier sur l’interface web\n" +"drop <group> - quitter le groupe\n" +"stats - obtenir vos statistiques\n" +"stop - même effet que 'off'\n" +"quit - même effet que 'off'\n" +"sub <nickname> - même effet que 'follow'\n" +"unsub <nickname> - même effet que 'leave'\n" +"last <nickname> - même effet que 'get'\n" +"on <nickname> - pas encore implémenté.\n" +"off <nickname> - pas encore implémenté.\n" +"nudge <nickname> - rappeler à un utilisateur de publier.\n" +"invite <phone number> - pas encore implémenté.\n" +"track <word> - pas encore implémenté.\n" +"untrack <word> - pas encore implémenté.\n" +"track off - pas encore implémenté.\n" +"untrack all - pas encore implémenté.\n" +"tracks - pas encore implémenté.\n" +"tracking - pas encore implémenté.\n" -#: lib/common.php:191 -#, fuzzy +#: lib/common.php:192 msgid "No configuration file found. " -msgstr "Aucun code de confirmation." +msgstr "Aucun fichier de configuration n'a été trouvé. " -#: lib/common.php:192 +#: lib/common.php:193 msgid "I looked for configuration files in the following places: " msgstr "" +"J’ai cherché des fichiers de configuration dans les emplacements suivants : " -#: lib/common.php:193 +#: lib/common.php:194 msgid "You may wish to run the installer to fix this." -msgstr "" +msgstr "Vous pouvez essayer de lancer l’installeur pour régler ce problème." -#: lib/common.php:194 -#, fuzzy +#: lib/common.php:195 msgid "Go to the installer." -msgstr "Ouvrir une session" +msgstr "Aller au programme d’installation" #: lib/connectsettingsaction.php:110 msgid "IM" @@ -3843,33 +3954,34 @@ msgstr "Erreur de la base de données" #: lib/designsettings.php:101 msgid "Change background image" -msgstr "" +msgstr "Changer l’image d’arrière plan" #: lib/designsettings.php:105 -#, fuzzy msgid "Upload file" -msgstr "Transfert" +msgstr "Importer un fichier" #: lib/designsettings.php:109 msgid "" "You can upload your personal background image. The maximum file size is 2Mb." msgstr "" +"Vous pouvez importer une image d’arrière plan personnelle. La taille " +"maximale du fichier est de 2 Mo." #: lib/designsettings.php:139 msgid "On" -msgstr "" +msgstr "Activé" #: lib/designsettings.php:155 msgid "Off" -msgstr "" +msgstr "Désactivé" #: lib/designsettings.php:156 msgid "Turn background image on or off." -msgstr "" +msgstr "Activer ou désactiver l’image d’arrière plan." #: lib/designsettings.php:161 msgid "Tile background image" -msgstr "" +msgstr "Répéter l’image d’arrière plan" #: lib/designsettings.php:170 msgid "Change colours" @@ -3877,7 +3989,7 @@ msgstr "Modifier les couleurs" #: lib/designsettings.php:178 msgid "Background" -msgstr "" +msgstr "Arrière plan" #: lib/designsettings.php:191 msgid "Content" @@ -3897,19 +4009,19 @@ msgstr "Liens" #: lib/designsettings.php:247 msgid "Use defaults" -msgstr "" +msgstr "Utiliser les valeurs par défaut" #: lib/designsettings.php:248 msgid "Restore default designs" -msgstr "" +msgstr "Restaurer les conceptions par défaut" #: lib/designsettings.php:254 msgid "Reset back to default" -msgstr "" +msgstr "Revenir aux valeurs par défaut" #: lib/designsettings.php:257 msgid "Save design" -msgstr "" +msgstr "Sauvegarder la conception" #: lib/designsettings.php:372 msgid "Bad default color settings: " @@ -3917,7 +4029,7 @@ msgstr "" #: lib/designsettings.php:468 msgid "Design defaults restored." -msgstr "" +msgstr "Les paramètre par défaut de la conception ont été restaurés." #: lib/disfavorform.php:114 lib/disfavorform.php:140 msgid "Disfavor this notice" @@ -3949,7 +4061,7 @@ msgstr "Atom" #: lib/feed.php:91 msgid "FOAF" -msgstr "" +msgstr "Ami d’un ami" #: lib/galleryaction.php:121 msgid "Filter tags" @@ -3960,9 +4072,8 @@ msgid "All" msgstr "Tous" #: lib/galleryaction.php:139 -#, fuzzy msgid "Select tag to filter" -msgstr "Sélectionnez un fournisseur de téléphone mobile" +msgstr "Sélectionner une marque à filtrer" #: lib/galleryaction.php:140 msgid "Tag" @@ -3981,14 +4092,13 @@ msgid "URL of the homepage or blog of the group or topic" msgstr "URL du site Web ou blogue du groupe ou sujet " #: lib/groupeditform.php:168 -#, fuzzy msgid "Describe the group or topic" -msgstr "Description du groupe ou du sujet (140 caractères maximum)" +msgstr "Description du groupe ou du sujet" #: lib/groupeditform.php:170 -#, fuzzy, php-format +#, php-format msgid "Describe the group or topic in %d characters" -msgstr "Description du groupe ou du sujet (140 caractères maximum)" +msgstr "Description du groupe ou du sujet en %d caractères" #: lib/groupeditform.php:172 msgid "Description" @@ -3997,12 +4107,16 @@ msgstr "Description" #: lib/groupeditform.php:179 msgid "" "Location for the group, if any, like \"City, State (or Region), Country\"" -msgstr "Emplacement du groupe, s'il y a lieu \"Ville, État ou région, Pays\"" +msgstr "" +"Emplacement du groupe, s’il y a lieu, de la forme « Ville, État ou région, " +"Pays »" #: lib/groupeditform.php:187 #, php-format msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" +"Pseudos supplémentaires pour le groupe, séparés par des virgules ou des " +"espaces, %d au maximum" #: lib/groupnav.php:85 lib/searchgroupnav.php:84 msgid "Group" @@ -4052,7 +4166,7 @@ msgstr "Marquages des statuts du groupe %s" #: lib/htmloutputter.php:104 msgid "This page is not available in a media type you accept" msgstr "" -"Cette page n'est pas disponible dans un des formats que vous avez autorisés." +"Cette page n’est pas disponible dans un des formats que vous avez autorisés." #: lib/imagefile.php:75 #, fuzzy, php-format @@ -4069,11 +4183,11 @@ msgstr "Erreur système lors du transfert du fichier." #: lib/imagefile.php:96 msgid "Not an image or corrupt file." -msgstr "Ceci n'est pas une image, ou c'est un fichier corrompu." +msgstr "Ceci n’est pas une image, ou c’est un fichier corrompu." #: lib/imagefile.php:105 msgid "Unsupported image file format." -msgstr "Format de fichier d'image non supporté." +msgstr "Format de fichier d’image non supporté." #: lib/imagefile.php:118 msgid "Lost our file." @@ -4085,8 +4199,8 @@ msgstr "Type de fichier inconnu" #: lib/jabber.php:192 #, php-format -msgid "notice id: %s" -msgstr "Nouveau statut" +msgid "[%s]" +msgstr "[%s]" #: lib/joinform.php:114 msgid "Join" @@ -4106,13 +4220,16 @@ msgstr "Créer un nouveau compte" #: lib/mailbox.php:89 msgid "Only the user can read their own mailboxes." -msgstr "L'accès à cette boîte de réception est réservé à son utilisateur." +msgstr "L’accès à cette boîte de réception est réservé à son utilisateur." #: lib/mailbox.php:139 msgid "" "You have no private messages. You can send private message to engage other " "users in conversation. People can send you messages for your eyes only." msgstr "" +"Vous n’avez pas de messages privés. Vous pouvez envoyer des messages privés " +"pour démarrer des conversations avec d’autres utilisateurs. Ceux-ci peuvent " +"vous envoyer des messages destinés à vous seul(e)." #: lib/mailbox.php:227 lib/noticelist.php:424 msgid "from" @@ -4120,7 +4237,7 @@ msgstr "de" #: lib/mail.php:172 msgid "Email address confirmation" -msgstr "Confirmation de l'adresse courriel" +msgstr "Confirmation de l’adresse courriel" #: lib/mail.php:174 #, php-format @@ -4158,7 +4275,7 @@ msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s suit maintenant vos statuts dans %2$s." #: lib/mail.php:240 -#, fuzzy, php-format +#, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" "\n" @@ -4171,12 +4288,16 @@ msgid "" "----\n" "Change your email address or notification options at %8$s\n" msgstr "" -"%1$s suit maintenant vos statuts dans %2$s.\n" +"%1$s suit maintenant vos statuts sur %2$s.\n" "\n" -"\t%3$s\n" +"%3$s\n" "\n" +"%4$s%5$s%6$s\n" "Cordialement,\n" -"%4$s.\n" +"%7$s.\n" +"\n" +"----\n" +"Changez votre adresse de courriel ou vos options de notification sur %8$s\n" #: lib/mail.php:253 #, php-format @@ -4219,7 +4340,7 @@ msgstr "" "\n" "Écrivez à %2$s pour mettre à jour votre statut.\n" "\n" -"Plus d'info : %3$s.\n" +"Plus d’info : %3$s.\n" "\n" "Amicalement vôtre,\n" "%4$s" @@ -4236,7 +4357,7 @@ msgstr "Confirmation SMS" #: lib/mail.php:462 #, php-format msgid "You've been nudged by %s" -msgstr "Vous avez reçu un clin d'Å“il de %s" +msgstr "Vous avez reçu un clin d’œil de %s" #: lib/mail.php:466 #, php-format @@ -4253,6 +4374,17 @@ msgid "" "With kind regards,\n" "%4$s\n" msgstr "" +"%1$s (%2$s) se demande ce que vous devenez ces temps-ci et vous invite à " +"publier des nouvelles.\n" +"\n" +"Donc on vous écoute :)\n" +"\n" +"%3$s\n" +"\n" +"Ne répondez pas à ce courriel ; il ne sera pas envoyé.\n" +"\n" +"Bien à vous,\n" +"%4$s\n" #: lib/mail.php:509 #, php-format @@ -4277,11 +4409,25 @@ msgid "" "With kind regards,\n" "%5$s\n" msgstr "" +"%1$s (%2$s) vous a envoyé un message privé:\n" +"\n" +"------------------------------------------------------\n" +"%3$s\n" +"------------------------------------------------------\n" +"\n" +"Vous pouvez répondre à ce message ici:\n" +"\n" +"%4$s\n" +"\n" +"Ne répondez pas à ce courriel ; il ne sera pas envoyé.\n" +"\n" +"Bien à vous,\n" +"%5$s\n" #: lib/mail.php:554 -#, fuzzy, php-format +#, php-format msgid "%s (@%s) added your notice as a favorite" -msgstr "%s a ajouté un de vos messages à ses favoris" +msgstr "%s (@%s) a ajouté un de vos statut à ses favoris" #: lib/mail.php:556 #, fuzzy, php-format @@ -4320,7 +4466,7 @@ msgstr "" #: lib/mail.php:611 #, php-format msgid "%s (@%s) sent a notice to your attention" -msgstr "" +msgstr "%s (@%s) vous a envoyé un avis" #: lib/mail.php:613 #, php-format @@ -4336,58 +4482,72 @@ msgid "" "\t%4$s\n" "\n" msgstr "" +"%1$s (@%9$s) vient de vous envoyer un avis (une réponse « @ ») sur %2$s.\n" +"\n" +"L’avis est là :\n" +"\n" +"\t%3$s\n" +"\n" +"Il dit :\n" +"\n" +"\t%4$s\n" +"\n" #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "" +"Une erreur de base de données s’est produite pendant la sauvegarde de votre " +"fichier. Veuillez réessayer." #: lib/mediafile.php:142 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini." -msgstr "" +msgstr "Le fichier importé dépasse le réglage upload_max_filesize de php.ini." #: lib/mediafile.php:147 msgid "" "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in " "the HTML form." msgstr "" +"Le fichier importé dépasse le réglage MAX_FILE_SIZE qui a été précisé dans " +"le formulaire HTML." #: lib/mediafile.php:152 msgid "The uploaded file was only partially uploaded." -msgstr "" +msgstr "Le fichier n’a été que partiellement importé." #: lib/mediafile.php:159 msgid "Missing a temporary folder." -msgstr "" +msgstr "Un dossier temporaire est manquant." #: lib/mediafile.php:162 msgid "Failed to write file to disk." -msgstr "" +msgstr "Impossible d'écrire sur le disque." #: lib/mediafile.php:165 msgid "File upload stopped by extension." -msgstr "" +msgstr "Import de fichier stoppé par une extension." #: lib/mediafile.php:179 lib/mediafile.php:216 msgid "File exceeds user's quota!" -msgstr "" +msgstr "Le fichier dépasse le quota de l’utilisateur." #: lib/mediafile.php:196 lib/mediafile.php:233 msgid "File could not be moved to destination directory." -msgstr "" +msgstr "Le fichier n’a pas pu être déplacé dans le dossier de destination." #: lib/mediafile.php:201 lib/mediafile.php:237 msgid "Could not determine file's mime-type!" -msgstr "Impossible de récupérer le flux public." +msgstr "Impossible de déterminer le mime-type du fichier !" #: lib/mediafile.php:270 #, php-format msgid " Try using another %s format." -msgstr "" +msgstr " Essayez d’utiliser un autre %s format." #: lib/mediafile.php:275 #, php-format msgid "%s is not a supported filetype on this server." -msgstr "" +msgstr "%s n’est pas un type de fichier supporté sur ce serveur." #: lib/messageform.php:120 msgid "Send a direct notice" @@ -4395,7 +4555,7 @@ msgstr "Envoyer un message direct" #: lib/messageform.php:146 msgid "To" -msgstr "À " +msgstr "À" #: lib/messageform.php:162 lib/noticeform.php:173 msgid "Available characters" @@ -4412,11 +4572,11 @@ msgstr "Quoi de neuf, %s ?" #: lib/noticeform.php:180 msgid "Attach" -msgstr "" +msgstr "Attacher" #: lib/noticeform.php:184 msgid "Attach a file" -msgstr "" +msgstr "Attacher un fichier" #: lib/noticelist.php:478 msgid "in context" @@ -4432,36 +4592,35 @@ msgstr "Répondre" #: lib/nudgeform.php:116 msgid "Nudge this user" -msgstr "Envoyer un clin d'Å“il à cet utilisateur" +msgstr "Envoyer un clin d’œil à cet utilisateur" #: lib/nudgeform.php:128 msgid "Nudge" -msgstr "Clin d'Å“il" +msgstr "Clin d’œil" #: lib/nudgeform.php:128 msgid "Send a nudge to this user" -msgstr "Envoyer un clin d'Å“il à cet utilisateur" +msgstr "Envoyer un clin d’œil à cet utilisateur" #: lib/oauthstore.php:283 msgid "Error inserting new profile" -msgstr "Erreur lors de l'insertion du nouveau profil" +msgstr "Erreur lors de l’insertion du nouveau profil" #: lib/oauthstore.php:291 msgid "Error inserting avatar" -msgstr "Erreur lors de l'insertion de l'avatar" +msgstr "Erreur lors de l’insertion de l’avatar" #: lib/oauthstore.php:311 msgid "Error inserting remote profile" -msgstr "Erreur lors de l'insertion du profil distant" +msgstr "Erreur lors de l’insertion du profil distant" #: lib/oauthstore.php:345 -#, fuzzy msgid "Duplicate notice" -msgstr "Supprimer ce statut" +msgstr "Dupliquer l’avis" #: lib/oauthstore.php:487 msgid "Couldn't insert new subscription." -msgstr "Impossible d'insérer un nouvel abonnement." +msgstr "Impossible d’insérer un nouvel abonnement." #: lib/personalgroupnav.php:99 msgid "Personal" @@ -4489,7 +4648,7 @@ msgstr "Vos messages reçus" #: lib/personalgroupnav.php:129 msgid "Outbox" -msgstr "Boîte d'envoi" +msgstr "Boîte d’envoi" #: lib/personalgroupnav.php:130 msgid "Your sent messages" @@ -4518,7 +4677,7 @@ msgstr "Tous les abonnés" #: lib/profileaction.php:177 msgid "User ID" -msgstr "ID de l'utilisateur" +msgstr "ID de l’utilisateur" #: lib/profileaction.php:182 msgid "Member since" @@ -4534,7 +4693,7 @@ msgstr "Public" #: lib/publicgroupnav.php:82 msgid "User groups" -msgstr "Groupes d'utilisateurs" +msgstr "Groupes d’utilisateurs" #: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85 msgid "Recent tags" @@ -4615,7 +4774,7 @@ msgstr "(aucun)" #: lib/subs.php:48 msgid "Already subscribed!" -msgstr "" +msgstr "Déjà souscrit !" #: lib/subs.php:52 msgid "User has blocked you." @@ -4623,19 +4782,19 @@ msgstr "Cet utilisateur vous a bloqué." #: lib/subs.php:56 msgid "Could not subscribe." -msgstr "Impossible de s'abonner." +msgstr "Impossible de s’abonner." #: lib/subs.php:75 msgid "Could not subscribe other to you." -msgstr "Impossible d'abonner une autre personne à votre profil." +msgstr "Impossible d’abonner une autre personne à votre profil." #: lib/subs.php:124 -msgid "Not subscribed!." +msgid "Not subscribed!" msgstr "Pas abonné !" #: lib/subs.php:136 msgid "Couldn't delete subscription." -msgstr "Impossible de cesser l'abonnement" +msgstr "Impossible de cesser l’abonnement" #: lib/tagcloudsection.php:56 msgid "None" @@ -4655,11 +4814,11 @@ msgstr "Désabonnement" #: lib/userprofile.php:116 msgid "Edit Avatar" -msgstr "Modifier l'avatar" +msgstr "Modifier l’avatar" #: lib/userprofile.php:236 msgid "User actions" -msgstr "Actions de l'utilisateur" +msgstr "Actions de l’utilisateur" #: lib/userprofile.php:248 msgid "Edit profile settings" @@ -4675,61 +4834,62 @@ msgstr "Envoyer un message à cet utilisateur" #: lib/userprofile.php:273 msgid "Message" -msgstr "Message " +msgstr "Message" -#: lib/util.php:818 +#: lib/util.php:821 msgid "a few seconds ago" -msgstr "il y a quelques secondes " +msgstr "il y a quelques secondes" -#: lib/util.php:820 +#: lib/util.php:823 msgid "about a minute ago" msgstr "il y a 1 minute" -#: lib/util.php:822 +#: lib/util.php:825 #, php-format msgid "about %d minutes ago" msgstr "il y a %d minutes" -#: lib/util.php:824 +#: lib/util.php:827 msgid "about an hour ago" msgstr "il y a 1 heure" -#: lib/util.php:826 +#: lib/util.php:829 #, php-format msgid "about %d hours ago" msgstr "il y a %d heures" -#: lib/util.php:828 +#: lib/util.php:831 msgid "about a day ago" msgstr "il y a 1 jour" -#: lib/util.php:830 +#: lib/util.php:833 #, php-format msgid "about %d days ago" msgstr "il y a %d jours" -#: lib/util.php:832 +#: lib/util.php:835 msgid "about a month ago" msgstr "il y a 1 mois" -#: lib/util.php:834 +#: lib/util.php:837 #, php-format msgid "about %d months ago" msgstr "il y a %d mois" -#: lib/util.php:836 +#: lib/util.php:839 msgid "about a year ago" msgstr "il y a environ 1 an" #: lib/webcolor.php:82 #, php-format msgid "%s is not a valid color!" -msgstr "&s n'est pas une couleur valide !" +msgstr "&s n’est pas une couleur valide !" #: lib/webcolor.php:123 #, php-format msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" +"%s n’est pas une couleur valide ! Utilisez 3 ou 6 caractères hexadécimaux." #: scripts/maildaemon.php:48 msgid "Could not parse message." @@ -4737,12 +4897,12 @@ msgstr "Impossible de déchiffrer ce message." #: scripts/maildaemon.php:53 msgid "Not a registered user." -msgstr "Ceci n'est pas un utilisateur inscrit." +msgstr "Ceci n’est pas un utilisateur inscrit." #: scripts/maildaemon.php:57 msgid "Sorry, that is not your incoming email address." -msgstr "Désolé, ceci n'est pas votre adresse de courriel entrant." +msgstr "Désolé, ceci n’est pas votre adresse de courriel entrant." #: scripts/maildaemon.php:61 msgid "Sorry, no incoming email allowed." -msgstr "Désolé, la réception de courriels n'est pas permise. " +msgstr "Désolé, la réception de courriels n’est pas permise." diff --git a/locale/ga/LC_MESSAGES/statusnet.mo b/locale/ga/LC_MESSAGES/statusnet.mo Binary files differindex bf827fd68..78a0e7ba0 100644 --- a/locale/ga/LC_MESSAGES/statusnet.mo +++ b/locale/ga/LC_MESSAGES/statusnet.mo diff --git a/locale/ga/LC_MESSAGES/statusnet.po b/locale/ga/LC_MESSAGES/statusnet.po index 294ef6f94..bce6ff40a 100644 --- a/locale/ga/LC_MESSAGES/statusnet.po +++ b/locale/ga/LC_MESSAGES/statusnet.po @@ -5,12 +5,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-10 20:53+0000\n" -"PO-Revision-Date: 2009-11-10 20:59:05+0000\n" +"POT-Creation-Date: 2009-11-16 19:42+0000\n" +"PO-Revision-Date: 2009-11-16 19:43:30+0000\n" "Language-Team: Irish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ga\n" "X-Message-Group: out-statusnet\n" @@ -22,12 +22,15 @@ msgid "No such page" msgstr "Non existe a etiqueta." #: actions/all.php:74 actions/allrss.php:68 -#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofilebackgroundimage.php:116 +#: actions/apiaccountupdateprofileimage.php:105 +#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 #: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 #: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 @@ -106,35 +109,42 @@ msgstr "%s e amigos" msgid "Updates from %1$s and friends on %2$s!" msgstr "Actualizacións dende %1$s e amigos en %2$s!" -#: actions/apiaccountratelimitstatus.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 -#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:129 actions/apigroupcreate.php:184 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120 -#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101 -#: actions/apigroupshow.php:105 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144 -#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141 -#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130 -#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163 -#: actions/apiusershow.php:101 -msgid "API method not found!" +#: actions/apiaccountratelimitstatus.php:70 +#: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofilebackgroundimage.php:94 +#: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apiaccountupdateprofile.php:97 +#, fuzzy +msgid "API method not found." msgstr "Método da API non atopado" -#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 +#: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofilebackgroundimage.php:86 +#: actions/apiaccountupdateprofilecolors.php:110 +#: actions/apiaccountupdateprofileimage.php:84 +#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109 +#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "Este método require un POST." +#: actions/apiaccountupdatedeliverydevice.php:105 +msgid "" +"You must specify a parameter named 'device' with a value of one of: sms, im, " +"none" +msgstr "" + +#: actions/apiaccountupdatedeliverydevice.php:132 +#, fuzzy +msgid "Could not update user." +msgstr "Non se puido actualizar o usuario." + +#: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 #: actions/newnotice.php:94 lib/designsettings.php:283 #, php-format msgid "" @@ -142,12 +152,34 @@ msgid "" "current configuration." msgstr "" -#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/apiaccountupdateprofilebackgroundimage.php:136 +#: actions/apiaccountupdateprofilebackgroundimage.php:146 +#: actions/apiaccountupdateprofilecolors.php:164 +#: actions/apiaccountupdateprofilecolors.php:174 +#, fuzzy +msgid "Unable to save your design settings." +msgstr "Non se puideron gardar os teus axustes de Twitter!" + +#: actions/apiaccountupdateprofilebackgroundimage.php:187 +#: actions/apiaccountupdateprofilecolors.php:142 +#, fuzzy +msgid "Could not update your design." +msgstr "Non se puido actualizar o usuario." + +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 +#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 #: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 msgid "User has no profile." msgstr "O usuario non ten perfil." +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "Non se puido gardar o perfil." + #: actions/apiblockcreate.php:108 msgid "Block user failed." msgstr "Bloqueo de usuario fallido." @@ -195,6 +227,23 @@ msgstr "Mensaxes directas para %s" msgid "All the direct messages sent to %s" msgstr "Tódalas mensaxes directas enviadas a %s" +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 +#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 +#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 +#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149 +#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +msgid "API method not found!" +msgstr "Método da API non atopado" + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -391,18 +440,18 @@ msgstr "Avatar actualizado." msgid "No status with that ID found." msgstr "Non existe ningún estado con esa ID atopada." -#: actions/apistatusesupdate.php:152 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 #: scripts/maildaemon.php:71 #, 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:193 +#: actions/apistatusesupdate.php:198 msgid "Not found" msgstr "Non atopado" -#: actions/apistatusesupdate.php:216 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:227 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -486,7 +535,7 @@ msgid "Invalid size." msgstr "Tamaño inválido." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:113 +#: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "Avatar" @@ -536,7 +585,7 @@ msgstr "" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:151 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -1692,7 +1741,7 @@ msgid "Nickname" msgstr "Alcume" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Contrasinal" @@ -1831,7 +1880,7 @@ msgstr "" #: actions/noticesearch.php:124 #, php-format msgid "" -"Why not [register an account](%%%%action.register%%%%) and be the first to " +"Why not [register an account](%%%%action.register%%%%) and be the first to " "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" msgstr "" @@ -1878,8 +1927,8 @@ msgstr "Conectar" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963 -#: lib/api.php:991 lib/api.php:1101 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 +#: lib/api.php:1027 lib/api.php:1137 msgid "Not a supported data format." msgstr "Non é un formato de datos soportado." @@ -1899,11 +1948,15 @@ msgstr "Outros axustes" msgid "Manage various other options." msgstr "Xestionár axustes varios." -#: actions/othersettings.php:117 +#: actions/othersettings.php:108 +msgid " (free service)" +msgstr "" + +#: actions/othersettings.php:116 msgid "Shorten URLs with" msgstr "" -#: actions/othersettings.php:118 +#: actions/othersettings.php:117 msgid "Automatic shortening service to use." msgstr "Servizo de acortado automático a usar." @@ -1939,67 +1992,62 @@ msgstr "" msgid "Change password" msgstr "Cambiar contrasinal" -#: actions/passwordsettings.php:70 -#, fuzzy -msgid "You are not allowed to change your password" -msgstr "Cambiar contrasinal" - -#: actions/passwordsettings.php:82 +#: actions/passwordsettings.php:69 #, fuzzy msgid "Change your password." msgstr "Cambiar contrasinal" -#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:96 actions/recoverpassword.php:231 #, fuzzy msgid "Password change" msgstr "Contrasinal gardada." -#: actions/passwordsettings.php:117 +#: actions/passwordsettings.php:104 msgid "Old password" msgstr "Contrasinal antiga" -#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:108 actions/recoverpassword.php:235 msgid "New password" msgstr "Nova contrasinal" -#: actions/passwordsettings.php:122 +#: actions/passwordsettings.php:109 msgid "6 or more characters" msgstr "6 ou máis caracteres" -#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:112 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Confirmar" -#: actions/passwordsettings.php:126 +#: actions/passwordsettings.php:113 msgid "same as password above" msgstr "igual á contrasinal de enriba" -#: actions/passwordsettings.php:130 +#: actions/passwordsettings.php:117 msgid "Change" msgstr "Modificado" -#: actions/passwordsettings.php:167 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "A contrasinal debe ter 6 caracteres ou máis." -#: actions/passwordsettings.php:170 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:233 msgid "Passwords don't match." msgstr "As contrasinais non coinciden" -#: actions/passwordsettings.php:178 +#: actions/passwordsettings.php:165 msgid "Incorrect old password" msgstr "Contrasinal actual incorrecta" -#: actions/passwordsettings.php:194 +#: actions/passwordsettings.php:181 msgid "Error saving user; invalid." msgstr "Acounteceu un erro gardando o usuario: é inválido." -#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Non se pode gardar a contrasinal." -#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:192 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Contrasinal gardada." @@ -2456,7 +2504,7 @@ msgid "Same as password above. Required." msgstr "A mesma contrasinal que arriba. Requerido." #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:122 +#: lib/accountsettingsaction.php:120 msgid "Email" msgstr "Correo Electrónico" @@ -3407,37 +3455,37 @@ msgstr "Aconteceu un erro ó gardar o chÃo." msgid "DB error inserting reply: %s" msgstr "Erro ó inserir a contestación na BD: %s" -#: classes/User.php:333 +#: classes/User.php:347 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Mensaxe de %1$s en %2$s" -#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Perfil" -#: lib/accountsettingsaction.php:110 +#: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "Configuración de perfil" -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:112 #, fuzzy msgid "Upload an avatar" msgstr "Acounteceu un fallo ó actualizar o avatar." -#: lib/accountsettingsaction.php:119 +#: lib/accountsettingsaction.php:116 msgid "Change your password" msgstr "Cambiar contrasinal" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:120 msgid "Change email handling" msgstr "Cambiar a xestión de email" -#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 +#: lib/accountsettingsaction.php:124 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:126 +#: lib/accountsettingsaction.php:124 #, fuzzy msgid "Design your profile" msgstr "O usuario non ten perfil." @@ -3446,7 +3494,7 @@ msgstr "O usuario non ten perfil." msgid "Other" msgstr "Outros" -#: lib/accountsettingsaction.php:129 +#: lib/accountsettingsaction.php:128 msgid "Other options" msgstr "Outras opcions" @@ -3625,21 +3673,21 @@ msgstr "Todos" msgid "license." msgstr "" -#: lib/action.php:1053 +#: lib/action.php:1052 msgid "Pagination" msgstr "" -#: lib/action.php:1062 +#: lib/action.php:1061 #, fuzzy msgid "After" msgstr "« Despois" -#: lib/action.php:1070 +#: lib/action.php:1069 #, fuzzy msgid "Before" msgstr "Antes »" -#: lib/action.php:1119 +#: lib/action.php:1117 #, fuzzy msgid "There was a problem with your session token." msgstr "Houbo un problema co teu token de sesión. Tentao de novo, anda..." @@ -3815,7 +3863,37 @@ msgstr "Non se pode crear o formulario OpenID: %s" msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:613 +#: lib/command.php:618 +#, fuzzy +msgid "You are not subscribed to anyone." +msgstr "Non estás suscrito a ese perfil" + +#: lib/command.php:620 +#, fuzzy +msgid "You are subscribed to these people: " +msgstr "Non estás suscrito a ese perfil" + +#: lib/command.php:637 +#, fuzzy +msgid "No one is subscribed to you." +msgstr "Outro usuario non se puido suscribir a ti." + +#: lib/command.php:639 +#, fuzzy +msgid "These people are subscribed to you: " +msgstr "Suscrito a %s" + +#: lib/command.php:656 +#, fuzzy +msgid "You are not a member of any groups." +msgstr "Non estás suscrito a ese perfil" + +#: lib/command.php:658 +#, fuzzy +msgid "You are a member of these groups: " +msgstr "Non estás suscrito a ese perfil" + +#: lib/command.php:670 #, fuzzy msgid "" "Commands:\n" @@ -3823,6 +3901,9 @@ msgid "" "off - turn off notifications\n" "help - show this help\n" "follow <nickname> - subscribe to user\n" +"groups - lists the groups you have joined\n" +"subscriptions - list the people you follow\n" +"subscribers - list the people that follow you\n" "leave <nickname> - unsubscribe from user\n" "d <nickname> <text> - direct message to user\n" "get <nickname> - get last notice from user\n" @@ -3878,20 +3959,20 @@ msgstr "" "tracks - non implementado por agora.\n" "tracking - non implementado por agora.\n" -#: lib/common.php:191 +#: lib/common.php:192 #, fuzzy msgid "No configuration file found. " msgstr "Sen código de confirmación." -#: lib/common.php:192 +#: lib/common.php:193 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:193 +#: lib/common.php:194 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:194 +#: lib/common.php:195 msgid "Go to the installer." msgstr "" @@ -4167,8 +4248,8 @@ msgstr "tipo de ficheiro non soportado" #: lib/jabber.php:192 #, php-format -msgid "notice id: %s" -msgstr "Novo chÃo" +msgid "[%s]" +msgstr "" #: lib/joinform.php:114 #, fuzzy @@ -4336,6 +4417,16 @@ msgid "" "With kind regards,\n" "%4$s\n" msgstr "" +"%1$s (%2$s) preguntase que é de ti, e invÃtate a publicar algun chÃo.\n" +"\n" +"So let's hear from you :)\n" +"\n" +"%3$s\n" +"\n" +"Don't reply to this email; it won't get to them.\n" +"\n" +"With kind regards,\n" +"%4$s\n" #: lib/mail.php:509 #, php-format @@ -4360,6 +4451,20 @@ msgid "" "With kind regards,\n" "%5$s\n" msgstr "" +"%1$s (%2$s) enviouche unha mensaxe privada:\n" +"\n" +"------------------------------------------------------\n" +"%3$s\n" +"------------------------------------------------------\n" +"\n" +"You can reply to their message here:\n" +"\n" +"%4$s\n" +"\n" +"Don't reply to this email; it won't get to them.\n" +"\n" +"With kind regards,\n" +"%5$s\n" #: lib/mail.php:554 #, fuzzy, php-format @@ -4729,7 +4834,8 @@ msgid "Could not subscribe other to you." msgstr "Outro usuario non se puido suscribir a ti." #: lib/subs.php:124 -msgid "Not subscribed!." +#, fuzzy +msgid "Not subscribed!" msgstr "Non está suscrito!" #: lib/subs.php:136 @@ -4783,47 +4889,47 @@ msgstr "Non podes enviar mensaxes a este usurio." msgid "Message" msgstr "Nova mensaxe" -#: lib/util.php:818 +#: lib/util.php:821 msgid "a few seconds ago" msgstr "fai uns segundos" -#: lib/util.php:820 +#: lib/util.php:823 msgid "about a minute ago" msgstr "fai un minuto" -#: lib/util.php:822 +#: lib/util.php:825 #, php-format msgid "about %d minutes ago" msgstr "fai %d minutos" -#: lib/util.php:824 +#: lib/util.php:827 msgid "about an hour ago" msgstr "fai unha hora" -#: lib/util.php:826 +#: lib/util.php:829 #, php-format msgid "about %d hours ago" msgstr "fai %d horas" -#: lib/util.php:828 +#: lib/util.php:831 msgid "about a day ago" msgstr "fai un dÃa" -#: lib/util.php:830 +#: lib/util.php:833 #, php-format msgid "about %d days ago" msgstr "fai %d dÃas" -#: lib/util.php:832 +#: lib/util.php:835 msgid "about a month ago" msgstr "fai un mes" -#: lib/util.php:834 +#: lib/util.php:837 #, php-format msgid "about %d months ago" msgstr "fai %d meses" -#: lib/util.php:836 +#: lib/util.php:839 msgid "about a year ago" msgstr "fai un ano" diff --git a/locale/he/LC_MESSAGES/statusnet.mo b/locale/he/LC_MESSAGES/statusnet.mo Binary files differindex faaf5f29b..57b3fb49f 100644 --- a/locale/he/LC_MESSAGES/statusnet.mo +++ b/locale/he/LC_MESSAGES/statusnet.mo diff --git a/locale/he/LC_MESSAGES/statusnet.po b/locale/he/LC_MESSAGES/statusnet.po index 902e4a5c0..3de5c0072 100644 --- a/locale/he/LC_MESSAGES/statusnet.po +++ b/locale/he/LC_MESSAGES/statusnet.po @@ -5,12 +5,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-10 20:53+0000\n" -"PO-Revision-Date: 2009-11-10 20:59:08+0000\n" +"POT-Creation-Date: 2009-11-16 19:42+0000\n" +"PO-Revision-Date: 2009-11-16 19:43:33+0000\n" "Language-Team: Hebrew\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: he\n" "X-Message-Group: out-statusnet\n" @@ -22,12 +22,15 @@ msgid "No such page" msgstr "×ין הודעה כזו." #: actions/all.php:74 actions/allrss.php:68 -#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofilebackgroundimage.php:116 +#: actions/apiaccountupdateprofileimage.php:105 +#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 #: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 #: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 @@ -106,35 +109,42 @@ msgstr "%s וחברי×" msgid "Updates from %1$s and friends on %2$s!" msgstr "" -#: actions/apiaccountratelimitstatus.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 -#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:129 actions/apigroupcreate.php:184 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120 -#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101 -#: actions/apigroupshow.php:105 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144 -#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141 -#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130 -#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163 -#: actions/apiusershow.php:101 -msgid "API method not found!" -msgstr "" +#: actions/apiaccountratelimitstatus.php:70 +#: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofilebackgroundimage.php:94 +#: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apiaccountupdateprofile.php:97 +#, fuzzy +msgid "API method not found." +msgstr "קוד ×”×ישור ×œ× × ×ž×¦×." -#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 +#: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofilebackgroundimage.php:86 +#: actions/apiaccountupdateprofilecolors.php:110 +#: actions/apiaccountupdateprofileimage.php:84 +#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109 +#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "" +#: actions/apiaccountupdatedeliverydevice.php:105 +msgid "" +"You must specify a parameter named 'device' with a value of one of: sms, im, " +"none" +msgstr "" + +#: actions/apiaccountupdatedeliverydevice.php:132 +#, fuzzy +msgid "Could not update user." +msgstr "עידכון המשתמש × ×›×©×œ." + +#: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 #: actions/newnotice.php:94 lib/designsettings.php:283 #, php-format msgid "" @@ -142,12 +152,33 @@ msgid "" "current configuration." msgstr "" -#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/apiaccountupdateprofilebackgroundimage.php:136 +#: actions/apiaccountupdateprofilebackgroundimage.php:146 +#: actions/apiaccountupdateprofilecolors.php:164 +#: actions/apiaccountupdateprofilecolors.php:174 +msgid "Unable to save your design settings." +msgstr "" + +#: actions/apiaccountupdateprofilebackgroundimage.php:187 +#: actions/apiaccountupdateprofilecolors.php:142 +#, fuzzy +msgid "Could not update your design." +msgstr "עידכון המשתמש × ×›×©×œ." + +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 +#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 #: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 msgid "User has no profile." msgstr "למשתמש ×ין פרופיל." +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "שמירת הפרופיל × ×›×©×œ×”." + #: actions/apiblockcreate.php:108 msgid "Block user failed." msgstr "" @@ -193,6 +224,23 @@ msgstr "" msgid "All the direct messages sent to %s" msgstr "" +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 +#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 +#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 +#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149 +#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +msgid "API method not found!" +msgstr "" + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -387,17 +435,17 @@ msgstr "×”×ª×ž×•× ×” ×¢×•×“×›× ×”." msgid "No status with that ID found." msgstr "" -#: actions/apistatusesupdate.php:152 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 #: scripts/maildaemon.php:71 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "×–×” ×רוך מידי. ×ורך מירבי להודעה ×”×•× 140 ×ותיות." -#: actions/apistatusesupdate.php:193 +#: actions/apistatusesupdate.php:198 msgid "Not found" msgstr "×œ× × ×ž×¦×" -#: actions/apistatusesupdate.php:216 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:227 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -482,7 +530,7 @@ msgid "Invalid size." msgstr "גודל ×œ× ×—×•×§×™." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:113 +#: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "×ª×ž×•× ×”" @@ -532,7 +580,7 @@ msgstr "" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:151 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -1640,7 +1688,7 @@ msgid "Nickname" msgstr "×›×™× ×•×™" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:116 msgid "Password" msgstr "סיסמה" @@ -1775,7 +1823,7 @@ msgstr "" #: actions/noticesearch.php:124 #, php-format msgid "" -"Why not [register an account](%%%%action.register%%%%) and be the first to " +"Why not [register an account](%%%%action.register%%%%) and be the first to " "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" msgstr "" @@ -1820,8 +1868,8 @@ msgstr "התחבר" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963 -#: lib/api.php:991 lib/api.php:1101 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 +#: lib/api.php:1027 lib/api.php:1137 msgid "Not a supported data format." msgstr "" @@ -1842,11 +1890,15 @@ msgstr "הגדרות" msgid "Manage various other options." msgstr "" -#: actions/othersettings.php:117 +#: actions/othersettings.php:108 +msgid " (free service)" +msgstr "" + +#: actions/othersettings.php:116 msgid "Shorten URLs with" msgstr "" -#: actions/othersettings.php:118 +#: actions/othersettings.php:117 msgid "Automatic shortening service to use." msgstr "" @@ -1882,66 +1934,62 @@ msgstr "" msgid "Change password" msgstr "×©× ×” סיסמה" -#: actions/passwordsettings.php:70 -msgid "You are not allowed to change your password" -msgstr "" - -#: actions/passwordsettings.php:82 +#: actions/passwordsettings.php:69 #, fuzzy msgid "Change your password." msgstr "×©× ×” סיסמה" -#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:96 actions/recoverpassword.php:231 #, fuzzy msgid "Password change" msgstr "הסיסמה × ×©×ž×¨×”." -#: actions/passwordsettings.php:117 +#: actions/passwordsettings.php:104 msgid "Old password" msgstr "סיסמה ×™×©× ×”" -#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:108 actions/recoverpassword.php:235 msgid "New password" msgstr "סיסמה חדשה" -#: actions/passwordsettings.php:122 +#: actions/passwordsettings.php:109 msgid "6 or more characters" msgstr "לפחות 6 ×ותיות" -#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:112 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "×שר" -#: actions/passwordsettings.php:126 +#: actions/passwordsettings.php:113 msgid "same as password above" msgstr "×–×”×” לסיסמה למעלה" -#: actions/passwordsettings.php:130 +#: actions/passwordsettings.php:117 msgid "Change" msgstr "×©× ×”" -#: actions/passwordsettings.php:167 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "" -#: actions/passwordsettings.php:170 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:233 msgid "Passwords don't match." msgstr "הסיסמ×ות ×œ× ×ª×•×מות." -#: actions/passwordsettings.php:178 +#: actions/passwordsettings.php:165 msgid "Incorrect old password" msgstr "הסיסמה ×”×™×©× ×” ×œ× × ×›×•× ×”" -#: actions/passwordsettings.php:194 +#: actions/passwordsettings.php:181 msgid "Error saving user; invalid." msgstr "שגי××” בשמירת ×©× ×”×ž×©×ª×ž×©, ×œ× ×¢×•×ž×“ בכללי×." -#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "×œ× × ×™×ª×Ÿ לשמור ×ת הסיסמה" -#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:192 actions/recoverpassword.php:211 msgid "Password saved." msgstr "הסיסמה × ×©×ž×¨×”." @@ -2376,7 +2424,7 @@ msgid "Same as password above. Required." msgstr "" #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:122 +#: lib/accountsettingsaction.php:120 msgid "Email" msgstr "" @@ -3279,37 +3327,37 @@ msgstr "בעיה בשמירת ההודעה." msgid "DB error inserting reply: %s" msgstr "שגי×ת מסד × ×ª×•× ×™× ×‘×”×›× ×¡×ª התגובה: %s" -#: classes/User.php:333 +#: classes/User.php:347 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" -#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 msgid "Profile" msgstr "פרופיל" -#: lib/accountsettingsaction.php:110 +#: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "" -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:112 #, fuzzy msgid "Upload an avatar" msgstr "עדכון ×”×ª×ž×•× ×” × ×›×©×œ." -#: lib/accountsettingsaction.php:119 +#: lib/accountsettingsaction.php:116 msgid "Change your password" msgstr "" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:120 msgid "Change email handling" msgstr "" -#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 +#: lib/accountsettingsaction.php:124 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:126 +#: lib/accountsettingsaction.php:124 #, fuzzy msgid "Design your profile" msgstr "למשתמש ×ין פרופיל." @@ -3318,7 +3366,7 @@ msgstr "למשתמש ×ין פרופיל." msgid "Other" msgstr "" -#: lib/accountsettingsaction.php:129 +#: lib/accountsettingsaction.php:128 msgid "Other options" msgstr "" @@ -3493,21 +3541,21 @@ msgstr "" msgid "license." msgstr "" -#: lib/action.php:1053 +#: lib/action.php:1052 msgid "Pagination" msgstr "" -#: lib/action.php:1062 +#: lib/action.php:1061 #, fuzzy msgid "After" msgstr "<< ×חרי" -#: lib/action.php:1070 +#: lib/action.php:1069 #, fuzzy msgid "Before" msgstr "×œ×¤× ×™ >>" -#: lib/action.php:1119 +#: lib/action.php:1117 msgid "There was a problem with your session token." msgstr "" @@ -3679,13 +3727,46 @@ msgstr "× ×›×©×œ×” יצירת OpenID מתוך: %s" msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:613 +#: lib/command.php:618 +#, fuzzy +msgid "You are not subscribed to anyone." +msgstr "×œ× ×©×œ×—× ×• ××œ×™× ×• ×ת הפרופיל ×”×–×”" + +#: lib/command.php:620 +#, fuzzy +msgid "You are subscribed to these people: " +msgstr "×œ× ×©×œ×—× ×• ××œ×™× ×• ×ת הפרופיל ×”×–×”" + +#: lib/command.php:637 +#, fuzzy +msgid "No one is subscribed to you." +msgstr "הרשמה מרוחקת" + +#: lib/command.php:639 +#, fuzzy +msgid "These people are subscribed to you: " +msgstr "הרשמה מרוחקת" + +#: lib/command.php:656 +#, fuzzy +msgid "You are not a member of any groups." +msgstr "×œ× ×©×œ×—× ×• ××œ×™× ×• ×ת הפרופיל ×”×–×”" + +#: lib/command.php:658 +#, fuzzy +msgid "You are a member of these groups: " +msgstr "×œ× ×©×œ×—× ×• ××œ×™× ×• ×ת הפרופיל ×”×–×”" + +#: lib/command.php:670 msgid "" "Commands:\n" "on - turn on notifications\n" "off - turn off notifications\n" "help - show this help\n" "follow <nickname> - subscribe to user\n" +"groups - lists the groups you have joined\n" +"subscriptions - list the people you follow\n" +"subscribers - list the people that follow you\n" "leave <nickname> - unsubscribe from user\n" "d <nickname> <text> - direct message to user\n" "get <nickname> - get last notice from user\n" @@ -3715,20 +3796,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:191 +#: lib/common.php:192 #, fuzzy msgid "No configuration file found. " msgstr "×ין קוד ×ישור." -#: lib/common.php:192 +#: lib/common.php:193 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:193 +#: lib/common.php:194 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:194 +#: lib/common.php:195 msgid "Go to the installer." msgstr "" @@ -4001,8 +4082,8 @@ msgstr "" #: lib/jabber.php:192 #, php-format -msgid "notice id: %s" -msgstr "הודעה חדשה" +msgid "[%s]" +msgstr "" #: lib/joinform.php:114 #, fuzzy @@ -4524,7 +4605,8 @@ msgid "Could not subscribe other to you." msgstr "" #: lib/subs.php:124 -msgid "Not subscribed!." +#, fuzzy +msgid "Not subscribed!" msgstr "×œ× ×ž× ×•×™!" #: lib/subs.php:136 @@ -4575,47 +4657,47 @@ msgstr "" msgid "Message" msgstr "הודעה חדשה" -#: lib/util.php:818 +#: lib/util.php:821 msgid "a few seconds ago" msgstr "×œ×¤× ×™ מספר ×©× ×™×•×ª" -#: lib/util.php:820 +#: lib/util.php:823 msgid "about a minute ago" msgstr "×œ×¤× ×™ כדקה" -#: lib/util.php:822 +#: lib/util.php:825 #, php-format msgid "about %d minutes ago" msgstr "×œ×¤× ×™ ×›-%d דקות" -#: lib/util.php:824 +#: lib/util.php:827 msgid "about an hour ago" msgstr "×œ×¤× ×™ כשעה" -#: lib/util.php:826 +#: lib/util.php:829 #, php-format msgid "about %d hours ago" msgstr "×œ×¤× ×™ ×›-%d שעות" -#: lib/util.php:828 +#: lib/util.php:831 msgid "about a day ago" msgstr "×œ×¤× ×™ כיו×" -#: lib/util.php:830 +#: lib/util.php:833 #, php-format msgid "about %d days ago" msgstr "×œ×¤× ×™ ×›-%d ימי×" -#: lib/util.php:832 +#: lib/util.php:835 msgid "about a month ago" msgstr "×œ×¤× ×™ כחודש" -#: lib/util.php:834 +#: lib/util.php:837 #, php-format msgid "about %d months ago" msgstr "×œ×¤× ×™ ×›-%d חודשי×" -#: lib/util.php:836 +#: lib/util.php:839 msgid "about a year ago" msgstr "×œ×¤× ×™ ×›×©× ×”" diff --git a/locale/is/LC_MESSAGES/statusnet.mo b/locale/is/LC_MESSAGES/statusnet.mo Binary files differindex eaf63735e..0d3848efd 100644 --- a/locale/is/LC_MESSAGES/statusnet.mo +++ b/locale/is/LC_MESSAGES/statusnet.mo diff --git a/locale/is/LC_MESSAGES/statusnet.po b/locale/is/LC_MESSAGES/statusnet.po index c0bef7ddf..e871d86a5 100644 --- a/locale/is/LC_MESSAGES/statusnet.po +++ b/locale/is/LC_MESSAGES/statusnet.po @@ -5,12 +5,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-10 20:53+0000\n" -"PO-Revision-Date: 2009-11-10 20:59:10+0000\n" +"POT-Creation-Date: 2009-11-16 19:42+0000\n" +"PO-Revision-Date: 2009-11-16 19:43:36+0000\n" "Language-Team: Icelandic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: is\n" "X-Message-Group: out-statusnet\n" @@ -22,12 +22,15 @@ msgid "No such page" msgstr "Ekkert þannig merki." #: actions/all.php:74 actions/allrss.php:68 -#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofilebackgroundimage.php:116 +#: actions/apiaccountupdateprofileimage.php:105 +#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 #: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 #: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 @@ -105,35 +108,42 @@ msgstr "" msgid "Updates from %1$s and friends on %2$s!" msgstr "Færslur frá %1$s og vinum á %2$s!" -#: actions/apiaccountratelimitstatus.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 -#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:129 actions/apigroupcreate.php:184 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120 -#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101 -#: actions/apigroupshow.php:105 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144 -#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141 -#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130 -#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163 -#: actions/apiusershow.php:101 -msgid "API method not found!" +#: actions/apiaccountratelimitstatus.php:70 +#: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofilebackgroundimage.php:94 +#: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apiaccountupdateprofile.php:97 +#, fuzzy +msgid "API method not found." msgstr "Aðferð à forritsskilum fannst ekki!" -#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 +#: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofilebackgroundimage.php:86 +#: actions/apiaccountupdateprofilecolors.php:110 +#: actions/apiaccountupdateprofileimage.php:84 +#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109 +#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "Þessi aðferð krefst POST." +#: actions/apiaccountupdatedeliverydevice.php:105 +msgid "" +"You must specify a parameter named 'device' with a value of one of: sms, im, " +"none" +msgstr "" + +#: actions/apiaccountupdatedeliverydevice.php:132 +#, fuzzy +msgid "Could not update user." +msgstr "Gat ekki uppfært notanda." + +#: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 #: actions/newnotice.php:94 lib/designsettings.php:283 #, php-format msgid "" @@ -141,12 +151,33 @@ msgid "" "current configuration." msgstr "" -#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/apiaccountupdateprofilebackgroundimage.php:136 +#: actions/apiaccountupdateprofilebackgroundimage.php:146 +#: actions/apiaccountupdateprofilecolors.php:164 +#: actions/apiaccountupdateprofilecolors.php:174 +msgid "Unable to save your design settings." +msgstr "" + +#: actions/apiaccountupdateprofilebackgroundimage.php:187 +#: actions/apiaccountupdateprofilecolors.php:142 +#, fuzzy +msgid "Could not update your design." +msgstr "Gat ekki uppfært hóp." + +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 +#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 #: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 msgid "User has no profile." msgstr "Notandi hefur enga persónulega sÃðu." +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "Gat ekki vistað persónulega sÃðu." + #: actions/apiblockcreate.php:108 msgid "Block user failed." msgstr "Mistókst að loka á notanda." @@ -192,6 +223,23 @@ msgstr "Bein skilaboð til %s" msgid "All the direct messages sent to %s" msgstr "Öll bein skilaboð til %s" +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 +#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 +#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 +#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149 +#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +msgid "API method not found!" +msgstr "Aðferð à forritsskilum fannst ekki!" + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -381,17 +429,17 @@ msgstr "" msgid "No status with that ID found." msgstr "Engin staða með þessu kenni fannst." -#: actions/apistatusesupdate.php:152 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 #: scripts/maildaemon.php:71 #, 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:193 +#: actions/apistatusesupdate.php:198 msgid "Not found" msgstr "Fannst ekki" -#: actions/apistatusesupdate.php:216 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:227 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -474,7 +522,7 @@ msgid "Invalid size." msgstr "Ótæk stærð." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:113 +#: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "Mynd" @@ -522,7 +570,7 @@ msgstr "Skera af" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:151 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -1638,7 +1686,7 @@ msgid "Nickname" msgstr "Stuttnefni" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Lykilorð" @@ -1778,7 +1826,7 @@ msgstr "" #: actions/noticesearch.php:124 #, php-format msgid "" -"Why not [register an account](%%%%action.register%%%%) and be the first to " +"Why not [register an account](%%%%action.register%%%%) and be the first to " "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" msgstr "" @@ -1824,8 +1872,8 @@ msgstr "" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963 -#: lib/api.php:991 lib/api.php:1101 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 +#: lib/api.php:1027 lib/api.php:1137 msgid "Not a supported data format." msgstr "Enginn stuðningur við gagnasnið." @@ -1845,11 +1893,15 @@ msgstr "Aðrar stillingar" msgid "Manage various other options." msgstr "Sjá um ýmsar aðrar stillingar." -#: actions/othersettings.php:117 +#: actions/othersettings.php:108 +msgid " (free service)" +msgstr "" + +#: actions/othersettings.php:116 msgid "Shorten URLs with" msgstr "" -#: actions/othersettings.php:118 +#: actions/othersettings.php:117 msgid "Automatic shortening service to use." msgstr "Þjónusta sem sér um sjálfkrafa styttingu." @@ -1885,65 +1937,60 @@ msgstr "" msgid "Change password" msgstr "Breyta lykilorði" -#: actions/passwordsettings.php:70 -#, fuzzy -msgid "You are not allowed to change your password" -msgstr "Breyta lykilorðinu þÃnu" - -#: actions/passwordsettings.php:82 +#: actions/passwordsettings.php:69 msgid "Change your password." msgstr "Breyta lykilorðinu þÃnu." -#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:96 actions/recoverpassword.php:231 msgid "Password change" msgstr "Lykilorðabreyting" -#: actions/passwordsettings.php:117 +#: actions/passwordsettings.php:104 msgid "Old password" msgstr "Eldra lykilorð" -#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:108 actions/recoverpassword.php:235 msgid "New password" msgstr "Nýtt lykilorð" -#: actions/passwordsettings.php:122 +#: actions/passwordsettings.php:109 msgid "6 or more characters" msgstr "6 eða fleiri tákn" -#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:112 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Staðfesta" -#: actions/passwordsettings.php:126 +#: actions/passwordsettings.php:113 msgid "same as password above" msgstr "sama og lykilorðið hér fyrir ofan" -#: actions/passwordsettings.php:130 +#: actions/passwordsettings.php:117 msgid "Change" msgstr "Breyta" -#: actions/passwordsettings.php:167 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "Lykilorð verður að vera að minnsta kosti 6 tákn." -#: actions/passwordsettings.php:170 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:233 msgid "Passwords don't match." msgstr "Lykilorðin passa ekki saman." -#: actions/passwordsettings.php:178 +#: actions/passwordsettings.php:165 msgid "Incorrect old password" msgstr "Rangt eldra lykilorð" -#: actions/passwordsettings.php:194 +#: actions/passwordsettings.php:181 msgid "Error saving user; invalid." msgstr "Villa kom upp à vistun notanda: ótækt." -#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Get ekki vistað nýja lykilorðið." -#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:192 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Lykilorð vistað." @@ -2384,7 +2431,7 @@ msgid "Same as password above. Required." msgstr "Sama og lykilorðið hér fyrir ofan. Nauðsynlegt." #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:122 +#: lib/accountsettingsaction.php:120 msgid "Email" msgstr "Tölvupóstur" @@ -3299,36 +3346,36 @@ msgstr "Vandamál komu upp við að vista babl." msgid "DB error inserting reply: %s" msgstr "Gagnagrunnsvilla við innsetningu svars: %s" -#: classes/User.php:333 +#: classes/User.php:347 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" -#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Persónuleg sÃða" -#: lib/accountsettingsaction.php:110 +#: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "Breyta persónulegu stillingunum þÃnum" -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:112 msgid "Upload an avatar" msgstr "Hlaða upp einkennismynd" -#: lib/accountsettingsaction.php:119 +#: lib/accountsettingsaction.php:116 msgid "Change your password" msgstr "Breyta lykilorðinu þÃnu" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:120 msgid "Change email handling" msgstr "Breyta tölvupóstumsjón" -#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 +#: lib/accountsettingsaction.php:124 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:126 +#: lib/accountsettingsaction.php:124 msgid "Design your profile" msgstr "" @@ -3336,7 +3383,7 @@ msgstr "" msgid "Other" msgstr "Annað" -#: lib/accountsettingsaction.php:129 +#: lib/accountsettingsaction.php:128 msgid "Other options" msgstr "Aðrir valkostir" @@ -3507,19 +3554,19 @@ msgstr "Allt " msgid "license." msgstr "leyfi." -#: lib/action.php:1053 +#: lib/action.php:1052 msgid "Pagination" msgstr "Uppröðun" -#: lib/action.php:1062 +#: lib/action.php:1061 msgid "After" msgstr "Eftir" -#: lib/action.php:1070 +#: lib/action.php:1069 msgid "Before" msgstr "Ãður" -#: lib/action.php:1119 +#: lib/action.php:1117 msgid "There was a problem with your session token." msgstr "Það komu upp vandamál varðandi setutókann þinn." @@ -3690,13 +3737,46 @@ msgstr "Gat ekki búið til OpenID eyðublað: %s" msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:613 +#: lib/command.php:618 +#, fuzzy +msgid "You are not subscribed to anyone." +msgstr "Þú ert ekki áskrifandi." + +#: lib/command.php:620 +#, fuzzy +msgid "You are subscribed to these people: " +msgstr "Þú ert ekki áskrifandi." + +#: lib/command.php:637 +#, fuzzy +msgid "No one is subscribed to you." +msgstr "Gat ekki leyft öðrum að gerast áskrifandi að þér." + +#: lib/command.php:639 +#, fuzzy +msgid "These people are subscribed to you: " +msgstr "Fólk sem eru áskrifendur að %s" + +#: lib/command.php:656 +#, fuzzy +msgid "You are not a member of any groups." +msgstr "Þú ert ekki meðlimur à þessum hópi." + +#: lib/command.php:658 +#, fuzzy +msgid "You are a member of these groups: " +msgstr "Þú ert ekki meðlimur à þessum hópi." + +#: lib/command.php:670 msgid "" "Commands:\n" "on - turn on notifications\n" "off - turn off notifications\n" "help - show this help\n" "follow <nickname> - subscribe to user\n" +"groups - lists the groups you have joined\n" +"subscriptions - list the people you follow\n" +"subscribers - list the people that follow you\n" "leave <nickname> - unsubscribe from user\n" "d <nickname> <text> - direct message to user\n" "get <nickname> - get last notice from user\n" @@ -3726,20 +3806,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:191 +#: lib/common.php:192 #, fuzzy msgid "No configuration file found. " msgstr "Enginn staðfestingarlykill." -#: lib/common.php:192 +#: lib/common.php:193 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:193 +#: lib/common.php:194 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:194 +#: lib/common.php:195 #, fuzzy msgid "Go to the installer." msgstr "Skrá þig inn á sÃðuna" @@ -4002,9 +4082,9 @@ msgid "Unknown file type" msgstr "Óþekkt skráargerð" #: lib/jabber.php:192 -#, fuzzy, php-format -msgid "notice id: %s" -msgstr "Bablveita fyrir %s" +#, php-format +msgid "[%s]" +msgstr "" #: lib/joinform.php:114 msgid "Join" @@ -4517,7 +4597,8 @@ msgid "Could not subscribe other to you." msgstr "Gat ekki leyft öðrum að gerast áskrifandi að þér." #: lib/subs.php:124 -msgid "Not subscribed!." +#, fuzzy +msgid "Not subscribed!" msgstr "Ekki à áskrift!" #: lib/subs.php:136 @@ -4564,47 +4645,47 @@ msgstr "Senda bein skilaboð til þessa notanda" msgid "Message" msgstr "Skilaboð" -#: lib/util.php:818 +#: lib/util.php:821 msgid "a few seconds ago" msgstr "fyrir nokkrum sekúndum" -#: lib/util.php:820 +#: lib/util.php:823 msgid "about a minute ago" msgstr "fyrir um einni mÃnútu sÃðan" -#: lib/util.php:822 +#: lib/util.php:825 #, php-format msgid "about %d minutes ago" msgstr "fyrir um %d mÃnútum sÃðan" -#: lib/util.php:824 +#: lib/util.php:827 msgid "about an hour ago" msgstr "fyrir um einum klukkutÃma sÃðan" -#: lib/util.php:826 +#: lib/util.php:829 #, php-format msgid "about %d hours ago" msgstr "fyrir um %d klukkutÃmum sÃðan" -#: lib/util.php:828 +#: lib/util.php:831 msgid "about a day ago" msgstr "fyrir um einum degi sÃðan" -#: lib/util.php:830 +#: lib/util.php:833 #, php-format msgid "about %d days ago" msgstr "fyrir um %d dögum sÃðan" -#: lib/util.php:832 +#: lib/util.php:835 msgid "about a month ago" msgstr "fyrir um einum mánuði sÃðan" -#: lib/util.php:834 +#: lib/util.php:837 #, php-format msgid "about %d months ago" msgstr "fyrir um %d mánuðum sÃðan" -#: lib/util.php:836 +#: lib/util.php:839 msgid "about a year ago" msgstr "fyrir um einu ári sÃðan" diff --git a/locale/it/LC_MESSAGES/statusnet.mo b/locale/it/LC_MESSAGES/statusnet.mo Binary files differindex 1e33d6b95..479d105b0 100644 --- a/locale/it/LC_MESSAGES/statusnet.mo +++ b/locale/it/LC_MESSAGES/statusnet.mo diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po index 06a8a0a12..231078cc7 100644 --- a/locale/it/LC_MESSAGES/statusnet.po +++ b/locale/it/LC_MESSAGES/statusnet.po @@ -1,16 +1,17 @@ # Translation of StatusNet to Italian # +# Author@translatewiki.net: Nemo bis # -- msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-10 20:53+0000\n" -"PO-Revision-Date: 2009-11-10 20:59:13+0000\n" +"POT-Creation-Date: 2009-11-16 19:42+0000\n" +"PO-Revision-Date: 2009-11-16 19:43:39+0000\n" "Language-Team: Italian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: it\n" "X-Message-Group: out-statusnet\n" @@ -22,12 +23,15 @@ msgid "No such page" msgstr "Nessuna tale etichetta." #: actions/all.php:74 actions/allrss.php:68 -#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofilebackgroundimage.php:116 +#: actions/apiaccountupdateprofileimage.php:105 +#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 #: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 #: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 @@ -106,35 +110,42 @@ msgstr "%s e amici" msgid "Updates from %1$s and friends on %2$s!" msgstr "Aggiornamenti da %1$s e amici su %2$s!" -#: actions/apiaccountratelimitstatus.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 -#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:129 actions/apigroupcreate.php:184 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120 -#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101 -#: actions/apigroupshow.php:105 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144 -#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141 -#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130 -#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163 -#: actions/apiusershow.php:101 -msgid "API method not found!" +#: actions/apiaccountratelimitstatus.php:70 +#: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofilebackgroundimage.php:94 +#: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apiaccountupdateprofile.php:97 +#, fuzzy +msgid "API method not found." msgstr "Metodo delle API non trovato!" -#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 +#: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofilebackgroundimage.php:86 +#: actions/apiaccountupdateprofilecolors.php:110 +#: actions/apiaccountupdateprofileimage.php:84 +#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109 +#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "Questo metodo richiede POST." +#: actions/apiaccountupdatedeliverydevice.php:105 +msgid "" +"You must specify a parameter named 'device' with a value of one of: sms, im, " +"none" +msgstr "" + +#: actions/apiaccountupdatedeliverydevice.php:132 +#, fuzzy +msgid "Could not update user." +msgstr "Impossibile aggiornare l'utente." + +#: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 #: actions/newnotice.php:94 lib/designsettings.php:283 #, php-format msgid "" @@ -142,12 +153,34 @@ msgid "" "current configuration." msgstr "" -#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/apiaccountupdateprofilebackgroundimage.php:136 +#: actions/apiaccountupdateprofilebackgroundimage.php:146 +#: actions/apiaccountupdateprofilecolors.php:164 +#: actions/apiaccountupdateprofilecolors.php:174 +#, fuzzy +msgid "Unable to save your design settings." +msgstr "Impossibile salvare le tue impostazioni di Twitter!" + +#: actions/apiaccountupdateprofilebackgroundimage.php:187 +#: actions/apiaccountupdateprofilecolors.php:142 +#, fuzzy +msgid "Could not update your design." +msgstr "Impossibile aggiornare l'utente." + +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 +#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 #: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 msgid "User has no profile." msgstr "L'utente non ha un profilo." +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "Impossibile salvare il profilo." + #: actions/apiblockcreate.php:108 msgid "Block user failed." msgstr "Blocco dell'utente non riuscito." @@ -193,6 +226,23 @@ msgstr "Messaggi diretti a %s" msgid "All the direct messages sent to %s" msgstr "Tutti i messaggi diretti inviati a %s" +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 +#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 +#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 +#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149 +#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +msgid "API method not found!" +msgstr "Metodo delle API non trovato!" + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -389,17 +439,17 @@ msgstr "Immagine aggiornata." msgid "No status with that ID found." msgstr "Nessuno stato con quel ID trovato." -#: actions/apistatusesupdate.php:152 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 #: scripts/maildaemon.php:71 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Troppo lungo. Lunghezza massima 140 caratteri." -#: actions/apistatusesupdate.php:193 +#: actions/apistatusesupdate.php:198 msgid "Not found" msgstr "Non trovato" -#: actions/apistatusesupdate.php:216 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:227 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -483,7 +533,7 @@ msgid "Invalid size." msgstr "Dimensione non valida." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:113 +#: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "Immagine" @@ -531,7 +581,7 @@ msgstr "Ritaglia" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:151 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -1679,7 +1729,7 @@ msgid "Nickname" msgstr "Soprannome" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Password" @@ -1816,7 +1866,7 @@ msgstr "" #: actions/noticesearch.php:124 #, php-format msgid "" -"Why not [register an account](%%%%action.register%%%%) and be the first to " +"Why not [register an account](%%%%action.register%%%%) and be the first to " "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" msgstr "" @@ -1863,8 +1913,8 @@ msgstr "Connetti" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963 -#: lib/api.php:991 lib/api.php:1101 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 +#: lib/api.php:1027 lib/api.php:1137 msgid "Not a supported data format." msgstr "Non è un formato di dati supportato." @@ -1884,11 +1934,15 @@ msgstr "Altre impostazioni" msgid "Manage various other options." msgstr "Gestisci altre opzioni." -#: actions/othersettings.php:117 +#: actions/othersettings.php:108 +msgid " (free service)" +msgstr "" + +#: actions/othersettings.php:116 msgid "Shorten URLs with" msgstr "" -#: actions/othersettings.php:118 +#: actions/othersettings.php:117 msgid "Automatic shortening service to use." msgstr "Servizio di autoriduzione da usare." @@ -1925,65 +1979,60 @@ msgstr "" msgid "Change password" msgstr "Modifica password" -#: actions/passwordsettings.php:70 -#, fuzzy -msgid "You are not allowed to change your password" -msgstr "Modifica la tua password" - -#: actions/passwordsettings.php:82 +#: actions/passwordsettings.php:69 msgid "Change your password." msgstr "Modifica la tua password." -#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:96 actions/recoverpassword.php:231 msgid "Password change" msgstr "Cambio password" -#: actions/passwordsettings.php:117 +#: actions/passwordsettings.php:104 msgid "Old password" msgstr "Vecchia password" -#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:108 actions/recoverpassword.php:235 msgid "New password" msgstr "Nuova password" -#: actions/passwordsettings.php:122 +#: actions/passwordsettings.php:109 msgid "6 or more characters" msgstr "6 o più caratteri" -#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:112 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Conferma" -#: actions/passwordsettings.php:126 +#: actions/passwordsettings.php:113 msgid "same as password above" msgstr "stessa password di sopra" -#: actions/passwordsettings.php:130 +#: actions/passwordsettings.php:117 msgid "Change" msgstr "Modifica" -#: actions/passwordsettings.php:167 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "La password deve essere di 6 o più caratteri." -#: actions/passwordsettings.php:170 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:233 msgid "Passwords don't match." msgstr "Le password non corrispondono." -#: actions/passwordsettings.php:178 +#: actions/passwordsettings.php:165 msgid "Incorrect old password" msgstr "Vecchia password non corretta" -#: actions/passwordsettings.php:194 +#: actions/passwordsettings.php:181 msgid "Error saving user; invalid." msgstr "Errore nel salvare l'utente; non valido." -#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Impossibile salvare la nuova password." -#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:192 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Password salvata." @@ -2427,7 +2476,7 @@ msgid "Same as password above. Required." msgstr "Stessa password di sopra. Richiesta." #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:122 +#: lib/accountsettingsaction.php:120 msgid "Email" msgstr "Email" @@ -3359,36 +3408,36 @@ msgstr "Problema nel salvare il messaggio." msgid "DB error inserting reply: %s" msgstr "Errore del DB nell'inserire la risposta: %s" -#: classes/User.php:333 +#: classes/User.php:347 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Messaggio a %1$s su %2$s" -#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Profilo" -#: lib/accountsettingsaction.php:110 +#: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "Modifica le impostazioni del tuo profilo" -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:112 msgid "Upload an avatar" msgstr "Carica un'immagine" -#: lib/accountsettingsaction.php:119 +#: lib/accountsettingsaction.php:116 msgid "Change your password" msgstr "Modifica la tua password" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:120 msgid "Change email handling" msgstr "Modifica la gestione dell'email" -#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 +#: lib/accountsettingsaction.php:124 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:126 +#: lib/accountsettingsaction.php:124 #, fuzzy msgid "Design your profile" msgstr "Profilo utente" @@ -3397,7 +3446,7 @@ msgstr "Profilo utente" msgid "Other" msgstr "Altro" -#: lib/accountsettingsaction.php:129 +#: lib/accountsettingsaction.php:128 msgid "Other options" msgstr "Altre opzioni" @@ -3567,19 +3616,19 @@ msgstr "Tutto " msgid "license." msgstr "licenza." -#: lib/action.php:1053 +#: lib/action.php:1052 msgid "Pagination" msgstr "Paginazione" -#: lib/action.php:1062 +#: lib/action.php:1061 msgid "After" msgstr "Successivi" -#: lib/action.php:1070 +#: lib/action.php:1069 msgid "Before" msgstr "Precedenti" -#: lib/action.php:1119 +#: lib/action.php:1117 msgid "There was a problem with your session token." msgstr "C'è stato un problema con il tuo token di sessione." @@ -3751,13 +3800,46 @@ msgstr "Impossibile creare il modulo OpenID: %s" msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:613 +#: lib/command.php:618 +#, fuzzy +msgid "You are not subscribed to anyone." +msgstr "Non sei abbonato a quel profilo." + +#: lib/command.php:620 +#, fuzzy +msgid "You are subscribed to these people: " +msgstr "Non sei abbonato a quel profilo." + +#: lib/command.php:637 +#, fuzzy +msgid "No one is subscribed to you." +msgstr "Impossibile abbonare altri a te." + +#: lib/command.php:639 +#, fuzzy +msgid "These people are subscribed to you: " +msgstr "Persone abbonate a %s" + +#: lib/command.php:656 +#, fuzzy +msgid "You are not a member of any groups." +msgstr "Non sei un membro di quel gruppo." + +#: lib/command.php:658 +#, fuzzy +msgid "You are a member of these groups: " +msgstr "Non sei un membro di quel gruppo." + +#: lib/command.php:670 msgid "" "Commands:\n" "on - turn on notifications\n" "off - turn off notifications\n" "help - show this help\n" "follow <nickname> - subscribe to user\n" +"groups - lists the groups you have joined\n" +"subscriptions - list the people you follow\n" +"subscribers - list the people that follow you\n" "leave <nickname> - unsubscribe from user\n" "d <nickname> <text> - direct message to user\n" "get <nickname> - get last notice from user\n" @@ -3787,20 +3869,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:191 +#: lib/common.php:192 #, fuzzy msgid "No configuration file found. " msgstr "Nessun codice di conferma." -#: lib/common.php:192 +#: lib/common.php:193 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:193 +#: lib/common.php:194 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:194 +#: lib/common.php:195 #, fuzzy msgid "Go to the installer." msgstr "Accedi al sito" @@ -4069,8 +4151,8 @@ msgstr "Tipo di file sconosciuto" #: lib/jabber.php:192 #, php-format -msgid "notice id: %s" -msgstr "Nuovo messaggio" +msgid "[%s]" +msgstr "" #: lib/joinform.php:114 msgid "Join" @@ -4366,7 +4448,7 @@ msgstr "Invia un messaggio" #: lib/noticeform.php:158 #, php-format msgid "What's up, %s?" -msgstr "Cosa succede %s?" +msgstr "Cosa succede, %s?" #: lib/noticeform.php:180 msgid "Attach" @@ -4592,7 +4674,8 @@ msgid "Could not subscribe other to you." msgstr "Impossibile abbonare altri a te." #: lib/subs.php:124 -msgid "Not subscribed!." +#, fuzzy +msgid "Not subscribed!" msgstr "Non abbonato!" #: lib/subs.php:136 @@ -4641,47 +4724,47 @@ msgstr "Invia un messaggio diretto a questo utente" msgid "Message" msgstr "Messaggio" -#: lib/util.php:818 +#: lib/util.php:821 msgid "a few seconds ago" msgstr "pochi secondi fa" -#: lib/util.php:820 +#: lib/util.php:823 msgid "about a minute ago" msgstr "circa un minuto fa" -#: lib/util.php:822 +#: lib/util.php:825 #, php-format msgid "about %d minutes ago" msgstr "circa %d minuti fa" -#: lib/util.php:824 +#: lib/util.php:827 msgid "about an hour ago" msgstr "circa un'ora fa" -#: lib/util.php:826 +#: lib/util.php:829 #, php-format msgid "about %d hours ago" msgstr "circa %d ore fa" -#: lib/util.php:828 +#: lib/util.php:831 msgid "about a day ago" msgstr "circa un giorno fa" -#: lib/util.php:830 +#: lib/util.php:833 #, php-format msgid "about %d days ago" msgstr "circa %d giorni fa" -#: lib/util.php:832 +#: lib/util.php:835 msgid "about a month ago" msgstr "circa un mese fa" -#: lib/util.php:834 +#: lib/util.php:837 #, php-format msgid "about %d months ago" msgstr "circa %d mesi fa" -#: lib/util.php:836 +#: lib/util.php:839 msgid "about a year ago" msgstr "circa un anno fa" diff --git a/locale/ja/LC_MESSAGES/statusnet.mo b/locale/ja/LC_MESSAGES/statusnet.mo Binary files differindex 9bbc582ac..3fd89d064 100644 --- a/locale/ja/LC_MESSAGES/statusnet.mo +++ b/locale/ja/LC_MESSAGES/statusnet.mo diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po index fd22e5177..eb63104c8 100644 --- a/locale/ja/LC_MESSAGES/statusnet.po +++ b/locale/ja/LC_MESSAGES/statusnet.po @@ -6,12 +6,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-10 20:53+0000\n" -"PO-Revision-Date: 2009-11-10 20:59:16+0000\n" +"POT-Creation-Date: 2009-11-16 19:42+0000\n" +"PO-Revision-Date: 2009-11-16 19:43:42+0000\n" "Language-Team: Japanese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ja\n" "X-Message-Group: out-statusnet\n" @@ -23,12 +23,15 @@ msgid "No such page" msgstr "ãã®ã‚ˆã†ãªé€šçŸ¥ã¯ã‚ã‚Šã¾ã›ã‚“。" #: actions/all.php:74 actions/allrss.php:68 -#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofilebackgroundimage.php:116 +#: actions/apiaccountupdateprofileimage.php:105 +#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 #: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 #: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 @@ -107,35 +110,42 @@ msgstr "%s & ã¨ã‚‚ã ã¡" msgid "Updates from %1$s and friends on %2$s!" msgstr "" -#: actions/apiaccountratelimitstatus.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 -#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:129 actions/apigroupcreate.php:184 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120 -#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101 -#: actions/apigroupshow.php:105 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144 -#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141 -#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130 -#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163 -#: actions/apiusershow.php:101 -msgid "API method not found!" +#: actions/apiaccountratelimitstatus.php:70 +#: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofilebackgroundimage.php:94 +#: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apiaccountupdateprofile.php:97 +#, fuzzy +msgid "API method not found." msgstr "API メソッドãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ï¼" -#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 +#: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofilebackgroundimage.php:86 +#: actions/apiaccountupdateprofilecolors.php:110 +#: actions/apiaccountupdateprofileimage.php:84 +#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109 +#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "" +#: actions/apiaccountupdatedeliverydevice.php:105 +msgid "" +"You must specify a parameter named 'device' with a value of one of: sms, im, " +"none" +msgstr "" + +#: actions/apiaccountupdatedeliverydevice.php:132 +#, fuzzy +msgid "Could not update user." +msgstr "ユーザを更新ã§ãã¾ã›ã‚“" + +#: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 #: actions/newnotice.php:94 lib/designsettings.php:283 #, php-format msgid "" @@ -143,12 +153,33 @@ msgid "" "current configuration." msgstr "" -#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/apiaccountupdateprofilebackgroundimage.php:136 +#: actions/apiaccountupdateprofilebackgroundimage.php:146 +#: actions/apiaccountupdateprofilecolors.php:164 +#: actions/apiaccountupdateprofilecolors.php:174 +msgid "Unable to save your design settings." +msgstr "" + +#: actions/apiaccountupdateprofilebackgroundimage.php:187 +#: actions/apiaccountupdateprofilecolors.php:142 +#, fuzzy +msgid "Could not update your design." +msgstr "ユーザを更新ã§ãã¾ã›ã‚“" + +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 +#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 #: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 msgid "User has no profile." msgstr "プãƒãƒ•ã‚¡ã‚¤ãƒ«ãŒã‚ã‚Šã¾ã›ã‚“。" +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "プãƒãƒ•ã‚¡ã‚¤ãƒ«ã‚’ä¿å˜ã§ãã¾ã›ã‚“" + #: actions/apiblockcreate.php:108 msgid "Block user failed." msgstr "ユーザã®ãƒ–ãƒãƒƒã‚¯ã«å¤±æ•—ã—ã¾ã—ãŸã€‚" @@ -194,6 +225,23 @@ msgstr "" msgid "All the direct messages sent to %s" msgstr "" +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 +#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 +#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 +#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149 +#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +msgid "API method not found!" +msgstr "API メソッドãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ï¼" + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -391,17 +439,17 @@ msgstr "ã‚¢ãƒã‚¿ãƒ¼ãŒæ›´æ–°ã•ã‚Œã¾ã—ãŸã€‚" msgid "No status with that ID found." msgstr "" -#: actions/apistatusesupdate.php:152 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 #: scripts/maildaemon.php:71 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "é•·ã™ãŽã¾ã™ã€‚通知ã¯æœ€å¤§ 140 å—ã¾ã§ã§ã™ã€‚" -#: actions/apistatusesupdate.php:193 +#: actions/apistatusesupdate.php:198 msgid "Not found" msgstr "" -#: actions/apistatusesupdate.php:216 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:227 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -485,7 +533,7 @@ msgid "Invalid size." msgstr "ä¸æ£ãªã‚µã‚¤ã‚ºã€‚" #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:113 +#: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "ã‚¢ãƒã‚¿ãƒ¼" @@ -534,7 +582,7 @@ msgstr "" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:151 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -1668,7 +1716,7 @@ msgid "Nickname" msgstr "ニックãƒãƒ¼ãƒ " #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:116 msgid "Password" msgstr "パスワード" @@ -1800,7 +1848,7 @@ msgstr "" #: actions/noticesearch.php:124 #, php-format msgid "" -"Why not [register an account](%%%%action.register%%%%) and be the first to " +"Why not [register an account](%%%%action.register%%%%) and be the first to " "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" msgstr "" @@ -1844,8 +1892,8 @@ msgstr "内容種別 " msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963 -#: lib/api.php:991 lib/api.php:1101 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 +#: lib/api.php:1027 lib/api.php:1137 msgid "Not a supported data format." msgstr "" @@ -1866,11 +1914,15 @@ msgstr "è¨å®š" msgid "Manage various other options." msgstr "" -#: actions/othersettings.php:117 +#: actions/othersettings.php:108 +msgid " (free service)" +msgstr "" + +#: actions/othersettings.php:116 msgid "Shorten URLs with" msgstr "" -#: actions/othersettings.php:118 +#: actions/othersettings.php:117 msgid "Automatic shortening service to use." msgstr "" @@ -1906,67 +1958,62 @@ msgstr "" msgid "Change password" msgstr "パスワードã®å¤‰æ›´" -#: actions/passwordsettings.php:70 -#, fuzzy -msgid "You are not allowed to change your password" -msgstr "パスワードã®å¤‰æ›´" - -#: actions/passwordsettings.php:82 +#: actions/passwordsettings.php:69 #, fuzzy msgid "Change your password." msgstr "パスワードã®å¤‰æ›´" -#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:96 actions/recoverpassword.php:231 #, fuzzy msgid "Password change" msgstr "パスワードãŒä¿å˜ã•ã‚Œã¾ã—ãŸã€‚" -#: actions/passwordsettings.php:117 +#: actions/passwordsettings.php:104 msgid "Old password" msgstr "å¤ã„パスワード" -#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:108 actions/recoverpassword.php:235 msgid "New password" msgstr "æ–°ã—ã„パスワード" -#: actions/passwordsettings.php:122 +#: actions/passwordsettings.php:109 msgid "6 or more characters" msgstr "6æ–‡å—以上" -#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:112 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "確èª" -#: actions/passwordsettings.php:126 +#: actions/passwordsettings.php:113 msgid "same as password above" msgstr "上ã®ãƒ‘スワードã¨åŒã˜" -#: actions/passwordsettings.php:130 +#: actions/passwordsettings.php:117 msgid "Change" msgstr "変更" -#: actions/passwordsettings.php:167 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "" -#: actions/passwordsettings.php:170 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:233 msgid "Passwords don't match." msgstr "パスワードãŒä¸€è‡´ã—ã¾ã›ã‚“。" -#: actions/passwordsettings.php:178 +#: actions/passwordsettings.php:165 msgid "Incorrect old password" msgstr "å¤ã„パスワードãŒé–“é•ã£ã¦ã„ã¾ã™ã€‚" -#: actions/passwordsettings.php:194 +#: actions/passwordsettings.php:181 msgid "Error saving user; invalid." msgstr "ユーザä¿å˜ã‚¨ãƒ©ãƒ¼; ä¸æ£ãªãƒ¦ãƒ¼ã‚¶" -#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "æ–°ã—ã„パスワードをä¿å˜ã§ãã¾ã›ã‚“。" -#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:192 actions/recoverpassword.php:211 msgid "Password saved." msgstr "パスワードãŒä¿å˜ã•ã‚Œã¾ã—ãŸã€‚" @@ -2403,7 +2450,7 @@ msgid "Same as password above. Required." msgstr "" #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:122 +#: lib/accountsettingsaction.php:120 msgid "Email" msgstr "メール" @@ -3318,36 +3365,36 @@ msgstr "通知をä¿å˜ã™ã‚‹éš›ã«å•é¡ŒãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚" msgid "DB error inserting reply: %s" msgstr "è¿”ä¿¡ã‚’è¿½åŠ ã™ã‚‹éš›ã«ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã‚¨ãƒ©ãƒ¼ : %s" -#: classes/User.php:333 +#: classes/User.php:347 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" -#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 msgid "Profile" msgstr "プãƒãƒ•ã‚¡ã‚¤ãƒ«" -#: lib/accountsettingsaction.php:110 +#: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "プãƒãƒ•ã‚¡ã‚¤ãƒ«è¨å®šã®å¤‰æ›´" -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:112 msgid "Upload an avatar" msgstr "ã‚¢ãƒã‚¿ãƒ¼ã®ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰" -#: lib/accountsettingsaction.php:119 +#: lib/accountsettingsaction.php:116 msgid "Change your password" msgstr "パスワードã®å¤‰æ›´" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:120 msgid "Change email handling" msgstr "メールã®æ‰±ã„を変更" -#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 +#: lib/accountsettingsaction.php:124 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:126 +#: lib/accountsettingsaction.php:124 #, fuzzy msgid "Design your profile" msgstr "プãƒãƒ•ã‚¡ã‚¤ãƒ«ãŒã‚ã‚Šã¾ã›ã‚“。" @@ -3356,7 +3403,7 @@ msgstr "プãƒãƒ•ã‚¡ã‚¤ãƒ«ãŒã‚ã‚Šã¾ã›ã‚“。" msgid "Other" msgstr "ãã®ä»–" -#: lib/accountsettingsaction.php:129 +#: lib/accountsettingsaction.php:128 msgid "Other options" msgstr "ãã®ä»–ã®ã‚ªãƒ—ション" @@ -3529,21 +3576,21 @@ msgstr "" msgid "license." msgstr "ライセンス。" -#: lib/action.php:1053 +#: lib/action.php:1052 msgid "Pagination" msgstr "" -#: lib/action.php:1062 +#: lib/action.php:1061 #, fuzzy msgid "After" msgstr "<< å‰" -#: lib/action.php:1070 +#: lib/action.php:1069 #, fuzzy msgid "Before" msgstr "å‰ >>" -#: lib/action.php:1119 +#: lib/action.php:1117 msgid "There was a problem with your session token." msgstr "" @@ -3715,13 +3762,46 @@ msgstr "OpenIDを作æˆã§ãã¾ã›ã‚“ : %s" msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:613 +#: lib/command.php:618 +#, fuzzy +msgid "You are not subscribed to anyone." +msgstr "ãã®ãƒ—ãƒãƒ•ã‚¡ã‚¤ãƒ«ã¯é€ä¿¡ã•ã‚Œã¦ã„ã¾ã›ã‚“。" + +#: lib/command.php:620 +#, fuzzy +msgid "You are subscribed to these people: " +msgstr "ãã®ãƒ—ãƒãƒ•ã‚¡ã‚¤ãƒ«ã¯é€ä¿¡ã•ã‚Œã¦ã„ã¾ã›ã‚“。" + +#: lib/command.php:637 +#, fuzzy +msgid "No one is subscribed to you." +msgstr "リモートサブスクライブ" + +#: lib/command.php:639 +#, fuzzy +msgid "These people are subscribed to you: " +msgstr "リモートサブスクライブ" + +#: lib/command.php:656 +#, fuzzy +msgid "You are not a member of any groups." +msgstr "ãã®ãƒ—ãƒãƒ•ã‚¡ã‚¤ãƒ«ã¯é€ä¿¡ã•ã‚Œã¦ã„ã¾ã›ã‚“。" + +#: lib/command.php:658 +#, fuzzy +msgid "You are a member of these groups: " +msgstr "ãã®ãƒ—ãƒãƒ•ã‚¡ã‚¤ãƒ«ã¯é€ä¿¡ã•ã‚Œã¦ã„ã¾ã›ã‚“。" + +#: lib/command.php:670 msgid "" "Commands:\n" "on - turn on notifications\n" "off - turn off notifications\n" "help - show this help\n" "follow <nickname> - subscribe to user\n" +"groups - lists the groups you have joined\n" +"subscriptions - list the people you follow\n" +"subscribers - list the people that follow you\n" "leave <nickname> - unsubscribe from user\n" "d <nickname> <text> - direct message to user\n" "get <nickname> - get last notice from user\n" @@ -3751,20 +3831,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:191 +#: lib/common.php:192 #, fuzzy msgid "No configuration file found. " msgstr "確èªã‚³ãƒ¼ãƒ‰ãŒã‚ã‚Šã¾ã›ã‚“。" -#: lib/common.php:192 +#: lib/common.php:193 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:193 +#: lib/common.php:194 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:194 +#: lib/common.php:195 #, fuzzy msgid "Go to the installer." msgstr "サイトã¸ãƒã‚°ã‚¤ãƒ³" @@ -4033,8 +4113,8 @@ msgstr "" #: lib/jabber.php:192 #, php-format -msgid "notice id: %s" -msgstr "æ–°ã—ã„通知" +msgid "[%s]" +msgstr "" #: lib/joinform.php:114 msgid "Join" @@ -4547,7 +4627,8 @@ msgid "Could not subscribe other to you." msgstr "" #: lib/subs.php:124 -msgid "Not subscribed!." +#, fuzzy +msgid "Not subscribed!" msgstr "è³¼èªã—ã¦ã„ã¾ã›ã‚“ï¼" #: lib/subs.php:136 @@ -4596,47 +4677,47 @@ msgstr "" msgid "Message" msgstr "" -#: lib/util.php:818 +#: lib/util.php:821 msgid "a few seconds ago" msgstr "数秒å‰" -#: lib/util.php:820 +#: lib/util.php:823 msgid "about a minute ago" msgstr "ç´„ 1 分å‰" -#: lib/util.php:822 +#: lib/util.php:825 #, php-format msgid "about %d minutes ago" msgstr "ç´„ %d 分å‰" -#: lib/util.php:824 +#: lib/util.php:827 msgid "about an hour ago" msgstr "ç´„ 1 時間å‰" -#: lib/util.php:826 +#: lib/util.php:829 #, php-format msgid "about %d hours ago" msgstr "ç´„ %d 時間å‰" -#: lib/util.php:828 +#: lib/util.php:831 msgid "about a day ago" msgstr "ç´„ 1 æ—¥å‰" -#: lib/util.php:830 +#: lib/util.php:833 #, php-format msgid "about %d days ago" msgstr "ç´„ %d æ—¥å‰" -#: lib/util.php:832 +#: lib/util.php:835 msgid "about a month ago" msgstr "ç´„ 1 ヵ月å‰" -#: lib/util.php:834 +#: lib/util.php:837 #, php-format msgid "about %d months ago" msgstr "ç´„ %d ヵ月å‰" -#: lib/util.php:836 +#: lib/util.php:839 msgid "about a year ago" msgstr "ç´„ 1 å¹´å‰" diff --git a/locale/ko/LC_MESSAGES/statusnet.mo b/locale/ko/LC_MESSAGES/statusnet.mo Binary files differindex b2e5f3d92..870956380 100644 --- a/locale/ko/LC_MESSAGES/statusnet.mo +++ b/locale/ko/LC_MESSAGES/statusnet.mo diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po index f521a9f09..19a9f4a6e 100644 --- a/locale/ko/LC_MESSAGES/statusnet.po +++ b/locale/ko/LC_MESSAGES/statusnet.po @@ -5,12 +5,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-10 20:53+0000\n" -"PO-Revision-Date: 2009-11-10 20:59:19+0000\n" +"POT-Creation-Date: 2009-11-16 19:42+0000\n" +"PO-Revision-Date: 2009-11-16 19:43:45+0000\n" "Language-Team: Korean\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ko\n" "X-Message-Group: out-statusnet\n" @@ -22,12 +22,15 @@ msgid "No such page" msgstr "그러한 태그가 없습니다." #: actions/all.php:74 actions/allrss.php:68 -#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofilebackgroundimage.php:116 +#: actions/apiaccountupdateprofileimage.php:105 +#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 #: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 #: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 @@ -106,35 +109,42 @@ msgstr "%s ë° ì¹œêµ¬ë“¤" msgid "Updates from %1$s and friends on %2$s!" msgstr "%1$s ë° %2$sì— ìžˆëŠ” ì¹œêµ¬ë“¤ì˜ ì—…ë°ì´íŠ¸!" -#: actions/apiaccountratelimitstatus.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 -#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:129 actions/apigroupcreate.php:184 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120 -#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101 -#: actions/apigroupshow.php:105 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144 -#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141 -#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130 -#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163 -#: actions/apiusershow.php:101 -msgid "API method not found!" +#: actions/apiaccountratelimitstatus.php:70 +#: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofilebackgroundimage.php:94 +#: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apiaccountupdateprofile.php:97 +#, fuzzy +msgid "API method not found." msgstr "API 메서드를 ì°¾ì„ ìˆ˜ 없습니다." -#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 +#: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofilebackgroundimage.php:86 +#: actions/apiaccountupdateprofilecolors.php:110 +#: actions/apiaccountupdateprofileimage.php:84 +#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109 +#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "ì´ ë©”ì„œë“œëŠ” 등ë¡ì„ 요구합니다." +#: actions/apiaccountupdatedeliverydevice.php:105 +msgid "" +"You must specify a parameter named 'device' with a value of one of: sms, im, " +"none" +msgstr "" + +#: actions/apiaccountupdatedeliverydevice.php:132 +#, fuzzy +msgid "Could not update user." +msgstr "사용ìžë¥¼ ì—…ë°ì´íŠ¸ í• ìˆ˜ 없습니다." + +#: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 #: actions/newnotice.php:94 lib/designsettings.php:283 #, php-format msgid "" @@ -142,12 +152,34 @@ msgid "" "current configuration." msgstr "" -#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/apiaccountupdateprofilebackgroundimage.php:136 +#: actions/apiaccountupdateprofilebackgroundimage.php:146 +#: actions/apiaccountupdateprofilecolors.php:164 +#: actions/apiaccountupdateprofilecolors.php:174 +#, fuzzy +msgid "Unable to save your design settings." +msgstr "트위터 í™˜ê²½ì„¤ì •ì„ ì €ìž¥í• ìˆ˜ 없습니다." + +#: actions/apiaccountupdateprofilebackgroundimage.php:187 +#: actions/apiaccountupdateprofilecolors.php:142 +#, fuzzy +msgid "Could not update your design." +msgstr "사용ìžë¥¼ ì—…ë°ì´íŠ¸ í• ìˆ˜ 없습니다." + +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 +#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 #: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 msgid "User has no profile." msgstr "ì´ìš©ìžê°€ í”„ë¡œí•„ì„ ê°€ì§€ê³ ìžˆì§€ 않습니다." +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "í”„ë¡œí•„ì„ ì €ìž¥ í• ìˆ˜ 없습니다." + #: actions/apiblockcreate.php:108 msgid "Block user failed." msgstr "ì‚¬ìš©ìž ì°¨ë‹¨ì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤." @@ -193,6 +225,23 @@ msgstr "%sì—게 ì§ì ‘ 메시지" msgid "All the direct messages sent to %s" msgstr "%sì—게 ëª¨ë“ ì§ì ‘ 메시지" +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 +#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 +#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 +#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149 +#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +msgid "API method not found!" +msgstr "API 메서드를 ì°¾ì„ ìˆ˜ 없습니다." + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -389,17 +438,17 @@ msgstr "아바타가 ì—…ë°ì´íŠ¸ ë˜ì—ˆìŠµë‹ˆë‹¤." msgid "No status with that ID found." msgstr "ë°œê²¬ëœ IDì˜ ìƒíƒœê°€ 없습니다." -#: actions/apistatusesupdate.php:152 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 #: scripts/maildaemon.php:71 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "너무 ê¹ë‹ˆë‹¤. í†µì§€ì˜ ìµœëŒ€ 길ì´ëŠ” 140ê¸€ìž ìž…ë‹ˆë‹¤." -#: actions/apistatusesupdate.php:193 +#: actions/apistatusesupdate.php:198 msgid "Not found" msgstr "찾지 못함" -#: actions/apistatusesupdate.php:216 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:227 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -483,7 +532,7 @@ msgid "Invalid size." msgstr "옳지 ì•Šì€ í¬ê¸°" #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:113 +#: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "아바타" @@ -531,7 +580,7 @@ msgstr "ìžë¥´ê¸°" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:151 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -1661,7 +1710,7 @@ msgid "Nickname" msgstr "별명" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:116 msgid "Password" msgstr "비밀 번호" @@ -1798,7 +1847,7 @@ msgstr "" #: actions/noticesearch.php:124 #, php-format msgid "" -"Why not [register an account](%%%%action.register%%%%) and be the first to " +"Why not [register an account](%%%%action.register%%%%) and be the first to " "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" msgstr "" @@ -1844,8 +1893,8 @@ msgstr "ì—°ê²°" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963 -#: lib/api.php:991 lib/api.php:1101 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 +#: lib/api.php:1027 lib/api.php:1137 msgid "Not a supported data format." msgstr "지ì›í•˜ëŠ” 형ì‹ì˜ ë°ì´í„°ê°€ 아닙니다." @@ -1865,11 +1914,15 @@ msgstr "기타 ì„¤ì •" msgid "Manage various other options." msgstr "다양한 다른 옵션관리" -#: actions/othersettings.php:117 +#: actions/othersettings.php:108 +msgid " (free service)" +msgstr "" + +#: actions/othersettings.php:116 msgid "Shorten URLs with" msgstr "" -#: actions/othersettings.php:118 +#: actions/othersettings.php:117 msgid "Automatic shortening service to use." msgstr "ì‚¬ìš©í• URL ìžë™ 줄ì´ê¸° 서비스" @@ -1904,65 +1957,60 @@ msgstr "ë‹¹ì‹ ì˜ ë³´ë‚¸ 쪽지함입니다. ì´ê³³ì—” ë‹¹ì‹ ì´ ë³´ëƒˆë˜ ë¹„ë° msgid "Change password" msgstr "비밀번호 바꾸기" -#: actions/passwordsettings.php:70 -#, fuzzy -msgid "You are not allowed to change your password" -msgstr "비밀번호 바꾸기" - -#: actions/passwordsettings.php:82 +#: actions/passwordsettings.php:69 msgid "Change your password." msgstr "비밀번호를 변경하세요." -#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:96 actions/recoverpassword.php:231 msgid "Password change" msgstr "비밀번호 변경" -#: actions/passwordsettings.php:117 +#: actions/passwordsettings.php:104 msgid "Old password" msgstr "기존 비밀 번호" -#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:108 actions/recoverpassword.php:235 msgid "New password" msgstr "새로운 비밀 번호" -#: actions/passwordsettings.php:122 +#: actions/passwordsettings.php:109 msgid "6 or more characters" msgstr "6ê¸€ìž ì´ìƒ" -#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:112 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "ì¸ì¦" -#: actions/passwordsettings.php:126 +#: actions/passwordsettings.php:113 msgid "same as password above" msgstr "위 비밀번호와 ë™ì¼í•˜ê²Œ" -#: actions/passwordsettings.php:130 +#: actions/passwordsettings.php:117 msgid "Change" msgstr "변환" -#: actions/passwordsettings.php:167 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "비밀번호는 6ìžë¦¬ ì´ìƒì´ì–´ì•¼ 합니다." -#: actions/passwordsettings.php:170 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:233 msgid "Passwords don't match." msgstr "비밀 번호가 ì¼ì¹˜í•˜ì§€ 않습니다." -#: actions/passwordsettings.php:178 +#: actions/passwordsettings.php:165 msgid "Incorrect old password" msgstr "기존 비밀 번호가 í‹€ë ¸ìŠµë‹ˆë‹¤" -#: actions/passwordsettings.php:194 +#: actions/passwordsettings.php:181 msgid "Error saving user; invalid." msgstr "ì‚¬ìš©ìž ì €ìž¥ 오류; 무효한 사용ìž" -#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "새 비밀번호를 ì €ìž¥ í• ìˆ˜ 없습니다." -#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:192 actions/recoverpassword.php:211 msgid "Password saved." msgstr "비밀 번호 ì €ìž¥" @@ -2401,7 +2449,7 @@ msgid "Same as password above. Required." msgstr "위와 ê°™ì€ ë¹„ë°€ 번호. 필수 사í•." #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:122 +#: lib/accountsettingsaction.php:120 msgid "Email" msgstr "ì´ë©”ì¼" @@ -3324,36 +3372,36 @@ msgstr "통지를 ì €ìž¥í•˜ëŠ”ë° ë¬¸ì œê°€ ë°œìƒí–ˆìŠµë‹ˆë‹¤." msgid "DB error inserting reply: %s" msgstr "ë‹µì‹ ì„ ì¶”ê°€ í• ë•Œì— ë°ì´íƒ€ë² ì´ìŠ¤ ì—러 : %s" -#: classes/User.php:333 +#: classes/User.php:347 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "%2$sì—ì„œ %1$s까지 메시지" -#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 msgid "Profile" msgstr "프로필" -#: lib/accountsettingsaction.php:110 +#: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "프로필 세팅 바꾸기" -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:112 msgid "Upload an avatar" msgstr "아바타를 업로드하세요." -#: lib/accountsettingsaction.php:119 +#: lib/accountsettingsaction.php:116 msgid "Change your password" msgstr "비밀번호 바꾸기" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:120 msgid "Change email handling" msgstr "ì´ë©”ì¼ ì²˜ë¦¬ 변경" -#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 +#: lib/accountsettingsaction.php:124 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:126 +#: lib/accountsettingsaction.php:124 #, fuzzy msgid "Design your profile" msgstr "ì´ìš©ìž 프로필" @@ -3362,7 +3410,7 @@ msgstr "ì´ìš©ìž 프로필" msgid "Other" msgstr "기타" -#: lib/accountsettingsaction.php:129 +#: lib/accountsettingsaction.php:128 msgid "Other options" msgstr "다른 옵션들" @@ -3532,19 +3580,19 @@ msgstr "ëª¨ë“ ê²ƒ" msgid "license." msgstr "ë¼ì´ì„ 스" -#: lib/action.php:1053 +#: lib/action.php:1052 msgid "Pagination" msgstr "페ì´ì§€ìˆ˜" -#: lib/action.php:1062 +#: lib/action.php:1061 msgid "After" msgstr "ë’· 페ì´ì§€" -#: lib/action.php:1070 +#: lib/action.php:1069 msgid "Before" msgstr "ì•ž 페ì´ì§€" -#: lib/action.php:1119 +#: lib/action.php:1117 msgid "There was a problem with your session token." msgstr "ë‹¹ì‹ ì˜ ì„¸ì…˜í† í°ê´€ë ¨ ë¬¸ì œê°€ 있습니다." @@ -3716,13 +3764,46 @@ msgstr "OpenID를 작성 í• ìˆ˜ 없습니다 : %s" msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:613 +#: lib/command.php:618 +#, fuzzy +msgid "You are not subscribed to anyone." +msgstr "ë‹¹ì‹ ì€ ì´ í”„ë¡œí•„ì— êµ¬ë…ë˜ì§€ ì•Šê³ ìžˆìŠµë‹ˆë‹¤." + +#: lib/command.php:620 +#, fuzzy +msgid "You are subscribed to these people: " +msgstr "ë‹¹ì‹ ì€ ì´ í”„ë¡œí•„ì— êµ¬ë…ë˜ì§€ ì•Šê³ ìžˆìŠµë‹ˆë‹¤." + +#: lib/command.php:637 +#, fuzzy +msgid "No one is subscribed to you." +msgstr "다른 ì‚¬ëžŒì„ êµ¬ë… í•˜ì‹¤ 수 없습니다." + +#: lib/command.php:639 +#, fuzzy +msgid "These people are subscribed to you: " +msgstr "%sì— ì˜í•´ 구ë…ë˜ëŠ” 사람들" + +#: lib/command.php:656 +#, fuzzy +msgid "You are not a member of any groups." +msgstr "ë‹¹ì‹ ì€ í•´ë‹¹ ê·¸ë£¹ì˜ ë©¤ë²„ê°€ 아닙니다." + +#: lib/command.php:658 +#, fuzzy +msgid "You are a member of these groups: " +msgstr "ë‹¹ì‹ ì€ í•´ë‹¹ ê·¸ë£¹ì˜ ë©¤ë²„ê°€ 아닙니다." + +#: lib/command.php:670 msgid "" "Commands:\n" "on - turn on notifications\n" "off - turn off notifications\n" "help - show this help\n" "follow <nickname> - subscribe to user\n" +"groups - lists the groups you have joined\n" +"subscriptions - list the people you follow\n" +"subscribers - list the people that follow you\n" "leave <nickname> - unsubscribe from user\n" "d <nickname> <text> - direct message to user\n" "get <nickname> - get last notice from user\n" @@ -3752,20 +3833,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:191 +#: lib/common.php:192 #, fuzzy msgid "No configuration file found. " msgstr "í™•ì¸ ì½”ë“œê°€ 없습니다." -#: lib/common.php:192 +#: lib/common.php:193 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:193 +#: lib/common.php:194 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:194 +#: lib/common.php:195 #, fuzzy msgid "Go to the installer." msgstr "ì´ ì‚¬ì´íŠ¸ 로그ì¸" @@ -4034,8 +4115,8 @@ msgstr "ì•Œ 수 없는 ì¢…ë¥˜ì˜ íŒŒì¼ìž…니다" #: lib/jabber.php:192 #, php-format -msgid "notice id: %s" -msgstr "새로운 통지" +msgid "[%s]" +msgstr "" #: lib/joinform.php:114 msgid "Join" @@ -4549,7 +4630,8 @@ msgid "Could not subscribe other to you." msgstr "다른 ì‚¬ëžŒì„ êµ¬ë… í•˜ì‹¤ 수 없습니다." #: lib/subs.php:124 -msgid "Not subscribed!." +#, fuzzy +msgid "Not subscribed!" msgstr "구ë…í•˜ê³ ìžˆì§€ 않습니다!" #: lib/subs.php:136 @@ -4598,47 +4680,47 @@ msgstr "ì´ íšŒì›ì—게 ì§ì ‘ 메시지를 보냅니다." msgid "Message" msgstr "메시지" -#: lib/util.php:818 +#: lib/util.php:821 msgid "a few seconds ago" msgstr "몇 ì´ˆ ì „" -#: lib/util.php:820 +#: lib/util.php:823 msgid "about a minute ago" msgstr "1분 ì „" -#: lib/util.php:822 +#: lib/util.php:825 #, php-format msgid "about %d minutes ago" msgstr "%d분 ì „" -#: lib/util.php:824 +#: lib/util.php:827 msgid "about an hour ago" msgstr "1시간 ì „" -#: lib/util.php:826 +#: lib/util.php:829 #, php-format msgid "about %d hours ago" msgstr "%d시간 ì „" -#: lib/util.php:828 +#: lib/util.php:831 msgid "about a day ago" msgstr "하루 ì „" -#: lib/util.php:830 +#: lib/util.php:833 #, php-format msgid "about %d days ago" msgstr "%dì¼ ì „" -#: lib/util.php:832 +#: lib/util.php:835 msgid "about a month ago" msgstr "1달 ì „" -#: lib/util.php:834 +#: lib/util.php:837 #, php-format msgid "about %d months ago" msgstr "%d달 ì „" -#: lib/util.php:836 +#: lib/util.php:839 msgid "about a year ago" msgstr "1ë…„ ì „" diff --git a/locale/mk/LC_MESSAGES/statusnet.mo b/locale/mk/LC_MESSAGES/statusnet.mo Binary files differindex 3914f339c..6b2713593 100644 --- a/locale/mk/LC_MESSAGES/statusnet.mo +++ b/locale/mk/LC_MESSAGES/statusnet.mo diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po index 91f7eaebe..d011d7379 100644 --- a/locale/mk/LC_MESSAGES/statusnet.po +++ b/locale/mk/LC_MESSAGES/statusnet.po @@ -6,12 +6,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-10 20:53+0000\n" -"PO-Revision-Date: 2009-11-10 20:59:21+0000\n" +"POT-Creation-Date: 2009-11-16 19:42+0000\n" +"PO-Revision-Date: 2009-11-16 19:43:48+0000\n" "Language-Team: Macedonian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: mk\n" "X-Message-Group: out-statusnet\n" @@ -23,12 +23,15 @@ msgid "No such page" msgstr "Ðема такво извеÑтување." #: actions/all.php:74 actions/allrss.php:68 -#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofilebackgroundimage.php:116 +#: actions/apiaccountupdateprofileimage.php:105 +#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 #: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 #: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 @@ -107,35 +110,42 @@ msgstr "%s и пријателите" msgid "Updates from %1$s and friends on %2$s!" msgstr "" -#: actions/apiaccountratelimitstatus.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 -#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:129 actions/apigroupcreate.php:184 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120 -#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101 -#: actions/apigroupshow.php:105 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144 -#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141 -#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130 -#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163 -#: actions/apiusershow.php:101 -msgid "API method not found!" -msgstr "" +#: actions/apiaccountratelimitstatus.php:70 +#: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofilebackgroundimage.php:94 +#: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apiaccountupdateprofile.php:97 +#, fuzzy +msgid "API method not found." +msgstr "Кодот за потврда не е пронајден." -#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 +#: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofilebackgroundimage.php:86 +#: actions/apiaccountupdateprofilecolors.php:110 +#: actions/apiaccountupdateprofileimage.php:84 +#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109 +#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "" +#: actions/apiaccountupdatedeliverydevice.php:105 +msgid "" +"You must specify a parameter named 'device' with a value of one of: sms, im, " +"none" +msgstr "" + +#: actions/apiaccountupdatedeliverydevice.php:132 +#, fuzzy +msgid "Could not update user." +msgstr "КориÑникот не може да Ñе оÑвежи/" + +#: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 #: actions/newnotice.php:94 lib/designsettings.php:283 #, php-format msgid "" @@ -143,12 +153,33 @@ msgid "" "current configuration." msgstr "" -#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/apiaccountupdateprofilebackgroundimage.php:136 +#: actions/apiaccountupdateprofilebackgroundimage.php:146 +#: actions/apiaccountupdateprofilecolors.php:164 +#: actions/apiaccountupdateprofilecolors.php:174 +msgid "Unable to save your design settings." +msgstr "" + +#: actions/apiaccountupdateprofilebackgroundimage.php:187 +#: actions/apiaccountupdateprofilecolors.php:142 +#, fuzzy +msgid "Could not update your design." +msgstr "КориÑникот не може да Ñе оÑвежи/" + +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 +#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 #: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 msgid "User has no profile." msgstr "КориÑникот нема профил." +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "Профилот не може да Ñе Ñними." + #: actions/apiblockcreate.php:108 msgid "Block user failed." msgstr "" @@ -194,6 +225,23 @@ msgstr "" msgid "All the direct messages sent to %s" msgstr "" +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 +#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 +#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 +#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149 +#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +msgid "API method not found!" +msgstr "" + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -388,17 +436,17 @@ msgstr "Ðватарот е ажуриран." msgid "No status with that ID found." msgstr "" -#: actions/apistatusesupdate.php:152 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 #: scripts/maildaemon.php:71 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Ова е предолго. МакÑималната должина е 140 знаци." -#: actions/apistatusesupdate.php:193 +#: actions/apistatusesupdate.php:198 msgid "Not found" msgstr "" -#: actions/apistatusesupdate.php:216 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:227 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -483,7 +531,7 @@ msgid "Invalid size." msgstr "Погрешна големина." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:113 +#: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "Ðватар" @@ -532,7 +580,7 @@ msgstr "" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:151 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -1638,7 +1686,7 @@ msgid "Nickname" msgstr "Прекар" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Лозинка" @@ -1775,7 +1823,7 @@ msgstr "" #: actions/noticesearch.php:124 #, php-format msgid "" -"Why not [register an account](%%%%action.register%%%%) and be the first to " +"Why not [register an account](%%%%action.register%%%%) and be the first to " "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" msgstr "" @@ -1820,8 +1868,8 @@ msgstr "Поврзи Ñе" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963 -#: lib/api.php:991 lib/api.php:1101 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 +#: lib/api.php:1027 lib/api.php:1137 msgid "Not a supported data format." msgstr "" @@ -1842,11 +1890,15 @@ msgstr "ПоÑтавки" msgid "Manage various other options." msgstr "" -#: actions/othersettings.php:117 +#: actions/othersettings.php:108 +msgid " (free service)" +msgstr "" + +#: actions/othersettings.php:116 msgid "Shorten URLs with" msgstr "" -#: actions/othersettings.php:118 +#: actions/othersettings.php:117 msgid "Automatic shortening service to use." msgstr "" @@ -1882,66 +1934,62 @@ msgstr "" msgid "Change password" msgstr "Промени ја лозинката" -#: actions/passwordsettings.php:70 -msgid "You are not allowed to change your password" -msgstr "" - -#: actions/passwordsettings.php:82 +#: actions/passwordsettings.php:69 #, fuzzy msgid "Change your password." msgstr "Промени ја лозинката" -#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:96 actions/recoverpassword.php:231 #, fuzzy msgid "Password change" msgstr "Лозинката е Ñнимена." -#: actions/passwordsettings.php:117 +#: actions/passwordsettings.php:104 msgid "Old password" msgstr "Стара лозинка" -#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:108 actions/recoverpassword.php:235 msgid "New password" msgstr "Ðова лозинка" -#: actions/passwordsettings.php:122 +#: actions/passwordsettings.php:109 msgid "6 or more characters" msgstr "6 или повеќе знаци" -#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:112 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Потврди" -#: actions/passwordsettings.php:126 +#: actions/passwordsettings.php:113 msgid "same as password above" msgstr "иÑто како лозинката погоре" -#: actions/passwordsettings.php:130 +#: actions/passwordsettings.php:117 msgid "Change" msgstr "Промени" -#: actions/passwordsettings.php:167 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "" -#: actions/passwordsettings.php:170 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:233 msgid "Passwords don't match." msgstr "Лозинките не Ñе Ñовпаѓаат." -#: actions/passwordsettings.php:178 +#: actions/passwordsettings.php:165 msgid "Incorrect old password" msgstr "Ðеточна Ñтара лозинка" -#: actions/passwordsettings.php:194 +#: actions/passwordsettings.php:181 msgid "Error saving user; invalid." msgstr "Грешка во Ñнимањето на кориÑникот; неправилен." -#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Ðовата лозинка не може да Ñе Ñними" -#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:192 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Лозинката е Ñнимена." @@ -2382,7 +2430,7 @@ msgid "Same as password above. Required." msgstr "" #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:122 +#: lib/accountsettingsaction.php:120 msgid "Email" msgstr "Е-пошта" @@ -3290,37 +3338,37 @@ msgstr "Проблем во Ñнимањето на извеÑтувањето." msgid "DB error inserting reply: %s" msgstr "Одговор од внеÑот во базата: %s" -#: classes/User.php:333 +#: classes/User.php:347 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" -#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Профил" -#: lib/accountsettingsaction.php:110 +#: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "" -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:112 #, fuzzy msgid "Upload an avatar" msgstr "Товарањето на аватарот не уÑпеа." -#: lib/accountsettingsaction.php:119 +#: lib/accountsettingsaction.php:116 msgid "Change your password" msgstr "" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:120 msgid "Change email handling" msgstr "" -#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 +#: lib/accountsettingsaction.php:124 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:126 +#: lib/accountsettingsaction.php:124 #, fuzzy msgid "Design your profile" msgstr "КориÑникот нема профил." @@ -3329,7 +3377,7 @@ msgstr "КориÑникот нема профил." msgid "Other" msgstr "" -#: lib/accountsettingsaction.php:129 +#: lib/accountsettingsaction.php:128 msgid "Other options" msgstr "" @@ -3504,21 +3552,21 @@ msgstr "" msgid "license." msgstr "" -#: lib/action.php:1053 +#: lib/action.php:1052 msgid "Pagination" msgstr "" -#: lib/action.php:1062 +#: lib/action.php:1061 #, fuzzy msgid "After" msgstr "« Следни" -#: lib/action.php:1070 +#: lib/action.php:1069 #, fuzzy msgid "Before" msgstr "Предходни »" -#: lib/action.php:1119 +#: lib/action.php:1117 msgid "There was a problem with your session token." msgstr "" @@ -3690,13 +3738,46 @@ msgstr "OpenID формуларот не може да Ñе креира:%s" msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:613 +#: lib/command.php:618 +#, fuzzy +msgid "You are not subscribed to anyone." +msgstr "Ðе ни го иÑпративте тој профил." + +#: lib/command.php:620 +#, fuzzy +msgid "You are subscribed to these people: " +msgstr "Ðе ни го иÑпративте тој профил." + +#: lib/command.php:637 +#, fuzzy +msgid "No one is subscribed to you." +msgstr "Оддалечена претплата" + +#: lib/command.php:639 +#, fuzzy +msgid "These people are subscribed to you: " +msgstr "Оддалечена претплата" + +#: lib/command.php:656 +#, fuzzy +msgid "You are not a member of any groups." +msgstr "Ðе ни го иÑпративте тој профил." + +#: lib/command.php:658 +#, fuzzy +msgid "You are a member of these groups: " +msgstr "Ðе ни го иÑпративте тој профил." + +#: lib/command.php:670 msgid "" "Commands:\n" "on - turn on notifications\n" "off - turn off notifications\n" "help - show this help\n" "follow <nickname> - subscribe to user\n" +"groups - lists the groups you have joined\n" +"subscriptions - list the people you follow\n" +"subscribers - list the people that follow you\n" "leave <nickname> - unsubscribe from user\n" "d <nickname> <text> - direct message to user\n" "get <nickname> - get last notice from user\n" @@ -3726,20 +3807,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:191 +#: lib/common.php:192 #, fuzzy msgid "No configuration file found. " msgstr "Ðема код за потврда." -#: lib/common.php:192 +#: lib/common.php:193 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:193 +#: lib/common.php:194 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:194 +#: lib/common.php:195 msgid "Go to the installer." msgstr "" @@ -4012,8 +4093,8 @@ msgstr "" #: lib/jabber.php:192 #, php-format -msgid "notice id: %s" -msgstr "Ðово извеÑтување" +msgid "[%s]" +msgstr "" #: lib/joinform.php:114 #, fuzzy @@ -4534,7 +4615,8 @@ msgid "Could not subscribe other to you." msgstr "" #: lib/subs.php:124 -msgid "Not subscribed!." +#, fuzzy +msgid "Not subscribed!" msgstr "Ðе Ñте претплатени!" #: lib/subs.php:136 @@ -4583,47 +4665,47 @@ msgstr "" msgid "Message" msgstr "" -#: lib/util.php:818 +#: lib/util.php:821 msgid "a few seconds ago" msgstr "пред неколку Ñекунди" -#: lib/util.php:820 +#: lib/util.php:823 msgid "about a minute ago" msgstr "пред една минута" -#: lib/util.php:822 +#: lib/util.php:825 #, php-format msgid "about %d minutes ago" msgstr "пред %d минути" -#: lib/util.php:824 +#: lib/util.php:827 msgid "about an hour ago" msgstr "пред еден чаÑ" -#: lib/util.php:826 +#: lib/util.php:829 #, php-format msgid "about %d hours ago" msgstr "пред %d чаÑа" -#: lib/util.php:828 +#: lib/util.php:831 msgid "about a day ago" msgstr "пред еден ден" -#: lib/util.php:830 +#: lib/util.php:833 #, php-format msgid "about %d days ago" msgstr "пред %d денови" -#: lib/util.php:832 +#: lib/util.php:835 msgid "about a month ago" msgstr "пред еден меÑец" -#: lib/util.php:834 +#: lib/util.php:837 #, php-format msgid "about %d months ago" msgstr "пред %d меÑеци" -#: lib/util.php:836 +#: lib/util.php:839 msgid "about a year ago" msgstr "пред една година" diff --git a/locale/nb/LC_MESSAGES/statusnet.mo b/locale/nb/LC_MESSAGES/statusnet.mo Binary files differindex 80e30b11f..ee9dea03a 100644 --- a/locale/nb/LC_MESSAGES/statusnet.mo +++ b/locale/nb/LC_MESSAGES/statusnet.mo diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po index fa895ce1c..0ced02905 100644 --- a/locale/nb/LC_MESSAGES/statusnet.po +++ b/locale/nb/LC_MESSAGES/statusnet.po @@ -11,12 +11,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-10 20:53+0000\n" -"PO-Revision-Date: 2009-11-10 20:59:24+0000\n" +"POT-Creation-Date: 2009-11-16 19:42+0000\n" +"PO-Revision-Date: 2009-11-16 19:43:51+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(r58872); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: no\n" "X-Message-Group: out-statusnet\n" @@ -28,12 +28,15 @@ msgid "No such page" msgstr "Klarte ikke Ã¥ lagre profil." #: actions/all.php:74 actions/allrss.php:68 -#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofilebackgroundimage.php:116 +#: actions/apiaccountupdateprofileimage.php:105 +#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 #: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 #: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 @@ -112,35 +115,42 @@ msgstr "%s og venner" msgid "Updates from %1$s and friends on %2$s!" msgstr "" -#: actions/apiaccountratelimitstatus.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 -#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:129 actions/apigroupcreate.php:184 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120 -#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101 -#: actions/apigroupshow.php:105 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144 -#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141 -#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130 -#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163 -#: actions/apiusershow.php:101 -msgid "API method not found!" +#: actions/apiaccountratelimitstatus.php:70 +#: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofilebackgroundimage.php:94 +#: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apiaccountupdateprofile.php:97 +#, fuzzy +msgid "API method not found." msgstr "API-metode ikke funnet!" -#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 +#: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofilebackgroundimage.php:86 +#: actions/apiaccountupdateprofilecolors.php:110 +#: actions/apiaccountupdateprofileimage.php:84 +#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109 +#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "" +#: actions/apiaccountupdatedeliverydevice.php:105 +msgid "" +"You must specify a parameter named 'device' with a value of one of: sms, im, " +"none" +msgstr "" + +#: actions/apiaccountupdatedeliverydevice.php:132 +#, fuzzy +msgid "Could not update user." +msgstr "Klarte ikke Ã¥ oppdatere bruker." + +#: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 #: actions/newnotice.php:94 lib/designsettings.php:283 #, php-format msgid "" @@ -148,12 +158,33 @@ msgid "" "current configuration." msgstr "" -#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/apiaccountupdateprofilebackgroundimage.php:136 +#: actions/apiaccountupdateprofilebackgroundimage.php:146 +#: actions/apiaccountupdateprofilecolors.php:164 +#: actions/apiaccountupdateprofilecolors.php:174 +msgid "Unable to save your design settings." +msgstr "" + +#: actions/apiaccountupdateprofilebackgroundimage.php:187 +#: actions/apiaccountupdateprofilecolors.php:142 +#, fuzzy +msgid "Could not update your design." +msgstr "Klarte ikke Ã¥ oppdatere bruker." + +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 +#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 #: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 msgid "User has no profile." msgstr "" +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "Klarte ikke Ã¥ lagre profil." + #: actions/apiblockcreate.php:108 msgid "Block user failed." msgstr "" @@ -199,6 +230,23 @@ msgstr "" msgid "All the direct messages sent to %s" msgstr "" +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 +#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 +#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 +#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149 +#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +msgid "API method not found!" +msgstr "API-metode ikke funnet!" + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -393,17 +441,17 @@ msgstr "" msgid "No status with that ID found." msgstr "" -#: actions/apistatusesupdate.php:152 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 #: scripts/maildaemon.php:71 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" -#: actions/apistatusesupdate.php:193 +#: actions/apistatusesupdate.php:198 msgid "Not found" msgstr "" -#: actions/apistatusesupdate.php:216 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:227 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -486,7 +534,7 @@ msgid "Invalid size." msgstr "Ugyldig størrelse" #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:113 +#: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "Brukerbilde" @@ -536,7 +584,7 @@ msgstr "" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:151 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -1640,7 +1688,7 @@ msgid "Nickname" msgstr "Nick" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Passord" @@ -1770,7 +1818,7 @@ msgstr "" #: actions/noticesearch.php:124 #, php-format msgid "" -"Why not [register an account](%%%%action.register%%%%) and be the first to " +"Why not [register an account](%%%%action.register%%%%) and be the first to " "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" msgstr "" @@ -1814,8 +1862,8 @@ msgstr "" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963 -#: lib/api.php:991 lib/api.php:1101 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 +#: lib/api.php:1027 lib/api.php:1137 msgid "Not a supported data format." msgstr "" @@ -1836,11 +1884,15 @@ msgstr "Innstillinger for IM" msgid "Manage various other options." msgstr "" -#: actions/othersettings.php:117 +#: actions/othersettings.php:108 +msgid " (free service)" +msgstr "" + +#: actions/othersettings.php:116 msgid "Shorten URLs with" msgstr "" -#: actions/othersettings.php:118 +#: actions/othersettings.php:117 msgid "Automatic shortening service to use." msgstr "" @@ -1875,67 +1927,62 @@ msgstr "" msgid "Change password" msgstr "Endre passord" -#: actions/passwordsettings.php:70 -#, fuzzy -msgid "You are not allowed to change your password" -msgstr "Endre passordet ditt" - -#: actions/passwordsettings.php:82 +#: actions/passwordsettings.php:69 #, fuzzy msgid "Change your password." msgstr "Endre passord" -#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:96 actions/recoverpassword.php:231 #, fuzzy msgid "Password change" msgstr "Passordet ble lagret" -#: actions/passwordsettings.php:117 +#: actions/passwordsettings.php:104 msgid "Old password" msgstr "Gammelt passord" -#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:108 actions/recoverpassword.php:235 msgid "New password" msgstr "Nytt passord" -#: actions/passwordsettings.php:122 +#: actions/passwordsettings.php:109 msgid "6 or more characters" msgstr "6 eller flere tegn" -#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:112 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Bekreft" -#: actions/passwordsettings.php:126 +#: actions/passwordsettings.php:113 msgid "same as password above" msgstr "" -#: actions/passwordsettings.php:130 +#: actions/passwordsettings.php:117 msgid "Change" msgstr "Endre" -#: actions/passwordsettings.php:167 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "" -#: actions/passwordsettings.php:170 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:233 msgid "Passwords don't match." msgstr "" -#: actions/passwordsettings.php:178 +#: actions/passwordsettings.php:165 msgid "Incorrect old password" msgstr "Feil gammelt passord" -#: actions/passwordsettings.php:194 +#: actions/passwordsettings.php:181 msgid "Error saving user; invalid." msgstr "" -#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Klarer ikke Ã¥ lagre nytt passord." -#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:192 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Passordet ble lagret" @@ -2367,7 +2414,7 @@ msgid "Same as password above. Required." msgstr "" #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:122 +#: lib/accountsettingsaction.php:120 msgid "Email" msgstr "E-post" @@ -3264,36 +3311,36 @@ msgstr "" msgid "DB error inserting reply: %s" msgstr "" -#: classes/User.php:333 +#: classes/User.php:347 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" -#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Profil" -#: lib/accountsettingsaction.php:110 +#: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "Endre profilinnstillingene dine" -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:112 msgid "Upload an avatar" msgstr "" -#: lib/accountsettingsaction.php:119 +#: lib/accountsettingsaction.php:116 msgid "Change your password" msgstr "Endre passordet ditt" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:120 msgid "Change email handling" msgstr "Endre eposthÃ¥ndtering" -#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 +#: lib/accountsettingsaction.php:124 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:126 +#: lib/accountsettingsaction.php:124 #, fuzzy msgid "Design your profile" msgstr "Klarte ikke Ã¥ lagre profil." @@ -3302,7 +3349,7 @@ msgstr "Klarte ikke Ã¥ lagre profil." msgid "Other" msgstr "" -#: lib/accountsettingsaction.php:129 +#: lib/accountsettingsaction.php:128 msgid "Other options" msgstr "" @@ -3469,20 +3516,20 @@ msgstr "" msgid "license." msgstr "" -#: lib/action.php:1053 +#: lib/action.php:1052 msgid "Pagination" msgstr "" -#: lib/action.php:1062 +#: lib/action.php:1061 msgid "After" msgstr "" -#: lib/action.php:1070 +#: lib/action.php:1069 #, fuzzy msgid "Before" msgstr "Tidligere »" -#: lib/action.php:1119 +#: lib/action.php:1117 msgid "There was a problem with your session token." msgstr "" @@ -3653,13 +3700,46 @@ msgstr "Klarte ikke Ã¥ lagre avatar-informasjonen" msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:613 +#: lib/command.php:618 +#, fuzzy +msgid "You are not subscribed to anyone." +msgstr "Ikke autorisert." + +#: lib/command.php:620 +#, fuzzy +msgid "You are subscribed to these people: " +msgstr "Svar til %s" + +#: lib/command.php:637 +#, fuzzy +msgid "No one is subscribed to you." +msgstr "Svar til %s" + +#: lib/command.php:639 +#, fuzzy +msgid "These people are subscribed to you: " +msgstr "Svar til %s" + +#: lib/command.php:656 +#, fuzzy +msgid "You are not a member of any groups." +msgstr "Du er allerede logget inn!" + +#: lib/command.php:658 +#, fuzzy +msgid "You are a member of these groups: " +msgstr "Du er allerede logget inn!" + +#: lib/command.php:670 msgid "" "Commands:\n" "on - turn on notifications\n" "off - turn off notifications\n" "help - show this help\n" "follow <nickname> - subscribe to user\n" +"groups - lists the groups you have joined\n" +"subscriptions - list the people you follow\n" +"subscribers - list the people that follow you\n" "leave <nickname> - unsubscribe from user\n" "d <nickname> <text> - direct message to user\n" "get <nickname> - get last notice from user\n" @@ -3689,20 +3769,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:191 +#: lib/common.php:192 #, fuzzy msgid "No configuration file found. " msgstr "Fant ikke bekreftelseskode." -#: lib/common.php:192 +#: lib/common.php:193 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:193 +#: lib/common.php:194 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:194 +#: lib/common.php:195 msgid "Go to the installer." msgstr "" @@ -3974,7 +4054,7 @@ msgstr "" #: lib/jabber.php:192 #, php-format -msgid "notice id: %s" +msgid "[%s]" msgstr "" #: lib/joinform.php:114 @@ -4493,8 +4573,9 @@ msgid "Could not subscribe other to you." msgstr "" #: lib/subs.php:124 -msgid "Not subscribed!." -msgstr "" +#, fuzzy +msgid "Not subscribed!" +msgstr "Alle abonnementer" #: lib/subs.php:136 msgid "Couldn't delete subscription." @@ -4542,47 +4623,47 @@ msgstr "" msgid "Message" msgstr "" -#: lib/util.php:818 +#: lib/util.php:821 msgid "a few seconds ago" msgstr "noen fÃ¥ sekunder siden" -#: lib/util.php:820 +#: lib/util.php:823 msgid "about a minute ago" msgstr "omtrent ett minutt siden" -#: lib/util.php:822 +#: lib/util.php:825 #, php-format msgid "about %d minutes ago" msgstr "omtrent %d minutter siden" -#: lib/util.php:824 +#: lib/util.php:827 msgid "about an hour ago" msgstr "omtrent én time siden" -#: lib/util.php:826 +#: lib/util.php:829 #, php-format msgid "about %d hours ago" msgstr "omtrent %d timer siden" -#: lib/util.php:828 +#: lib/util.php:831 msgid "about a day ago" msgstr "omtrent én dag siden" -#: lib/util.php:830 +#: lib/util.php:833 #, php-format msgid "about %d days ago" msgstr "omtrent %d dager siden" -#: lib/util.php:832 +#: lib/util.php:835 msgid "about a month ago" msgstr "omtrent én mÃ¥ned siden" -#: lib/util.php:834 +#: lib/util.php:837 #, php-format msgid "about %d months ago" msgstr "omtrent %d mÃ¥neder siden" -#: lib/util.php:836 +#: lib/util.php:839 msgid "about a year ago" msgstr "omtrent ett Ã¥r siden" diff --git a/locale/nl/LC_MESSAGES/statusnet.mo b/locale/nl/LC_MESSAGES/statusnet.mo Binary files differindex 74e52e10d..ff15e5ade 100644 --- a/locale/nl/LC_MESSAGES/statusnet.mo +++ b/locale/nl/LC_MESSAGES/statusnet.mo diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po index 42b776809..2f3944f4e 100644 --- a/locale/nl/LC_MESSAGES/statusnet.po +++ b/locale/nl/LC_MESSAGES/statusnet.po @@ -7,12 +7,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-10 20:53+0000\n" -"PO-Revision-Date: 2009-11-10 20:59:29+0000\n" +"POT-Creation-Date: 2009-11-16 19:42+0000\n" +"PO-Revision-Date: 2009-11-16 19:43:59+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: nl\n" "X-Message-Group: out-statusnet\n" @@ -23,12 +23,15 @@ msgid "No such page" msgstr "Deze pagina bestaat niet" #: actions/all.php:74 actions/allrss.php:68 -#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofilebackgroundimage.php:116 +#: actions/apiaccountupdateprofileimage.php:105 +#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 #: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 #: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 @@ -94,8 +97,8 @@ msgid "" "or her attention](%%%%action.newnotice%%%%?status_textarea=%s)." msgstr "" "U kunt proberen [%s te porren](../%s) op de eigen profielpagina of [een " -"bericht aan die gebruiker richten](%%%%action.newnotice%%%%?status_textarea=%" -"s)." +"bericht voor die gebruiker plaatsen](%%%%action.newnotice%%%%?" +"status_textarea=%s)." #: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202 #, php-format @@ -103,6 +106,8 @@ msgid "" "Why not [register an account](%%%%action.register%%%%) and then nudge %s or " "post a notice to his or her attention." msgstr "" +"U kunt een [gebruiker registeren](%%%%action.register%%%%) en %s dan porren " +"of een een bericht voor die gebruiker plaatsen." #: actions/all.php:165 msgid "You and friends" @@ -113,35 +118,42 @@ msgstr "U en vrienden" msgid "Updates from %1$s and friends on %2$s!" msgstr "Updates van %1$s en vrienden op %2$s." -#: actions/apiaccountratelimitstatus.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 -#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:129 actions/apigroupcreate.php:184 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120 -#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101 -#: actions/apigroupshow.php:105 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144 -#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141 -#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130 -#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163 -#: actions/apiusershow.php:101 -msgid "API method not found!" -msgstr "De API-functie is niet aangetroffen!" - -#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 +#: actions/apiaccountratelimitstatus.php:70 +#: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofilebackgroundimage.php:94 +#: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apiaccountupdateprofile.php:97 +msgid "API method not found." +msgstr "De API-functie is niet aangetroffen." + +#: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofilebackgroundimage.php:86 +#: actions/apiaccountupdateprofilecolors.php:110 +#: actions/apiaccountupdateprofileimage.php:84 +#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109 +#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "Deze methode heeft een POST nodig." +#: actions/apiaccountupdatedeliverydevice.php:105 +msgid "" +"You must specify a parameter named 'device' with a value of one of: sms, im, " +"none" +msgstr "" +"U moet een parameter met de naam \"device\" opgeven met een waarde uit de " +"volgende lijst: sms, im, none" + +#: actions/apiaccountupdatedeliverydevice.php:132 +msgid "Could not update user." +msgstr "Het was niet mogelijk de gebruiker te actualiseren." + +#: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 #: actions/newnotice.php:94 lib/designsettings.php:283 #, php-format msgid "" @@ -151,12 +163,31 @@ msgstr "" "De server was niet in staat zoveel POST-gegevens af te handelen (%s bytes) " "vanwege de huidige instellingen." -#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/apiaccountupdateprofilebackgroundimage.php:136 +#: actions/apiaccountupdateprofilebackgroundimage.php:146 +#: actions/apiaccountupdateprofilecolors.php:164 +#: actions/apiaccountupdateprofilecolors.php:174 +msgid "Unable to save your design settings." +msgstr "Het was niet mogelijk om uw ontwerpinstellingen op te slaan." + +#: actions/apiaccountupdateprofilebackgroundimage.php:187 +#: actions/apiaccountupdateprofilecolors.php:142 +msgid "Could not update your design." +msgstr "Het was niet mogelijk uw ontwerp bij te werken." + +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 +#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 #: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 msgid "User has no profile." msgstr "Deze gebruiker heeft geen profiel." +#: actions/apiaccountupdateprofile.php:147 +msgid "Could not save profile." +msgstr "Het was niet mogelijk het profiel op te slaan." + #: actions/apiblockcreate.php:108 msgid "Block user failed." msgstr "Het blokkeren van de gebruiker is mislukt." @@ -204,6 +235,23 @@ msgstr "Directe beichten aan %s" msgid "All the direct messages sent to %s" msgstr "Alle directe berichten verzonden aan %s" +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 +#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 +#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 +#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149 +#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +msgid "API method not found!" +msgstr "De API-functie is niet aangetroffen!" + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -395,17 +443,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:152 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 #: scripts/maildaemon.php:71 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Dat is te lang. De maximale mededelingslengte is 140 tekens." -#: actions/apistatusesupdate.php:193 +#: actions/apistatusesupdate.php:198 msgid "Not found" msgstr "Niet gevonden" -#: actions/apistatusesupdate.php:216 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:227 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -489,7 +537,7 @@ msgid "Invalid size." msgstr "Ongeldige afmetingen." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:113 +#: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "Avatar" @@ -538,7 +586,7 @@ msgstr "Uitsnijden" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:151 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -647,6 +695,10 @@ msgid "" "unsubscribed from you, unable to subscribe to you in the future, and you " "will not be notified of any @-replies from them." msgstr "" +"Weet u zeker dat u deze gebruiker wilt blokkeren? Na deze handeling wordt " +"het abonnement van de gebruiker op u opgezegd en kan deze gebruiker in de " +"toekomst niet op u abonneren. U wordt niet op de hoogte gesteld van \"@\"-" +"antwoorden van de gebruiker." #: actions/block.php:149 actions/deletenotice.php:145 #: actions/groupblock.php:178 @@ -654,9 +706,8 @@ msgid "No" msgstr "Nee" #: actions/block.php:149 -#, fuzzy msgid "Do not block this user" -msgstr "Deblokkeer deze gebruiker." +msgstr "Gebruiker deblokkeren" #: actions/block.php:150 actions/deletenotice.php:146 #: actions/groupblock.php:179 @@ -1036,6 +1087,8 @@ msgid "" "Why not [register an account](%%action.register%%) and be the first to add a " "notice to your favorites!" msgstr "" +"U kunt een [gebruiker registreren](%%action.register%%) en de eerste " +"mededeling voor de favorietenlijst plaatsen!" #: actions/favoritesrss.php:111 actions/showfavorites.php:77 #: lib/personalgroupnav.php:115 @@ -1165,6 +1218,9 @@ msgid "" "be removed from the group, unable to post, and unable to subscribe to the " "group in the future." msgstr "" +"Weet u zeker dat u gebruiker \"%s\" uit de groep \"%s\" wilt weren? De " +"gebruiker wordt dan uit de groep verwijderd, kan er geen berichten meer " +"plaatsen en kan zich in de toekomst ook niet meer op de groep abonneren." #: actions/groupblock.php:178 msgid "Do not block this user from this group" @@ -1197,6 +1253,8 @@ msgid "" "Customize the way your group looks with a background image and a colour " "palette of your choice." msgstr "" +"Het uiterlijk van uw groep aanpassen met een achtergrondafbeeldingen en een " +"kleurenpalet van uw keuze." #: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186 #: lib/designsettings.php:434 lib/designsettings.php:464 @@ -1301,6 +1359,8 @@ msgid "" "If you can't find the group you're looking for, you can [create it](%%action." "newgroup%%) yourself." msgstr "" +"Als u de groep waar u naar zoekt niet kunt vinden, dan kunt u deze zelf " +"[aanmaken](%%action.newgroup%%)." #: actions/groupsearch.php:85 #, php-format @@ -1308,6 +1368,8 @@ msgid "" "Why not [register an account](%%action.register%%) and [create the group](%%" "action.newgroup%%) yourself!" msgstr "" +"U kunt een [gebruiker registreren](%%action.register%%) en de groep zelf " +"[aanmaken](%%action.newgroup%%)!" #: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81 #: lib/subgroupnav.php:98 @@ -1328,6 +1390,12 @@ msgid "" "for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" "%%%%)" msgstr "" +"Met groepen van %%%%site.name%%%% kunt u gebruikers vinden met gelijke " +"interessen en daarmee in contact treden. Nadat u lid bent geworden van een " +"groep, kunt u berichten naar alle gebruikers zenden met door het voorvoegsel " +"\"!groepsnaam\" te gebruiken. Als u geen groep ziet die u aantreft, " +"[doorzoek dan de groepen](%%%%action.groupsearch%%%%) of [start zelf een " +"groep!](%%%%action.newgroup%%%%)." #: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 msgid "Create a new group" @@ -1668,7 +1736,7 @@ msgid "Nickname" msgstr "Gebruikersnaam" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Wachtwoord" @@ -1799,13 +1867,18 @@ msgid "" "Be the first to [post on this topic](%%%%action.newnotice%%%%?" "status_textarea=%s)!" msgstr "" +"U kunt de eerste zijn die een bericht plaatst in [dit onderwerp](%%%%action." +"newnotice%%%%?status_textarea=%s)!" #: actions/noticesearch.php:124 #, php-format msgid "" -"Why not [register an account](%%%%action.register%%%%) and be the first to " +"Why not [register an account](%%%%action.register%%%%) and be the first to " "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" msgstr "" +"U kunt een [gebruiker registeren](%%%%action.register%%%%) en dan de eerste " +"zijn die een bericht plaatst in [dit onderwerp](%%%%action.newnotice%%%%?" +"status_textarea=%s)!" #: actions/noticesearchrss.php:89 #, php-format @@ -1849,8 +1922,8 @@ msgstr "inhoudstype " msgid "Only " msgstr "Alleen " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963 -#: lib/api.php:991 lib/api.php:1101 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 +#: lib/api.php:1027 lib/api.php:1137 msgid "Not a supported data format." msgstr "Geen ondersteund gegevensformaat." @@ -1870,11 +1943,15 @@ msgstr "Overige instellingen" msgid "Manage various other options." msgstr "Overige instellingen beheren." -#: actions/othersettings.php:117 +#: actions/othersettings.php:108 +msgid " (free service)" +msgstr " (gratis dienst)" + +#: actions/othersettings.php:116 msgid "Shorten URLs with" msgstr "URL's inkorten met" -#: actions/othersettings.php:118 +#: actions/othersettings.php:117 msgid "Automatic shortening service to use." msgstr "Te gebruiken automatische verkortingsdienst." @@ -1908,65 +1985,60 @@ msgstr "Dit is uw Postvak UIT waarin de door u verzonden privéberichten staan." msgid "Change password" msgstr "Wachtwoord wijzigen" -#: actions/passwordsettings.php:70 -#, fuzzy -msgid "You are not allowed to change your password" -msgstr "Uw wachtwoord wijzigen" - -#: actions/passwordsettings.php:82 +#: actions/passwordsettings.php:69 msgid "Change your password." msgstr "Wachtwoord wijzigen" -#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:96 actions/recoverpassword.php:231 msgid "Password change" msgstr "Wachtwoord wijzigen" -#: actions/passwordsettings.php:117 +#: actions/passwordsettings.php:104 msgid "Old password" msgstr "Oud wachtwoord" -#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:108 actions/recoverpassword.php:235 msgid "New password" msgstr "Nieuw wachtwoord" -#: actions/passwordsettings.php:122 +#: actions/passwordsettings.php:109 msgid "6 or more characters" msgstr "Zes of meer tekens" -#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:112 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Bevestigen" -#: actions/passwordsettings.php:126 +#: actions/passwordsettings.php:113 msgid "same as password above" msgstr "gelijk aan wachtwoord hierboven" -#: actions/passwordsettings.php:130 +#: actions/passwordsettings.php:117 msgid "Change" msgstr "Wijzigen" -#: actions/passwordsettings.php:167 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "Het wachtwoord moet zes of meer tekens bevatten." -#: actions/passwordsettings.php:170 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:233 msgid "Passwords don't match." msgstr "De wachtwoorden komen niet overeen." -#: actions/passwordsettings.php:178 +#: actions/passwordsettings.php:165 msgid "Incorrect old password" msgstr "Het oude wachtwoord is onjuist" -#: actions/passwordsettings.php:194 +#: actions/passwordsettings.php:181 msgid "Error saving user; invalid." msgstr "Fout bij opslaan gebruiker; ongeldig." -#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Het was niet mogelijk het nieuwe wachtwoord op te slaan." -#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:192 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Het wachtwoord is opgeslagen." @@ -2171,6 +2243,8 @@ msgid "" "This is the public timeline for %%site.name%% but no one has posted anything " "yet." msgstr "" +"Dit is de publieke tijdlijn voor %%site.name%%, maar niemand heeft nog " +"berichten geplaatst." #: actions/public.php:182 msgid "Be the first to post!" @@ -2192,6 +2266,11 @@ msgid "" "tool. [Join now](%%action.register%%) to share notices about yourself with " "friends, family, and colleagues! ([Read more](%%doc.help%%))" msgstr "" +"Dit is %%site.name%%, een [microblogdienst](http://en.wikipedia.org/wiki/" +"Micro-blogging) gebaseerd op de Vrije Software [StatusNet](http://status." +"net/). [Registreer nu](%%%%action.register%%%%) om mededelingen over uzelf " +"te delen met vrienden, familie en collega's! [Meer lezen...](%%%%doc.help%%%" +"%)" #: actions/public.php:238 #, php-format @@ -2200,8 +2279,9 @@ msgid "" "blogging) service based on the Free Software [StatusNet](http://status.net/) " "tool." msgstr "" -"Dit is %%site.name%%, [microblogdienst](http://en.wikipedia.org/wiki/Micro-" -"blogging) gebaseerd op de Vrije Software [StatusNet](http://status.net/)" +"Dit is %%site.name%%, een [microblogdienst](http://en.wikipedia.org/wiki/" +"Micro-blogging) gebaseerd op de Vrije Software [StatusNet](http://status." +"net/)" #: actions/publictagcloud.php:57 msgid "Public tag cloud" @@ -2228,6 +2308,8 @@ msgid "" "Why not [register an account](%%action.register%%) and be the first to post " "one!" msgstr "" +"U kunt een [gebruiker registeren](%%%%action.register%%%%) en dan de eerste " +"zijn die er een plaatst!" #: actions/publictagcloud.php:135 msgid "Tag cloud" @@ -2268,10 +2350,13 @@ msgid "" "If you have forgotten or lost your password, you can get a new one sent to " "the email address you have stored in your account." msgstr "" +"Als u uw wachtwoord kwijt bent of vergeten bent, dan is het mogelijk een " +"nieuw wachtwoord toegezonden te krijgen op het e-mailadres dat bij uw " +"gebruiker staat opgeslagen." #: actions/recoverpassword.php:158 msgid "You have been identified. Enter a new password below. " -msgstr "" +msgstr "U bent geïdentificeerd. Voer hieronder een nieuw wachtwoord in. " #: actions/recoverpassword.php:188 msgid "Password recovery" @@ -2417,7 +2502,7 @@ msgid "Same as password above. Required." msgstr "Gelijk aan het wachtwoord hierboven. Verplicht" #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:122 +#: lib/accountsettingsaction.php:120 msgid "Email" msgstr "E-mail" @@ -2579,6 +2664,8 @@ msgid "" "This is the timeline showing replies to %s but %s hasn't received a notice " "to his attention yet." msgstr "" +"Dit is de tijdlijn met de antwoorden aan %s, maar %s heeft nog geen " +"antwoorden ontvangen." #: actions/replies.php:203 #, php-format @@ -2586,6 +2673,8 @@ msgid "" "You can engage other users in a conversation, subscribe to more people or " "[join groups](%%action.groups%%)." msgstr "" +"U kunt gesprekken aanknopen met andere gebruikers, op meer gebruikers " +"abonneren of [lid worden van groepen](%%action.groups%%)." #: actions/replies.php:205 #, php-format @@ -2593,6 +2682,8 @@ msgid "" "You can try to [nudge %s](../%s) or [post something to his or her attention]" "(%%%%action.newnotice%%%%?status_textarea=%s)." msgstr "" +"U kunt proberen [%s te porren](../%s) of [een bericht voor die gebruiker " +"plaatsen](%%%%action.newnotice%%%%?status_textarea=%s)." #: actions/repliesrss.php:72 #, php-format @@ -2628,6 +2719,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 "" +"U hebt nog geen favoriete mededelingen. Klik op de knop \"Aan favorieten " +"toevoegen\" bij mededelingen die u aanstaan om ze op een lijst te bewaren en " +"ze uit te lichten." #: actions/showfavorites.php:207 #, php-format @@ -2635,6 +2729,9 @@ msgid "" "%s hasn't added any notices to his favorites yet. Post something interesting " "they would add to their favorites :)" msgstr "" +"%s heeff nog geen mededelingen op de eigen favorietenlijst geplaatst. Plaats " +"een interessant bericht, en dan komt u misschien wel op de " +"favorietenlijst. :)" #: actions/showfavorites.php:211 #, php-format @@ -2643,6 +2740,9 @@ msgid "" "account](%%%%action.register%%%%) and then post something interesting they " "would add to their favorites :)" msgstr "" +"%s heeft nog geen favorietenlijst. U kunt een [gebruiker registeren](%%%%" +"action.register%%%%) en dan interessante mededelingen plaatsten die " +"misschien aan favorietenlijsten zijn toe te voegen. :)" #: actions/showfavorites.php:242 msgid "This is a way to share what you like." @@ -2731,6 +2831,12 @@ msgid "" "their life and interests. [Join now](%%%%action.register%%%%) to become part " "of this group and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" +"**%s** is een gebruikersgroep bij %%site.name%%, een [microblogdienst]" +"(http://en.wikipedia.org/wiki/Micro-blogging) gebaseerd op de Vrije Software " +"[StatusNet](http://status.net/). De groepsleden wisselen korte berichten uit " +"over hun leven en interesses. [Registreer nu](%%%%action.register%%%%) om " +"lid te worden van deze groep en nog veel meer! [Meer lezen...](%%%%doc.help%%" +"%%)" #: actions/showgroup.php:454 #, php-format @@ -2826,6 +2932,8 @@ msgid "" "You can try to nudge %s or [post something to his or her attention](%%%%" "action.newnotice%%%%?status_textarea=%s)." msgstr "" +"U kunt proberen %s te porren of [een bericht voor die gebruiker plaatsen](%%%" +"%action.newnotice%%%%?status_textarea=%s)." #: actions/showstream.php:234 #, php-format @@ -2835,6 +2943,10 @@ msgid "" "[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to " "follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" +"**%s** is actief op %%site.name%%, een [microblogdienst](http://en.wikipedia." +"org/wiki/Micro-blogging) gebaseerd op de Vrije Software [StatusNet](http://" +"status.net/). [Registreer nu](%%%%action.register%%%%) om te abonneren op de " +"mededelingen van **%s** en nog veel meer! [Meer lezen...](%%%%doc.help%%%%)" #: actions/showstream.php:239 #, php-format @@ -2843,7 +2955,7 @@ msgid "" "wikipedia.org/wiki/Micro-blogging) service based on the Free Software " "[StatusNet](http://status.net/) tool. " msgstr "" -"**%s** heeft een gebruiker op %%%%site.name%%%%, eena [microblogdienst]" +"**%s** heeft een gebruiker op %%%%site.name%%%%, een [microblogdienst]" "(http://en.wikipedia.org/wiki/Micro-blogging) gebaseerd op de Vrije Software " "[StatusNet](http://status.net/). " @@ -3031,6 +3143,12 @@ msgid "" "featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can " "automatically subscribe to people you already follow there." msgstr "" +"U bent op dit moment op geen enkele gebruiker geabonneerd. Abonneer u op " +"gebruikers die u kent. [Zoek gebruikers](%%action.peoplesearch%%), bekijk de " +"leden van groepen waar uw interesse naar uitgaat en kijk in de [lijst met " +"uitgelichte gebruikers](%%action.featured%%). Als u [Twitter gebruikt](%%" +"action.twittersettings%%), kunt u automatisch abonneren op de gebruikers die " +"u daar al volgt." #: actions/subscriptions.php:123 actions/subscriptions.php:127 #, php-format @@ -3139,6 +3257,8 @@ msgstr "Het abonnement is opgezegd" #, php-format msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’." msgstr "" +"De licentie \"%s\" voor de stream die u wilt volgen is niet compatibel met " +"de sitelicentie \"%s\"." #: actions/userauthorization.php:105 msgid "Authorize subscription" @@ -3216,12 +3336,12 @@ msgstr "De abonnee-URI \"%s\" is hier niet te vinden" #: actions/userauthorization.php:301 #, php-format msgid "Listenee URI ‘%s’ is too long." -msgstr "" +msgstr "De URI \"%s\" voor de stream is te lang." #: actions/userauthorization.php:307 #, php-format msgid "Listenee URI ‘%s’ is a local user." -msgstr "" +msgstr "de URI \"%s\" voor de stream is een lokale gebruiker." #: actions/userauthorization.php:322 #, php-format @@ -3256,6 +3376,8 @@ msgid "" "Customize the way your profile looks with a background image and a colour " "palette of your choice." msgstr "" +"U kunt het uiterlijk van uw profiel aanpassen door een achtergrondafbeelding " +"toe te voegen of het kleurenpalet aan te passen." #: actions/userdesignsettings.php:282 msgid "Enjoy your hotdog!" @@ -3279,6 +3401,7 @@ msgstr "%s is van geen enkele groep lid." #, php-format msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" +"U kunt [naar groepen zoeken](%%action.groupsearch%%) en daar lid van worden." #: classes/File.php:137 #, php-format @@ -3286,6 +3409,8 @@ msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" +"Bestanden mogen niet groter zijn dan %d bytes, en uw bestand was %d bytes. " +"Probeer een kleinere versie te uploaden." #: classes/File.php:147 #, php-format @@ -3354,36 +3479,36 @@ msgid "DB error inserting reply: %s" msgstr "" "Er is een databasefout opgetreden bij het invoegen van het antwoord: %s" -#: classes/User.php:333 +#: classes/User.php:347 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Welkom bij %1$s, @%2$s!" -#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Profiel" -#: lib/accountsettingsaction.php:110 +#: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "Uw profielgegevens wijzigen" -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:112 msgid "Upload an avatar" msgstr "Avatar uploaden" -#: lib/accountsettingsaction.php:119 +#: lib/accountsettingsaction.php:116 msgid "Change your password" msgstr "Uw wachtwoord wijzigen" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:120 msgid "Change email handling" msgstr "E-mailafhandeling wijzigen" -#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 +#: lib/accountsettingsaction.php:124 lib/groupnav.php:119 msgid "Design" msgstr "Ontwerp" -#: lib/accountsettingsaction.php:126 +#: lib/accountsettingsaction.php:124 msgid "Design your profile" msgstr "Uw profiel ontwerpen" @@ -3391,7 +3516,7 @@ msgstr "Uw profiel ontwerpen" msgid "Other" msgstr "Overige" -#: lib/accountsettingsaction.php:129 +#: lib/accountsettingsaction.php:128 msgid "Other options" msgstr "Overige instellingen" @@ -3479,7 +3604,7 @@ msgstr "Kennisgeving van site" #: lib/action.php:546 msgid "Local views" -msgstr "" +msgstr "Lokale weergaven" #: lib/action.php:612 msgid "Page notice" @@ -3558,19 +3683,19 @@ msgstr "Alle " msgid "license." msgstr "licentie." -#: lib/action.php:1053 +#: lib/action.php:1052 msgid "Pagination" msgstr "Paginering" -#: lib/action.php:1062 +#: lib/action.php:1061 msgid "After" msgstr "Na" -#: lib/action.php:1070 +#: lib/action.php:1069 msgid "Before" msgstr "Voor" -#: lib/action.php:1119 +#: lib/action.php:1117 msgid "There was a problem with your session token." msgstr "Er is een probleem met uw sessietoken." @@ -3750,13 +3875,47 @@ msgstr "" "Deze verwijzing kan slechts één keer gebruikt worden en is twee minuten " "geldig: %s" -#: lib/command.php:613 +#: lib/command.php:618 +#, fuzzy +msgid "You are not subscribed to anyone." +msgstr "U bent niet geabonneerd op dat profiel." + +#: lib/command.php:620 +#, fuzzy +msgid "You are subscribed to these people: " +msgstr "U bent niet geabonneerd op dat profiel." + +#: lib/command.php:637 +#, fuzzy +msgid "No one is subscribed to you." +msgstr "Het was niet mogelijk om een ander op u te laten abonneren" + +#: lib/command.php:639 +#, fuzzy +msgid "These people are subscribed to you: " +msgstr "Gebruikers met een abonnement op %s" + +#: lib/command.php:656 +#, fuzzy +msgid "You are not a member of any groups." +msgstr "U bent geen lid van deze groep" + +#: lib/command.php:658 +#, fuzzy +msgid "You are a member of these groups: " +msgstr "U bent geen lid van deze groep." + +#: lib/command.php:670 +#, fuzzy msgid "" "Commands:\n" "on - turn on notifications\n" "off - turn off notifications\n" "help - show this help\n" "follow <nickname> - subscribe to user\n" +"groups - lists the groups you have joined\n" +"subscriptions - list the people you follow\n" +"subscribers - list the people that follow you\n" "leave <nickname> - unsubscribe from user\n" "d <nickname> <text> - direct message to user\n" "get <nickname> - get last notice from user\n" @@ -3785,21 +3944,55 @@ msgid "" "tracks - not yet implemented.\n" "tracking - not yet implemented.\n" msgstr "" +"Commando's:\n" +"on - notificaties inschakelen\n" +"off - notificaties uitschakelen\n" +"help - deze hulptekst weergeven\n" +"follow <gebruiker> - abonneren op gebruiker\n" +"leave <gebruiker> - abonnement op gebruiker opzeggen\n" +"d <gebruiker> <tekst> - direct bericht aan gebruiker\n" +"get <gebruiker> - laatste mededeling van gebruiker opvragen\n" +"whois <gebruiker> - profielinformatie van gebruiker opvragen\n" +"fav <gebruiker> - laatste mededeling van gebruiker op favorietenlijst " +"zetten\n" +"fav #<mededeling-ID> - mededelingen met aangegeven ID op favorietenlijst " +"zetten\n" +"reply #<mededeling-ID> - antwoorden op de mededeling met het aangegeven ID\n" +"reply <gebruiker> - antwoorden op de laatste mededeling van gebruiker\n" +"join <groep> - lid worden van groep\n" +"login - verwijzing opvragen naar de webpagina voor aanmelden\n" +"drop <groep> - groepslidmaatschap opzeggen\n" +"stats - uw statistieken opvragen\n" +"stop - zelfde als 'off'\n" +"quit - zelfde als 'off'\n" +"sub <gebruiker> - zelfde als 'follow'\n" +"unsub <gebruiker> - zelfde als 'leave'\n" +"last <gebruiker> - zelfde als 'get'\n" +"on <gebruiker> - nog niet beschikbaar\n" +"off <gebruiker> - nog niet beschikbaar\n" +"nudge <gebruiker> - gebruiker porren\n" +"invite <phone number> - nog niet beschikbaar\n" +"track <word> - nog niet beschikbaar\n" +"untrack <word> - nog niet beschikbaar\n" +"track off - nog niet beschikbaar\n" +"untrack all - nog niet beschikbaar\n" +"tracks - nog niet beschikbaar\n" +"tracking - nog niet beschikbaar\n" -#: lib/common.php:191 +#: lib/common.php:192 msgid "No configuration file found. " msgstr "Er is geen instellingenbestand aangetroffen. " -#: lib/common.php:192 +#: lib/common.php:193 msgid "I looked for configuration files in the following places: " msgstr "Er is gezocht naar instellingenbestanden op de volgende plaatsen: " -#: lib/common.php:193 +#: lib/common.php:194 msgid "You may wish to run the installer to fix this." msgstr "" "U kunt proberen de installer uit te voeren om dit probleem op te lossen." -#: lib/common.php:194 +#: lib/common.php:195 msgid "Go to the installer." msgstr "Naar het installatieprogramma gaan." @@ -4026,7 +4219,7 @@ msgstr "Groepen met de meeste berichten" #: lib/grouptagcloudsection.php:56 #, php-format msgid "Tags in %s group's notices" -msgstr "" +msgstr "Labels in de groepsmededelingen van %s" #: lib/htmloutputter.php:104 msgid "This page is not available in a media type you accept" @@ -4063,8 +4256,8 @@ msgstr "Onbekend bestandstype" #: lib/jabber.php:192 #, php-format -msgid "notice id: %s" -msgstr "mededelingennummer: %s" +msgid "[%s]" +msgstr "[%s]" #: lib/joinform.php:114 msgid "Join" @@ -4236,6 +4429,18 @@ msgid "" "With kind regards,\n" "%4$s\n" msgstr "" +"%1$s (%2$s) vraagt zich af wat u tegenwoordig doet en nodigt u uit om dat te " +"delen.\n" +"\n" +"Laat dus iets van u horen!\n" +"\n" +"%3$s\n" +"\n" +"Schrijf geen antwoord op deze e-mail. Die komt niet aan bij de juiste " +"gebruiker.\n" +"\n" +"Met vriendelijke groet,\n" +"%4$s\n" #: lib/mail.php:509 #, php-format @@ -4260,6 +4465,21 @@ msgid "" "With kind regards,\n" "%5$s\n" msgstr "" +"%1$s (%2$s) heeft u een privébericht gezonden:\n" +"\n" +"------------------------------------------------------\n" +"%3$s\n" +"------------------------------------------------------\n" +"\n" +"Hier kunt u antwoorden:\n" +"\n" +"%4$s\n" +"\n" +"Schrijf geen antwoord op deze e-mail. Die komt niet aan bij de juiste " +"gebruiker.\n" +"\n" +"Met vriendelijke groet,\n" +"%5$s\n" #: lib/mail.php:554 #, php-format @@ -4286,6 +4506,23 @@ msgid "" "Faithfully yours,\n" "%6$s\n" msgstr "" +"%1$s (@%7$s) heeft uw mededeling van %2$s zojuist op de favorietenlijst " +"geplaatst.\n" +"\n" +"De URL van uw mededeling is:\n" +"\n" +"%3$s\n" +"\n" +"De inhoud van uw mededeling luidt:\n" +"\n" +"%4$s\n" +"\n" +"U kunt de favorietenlijst van %1$s via de volgende verwijzing bekijken:\n" +"\n" +"%5$s\n" +"\n" +"Met vriendelijke groet,\n" +"%6$s\n" #: lib/mail.php:611 #, php-format @@ -4616,7 +4853,7 @@ msgid "Could not subscribe other to you." msgstr "Het was niet mogelijk om een ander op u te laten abonneren" #: lib/subs.php:124 -msgid "Not subscribed!." +msgid "Not subscribed!" msgstr "Niet geabonneerd!" #: lib/subs.php:136 @@ -4663,47 +4900,47 @@ msgstr "Deze gebruiker een direct bericht zenden" msgid "Message" msgstr "Bericht" -#: lib/util.php:818 +#: lib/util.php:821 msgid "a few seconds ago" msgstr "een paar seconden geleden" -#: lib/util.php:820 +#: lib/util.php:823 msgid "about a minute ago" msgstr "ongeveer een minuut geleden" -#: lib/util.php:822 +#: lib/util.php:825 #, php-format msgid "about %d minutes ago" msgstr "ongeveer %d minuten geleden" -#: lib/util.php:824 +#: lib/util.php:827 msgid "about an hour ago" msgstr "ongeveer een uur geleden" -#: lib/util.php:826 +#: lib/util.php:829 #, php-format msgid "about %d hours ago" msgstr "ongeveer %d uur geleden" -#: lib/util.php:828 +#: lib/util.php:831 msgid "about a day ago" msgstr "ongeveer een dag geleden" -#: lib/util.php:830 +#: lib/util.php:833 #, php-format msgid "about %d days ago" msgstr "ongeveer %d dagen geleden" -#: lib/util.php:832 +#: lib/util.php:835 msgid "about a month ago" msgstr "ongeveer een maand geleden" -#: lib/util.php:834 +#: lib/util.php:837 #, php-format msgid "about %d months ago" msgstr "ongeveer %d maanden geleden" -#: lib/util.php:836 +#: lib/util.php:839 msgid "about a year ago" msgstr "ongeveer een jaar geleden" diff --git a/locale/nn/LC_MESSAGES/statusnet.mo b/locale/nn/LC_MESSAGES/statusnet.mo Binary files differindex bf03dffcc..abb9b6191 100644 --- a/locale/nn/LC_MESSAGES/statusnet.mo +++ b/locale/nn/LC_MESSAGES/statusnet.mo diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po index 6de37a959..7dcdcb0df 100644 --- a/locale/nn/LC_MESSAGES/statusnet.po +++ b/locale/nn/LC_MESSAGES/statusnet.po @@ -5,12 +5,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-10 20:53+0000\n" -"PO-Revision-Date: 2009-11-10 20:59:26+0000\n" +"POT-Creation-Date: 2009-11-16 19:42+0000\n" +"PO-Revision-Date: 2009-11-16 19:43:54+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(r58872); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: nn\n" "X-Message-Group: out-statusnet\n" @@ -22,12 +22,15 @@ msgid "No such page" msgstr "Dette emneord finst ikkje." #: actions/all.php:74 actions/allrss.php:68 -#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofilebackgroundimage.php:116 +#: actions/apiaccountupdateprofileimage.php:105 +#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 #: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 #: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 @@ -106,35 +109,42 @@ msgstr "%s med vener" msgid "Updates from %1$s and friends on %2$s!" msgstr "Oppdateringar frÃ¥ %1$s og vener pÃ¥ %2$s!" -#: actions/apiaccountratelimitstatus.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 -#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:129 actions/apigroupcreate.php:184 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120 -#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101 -#: actions/apigroupshow.php:105 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144 -#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141 -#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130 -#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163 -#: actions/apiusershow.php:101 -msgid "API method not found!" +#: actions/apiaccountratelimitstatus.php:70 +#: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofilebackgroundimage.php:94 +#: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apiaccountupdateprofile.php:97 +#, fuzzy +msgid "API method not found." msgstr "Fann ikkje API-metode." -#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 +#: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofilebackgroundimage.php:86 +#: actions/apiaccountupdateprofilecolors.php:110 +#: actions/apiaccountupdateprofileimage.php:84 +#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109 +#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "Dette krev ein POST." +#: actions/apiaccountupdatedeliverydevice.php:105 +msgid "" +"You must specify a parameter named 'device' with a value of one of: sms, im, " +"none" +msgstr "" + +#: actions/apiaccountupdatedeliverydevice.php:132 +#, fuzzy +msgid "Could not update user." +msgstr "Kan ikkje oppdatera brukar." + +#: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 #: actions/newnotice.php:94 lib/designsettings.php:283 #, php-format msgid "" @@ -142,12 +152,34 @@ msgid "" "current configuration." msgstr "" -#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/apiaccountupdateprofilebackgroundimage.php:136 +#: actions/apiaccountupdateprofilebackgroundimage.php:146 +#: actions/apiaccountupdateprofilecolors.php:164 +#: actions/apiaccountupdateprofilecolors.php:174 +#, fuzzy +msgid "Unable to save your design settings." +msgstr "Klarte ikkje Ã¥ lagra Twitter-innstillingane dine!" + +#: actions/apiaccountupdateprofilebackgroundimage.php:187 +#: actions/apiaccountupdateprofilecolors.php:142 +#, fuzzy +msgid "Could not update your design." +msgstr "Kan ikkje oppdatera brukar." + +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 +#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 #: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 msgid "User has no profile." msgstr "Brukaren har inga profil." +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "Kan ikkje lagra profil." + #: actions/apiblockcreate.php:108 msgid "Block user failed." msgstr "Blokkering av brukar feila." @@ -193,6 +225,23 @@ msgstr "Direkte meldingar til %s" msgid "All the direct messages sent to %s" msgstr "Alle direkte meldingar sendt til %s" +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 +#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 +#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 +#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149 +#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +msgid "API method not found!" +msgstr "Fann ikkje API-metode." + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -387,17 +436,17 @@ msgstr "Lasta opp brukarbilete." msgid "No status with that ID found." msgstr "Fann ingen status med den ID-en." -#: actions/apistatusesupdate.php:152 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 #: scripts/maildaemon.php:71 #, 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:193 +#: actions/apistatusesupdate.php:198 msgid "Not found" msgstr "Fann ikkje" -#: actions/apistatusesupdate.php:216 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:227 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -481,7 +530,7 @@ msgid "Invalid size." msgstr "Ugyldig storleik." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:113 +#: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "Brukarbilete" @@ -529,7 +578,7 @@ msgstr "Skaler" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:151 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -1663,7 +1712,7 @@ msgid "Nickname" msgstr "Kallenamn" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Passord" @@ -1802,7 +1851,7 @@ msgstr "" #: actions/noticesearch.php:124 #, php-format msgid "" -"Why not [register an account](%%%%action.register%%%%) and be the first to " +"Why not [register an account](%%%%action.register%%%%) and be the first to " "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" msgstr "" @@ -1849,8 +1898,8 @@ msgstr "Kopla til" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963 -#: lib/api.php:991 lib/api.php:1101 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 +#: lib/api.php:1027 lib/api.php:1137 msgid "Not a supported data format." msgstr "Ikkje eit støtta dataformat." @@ -1870,11 +1919,15 @@ msgstr "Andre innstillingar" msgid "Manage various other options." msgstr "Velikehald andre innstillingar" -#: actions/othersettings.php:117 +#: actions/othersettings.php:108 +msgid " (free service)" +msgstr "" + +#: actions/othersettings.php:116 msgid "Shorten URLs with" msgstr "" -#: actions/othersettings.php:118 +#: actions/othersettings.php:117 msgid "Automatic shortening service to use." msgstr "Den automatisk forkortingstenesta du vil bruke" @@ -1909,65 +1962,60 @@ msgstr "Dette er din utboks som syner alle private meldingar du har sendt." msgid "Change password" msgstr "Endra passord" -#: actions/passwordsettings.php:70 -#, fuzzy -msgid "You are not allowed to change your password" -msgstr "Endra passordet ditt" - -#: actions/passwordsettings.php:82 +#: actions/passwordsettings.php:69 msgid "Change your password." msgstr "Endra passordet ditt" -#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:96 actions/recoverpassword.php:231 msgid "Password change" msgstr "Endra passord" -#: actions/passwordsettings.php:117 +#: actions/passwordsettings.php:104 msgid "Old password" msgstr "Gamalt passord" -#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:108 actions/recoverpassword.php:235 msgid "New password" msgstr "Nytt passord" -#: actions/passwordsettings.php:122 +#: actions/passwordsettings.php:109 msgid "6 or more characters" msgstr "6 eller fleire teikn" -#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:112 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Godta" -#: actions/passwordsettings.php:126 +#: actions/passwordsettings.php:113 msgid "same as password above" msgstr "same passord som ovanfor" -#: actions/passwordsettings.php:130 +#: actions/passwordsettings.php:117 msgid "Change" msgstr "Endra" -#: actions/passwordsettings.php:167 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "Passord mÃ¥ være minst 6 teikn." -#: actions/passwordsettings.php:170 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:233 msgid "Passwords don't match." msgstr "Passorda var ikkje like." -#: actions/passwordsettings.php:178 +#: actions/passwordsettings.php:165 msgid "Incorrect old password" msgstr "Det gamle passordet stemmer ikkje" -#: actions/passwordsettings.php:194 +#: actions/passwordsettings.php:181 msgid "Error saving user; invalid." msgstr "Feil ved lagring av brukar; fungerer ikkje." -#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Klarar ikkje lagra nytt passord." -#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:192 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Lagra passord." @@ -2411,7 +2459,7 @@ msgid "Same as password above. Required." msgstr "Samme som passord over. PÃ¥krevd." #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:122 +#: lib/accountsettingsaction.php:120 msgid "Email" msgstr "Epost" @@ -3340,36 +3388,36 @@ msgstr "Eit problem oppstod ved lagring av notis." msgid "DB error inserting reply: %s" msgstr "Databasefeil, kan ikkje lagra svar: %s" -#: classes/User.php:333 +#: classes/User.php:347 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Melding til %1$s pÃ¥ %2$s" -#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Profil" -#: lib/accountsettingsaction.php:110 +#: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "Endra profilinnstillingane dine" -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:112 msgid "Upload an avatar" msgstr "Last opp ein avatar" -#: lib/accountsettingsaction.php:119 +#: lib/accountsettingsaction.php:116 msgid "Change your password" msgstr "Endra passordet ditt" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:120 msgid "Change email handling" msgstr "Endra eposthandtering" -#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 +#: lib/accountsettingsaction.php:124 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:126 +#: lib/accountsettingsaction.php:124 #, fuzzy msgid "Design your profile" msgstr "Brukarprofil" @@ -3378,7 +3426,7 @@ msgstr "Brukarprofil" msgid "Other" msgstr "Anna" -#: lib/accountsettingsaction.php:129 +#: lib/accountsettingsaction.php:128 msgid "Other options" msgstr "Andre val" @@ -3548,19 +3596,19 @@ msgstr "Alle" msgid "license." msgstr "lisens." -#: lib/action.php:1053 +#: lib/action.php:1052 msgid "Pagination" msgstr "Paginering" -#: lib/action.php:1062 +#: lib/action.php:1061 msgid "After" msgstr "« Etter" -#: lib/action.php:1070 +#: lib/action.php:1069 msgid "Before" msgstr "Før »" -#: lib/action.php:1119 +#: lib/action.php:1117 msgid "There was a problem with your session token." msgstr "Det var eit problem med sesjons billetten din." @@ -3732,13 +3780,46 @@ msgstr "Kunne ikkje laga OpenID-form: %s" msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:613 +#: lib/command.php:618 +#, fuzzy +msgid "You are not subscribed to anyone." +msgstr "Du tingar ikkje oppdateringar til den profilen." + +#: lib/command.php:620 +#, fuzzy +msgid "You are subscribed to these people: " +msgstr "Du tingar ikkje oppdateringar til den profilen." + +#: lib/command.php:637 +#, fuzzy +msgid "No one is subscribed to you." +msgstr "Kan ikkje tinga andre til deg." + +#: lib/command.php:639 +#, fuzzy +msgid "These people are subscribed to you: " +msgstr "Mennesker som tingar %s" + +#: lib/command.php:656 +#, fuzzy +msgid "You are not a member of any groups." +msgstr "Du er ikkje medlem av den gruppa." + +#: lib/command.php:658 +#, fuzzy +msgid "You are a member of these groups: " +msgstr "Du er ikkje medlem av den gruppa." + +#: lib/command.php:670 msgid "" "Commands:\n" "on - turn on notifications\n" "off - turn off notifications\n" "help - show this help\n" "follow <nickname> - subscribe to user\n" +"groups - lists the groups you have joined\n" +"subscriptions - list the people you follow\n" +"subscribers - list the people that follow you\n" "leave <nickname> - unsubscribe from user\n" "d <nickname> <text> - direct message to user\n" "get <nickname> - get last notice from user\n" @@ -3768,20 +3849,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:191 +#: lib/common.php:192 #, fuzzy msgid "No configuration file found. " msgstr "Ingen stadfestingskode." -#: lib/common.php:192 +#: lib/common.php:193 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:193 +#: lib/common.php:194 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:194 +#: lib/common.php:195 #, fuzzy msgid "Go to the installer." msgstr "Logg inn or sida" @@ -4050,8 +4131,8 @@ msgstr "Ukjend fil type" #: lib/jabber.php:192 #, php-format -msgid "notice id: %s" -msgstr "Ny notis" +msgid "[%s]" +msgstr "" #: lib/joinform.php:114 msgid "Join" @@ -4572,7 +4653,8 @@ msgid "Could not subscribe other to you." msgstr "Kan ikkje tinga andre til deg." #: lib/subs.php:124 -msgid "Not subscribed!." +#, fuzzy +msgid "Not subscribed!" msgstr "Ikkje tinga." #: lib/subs.php:136 @@ -4621,47 +4703,47 @@ msgstr "Send ei direktemelding til denne brukaren" msgid "Message" msgstr "Melding" -#: lib/util.php:818 +#: lib/util.php:821 msgid "a few seconds ago" msgstr "eit par sekund sidan" -#: lib/util.php:820 +#: lib/util.php:823 msgid "about a minute ago" msgstr "omtrent eitt minutt sidan" -#: lib/util.php:822 +#: lib/util.php:825 #, php-format msgid "about %d minutes ago" msgstr "~%d minutt sidan" -#: lib/util.php:824 +#: lib/util.php:827 msgid "about an hour ago" msgstr "omtrent ein time sidan" -#: lib/util.php:826 +#: lib/util.php:829 #, php-format msgid "about %d hours ago" msgstr "~%d timar sidan" -#: lib/util.php:828 +#: lib/util.php:831 msgid "about a day ago" msgstr "omtrent ein dag sidan" -#: lib/util.php:830 +#: lib/util.php:833 #, php-format msgid "about %d days ago" msgstr "~%d dagar sidan" -#: lib/util.php:832 +#: lib/util.php:835 msgid "about a month ago" msgstr "omtrent ein mÃ¥nad sidan" -#: lib/util.php:834 +#: lib/util.php:837 #, php-format msgid "about %d months ago" msgstr "~%d mÃ¥nadar sidan" -#: lib/util.php:836 +#: lib/util.php:839 msgid "about a year ago" msgstr "omtrent eitt Ã¥r sidan" diff --git a/locale/pl/LC_MESSAGES/statusnet.mo b/locale/pl/LC_MESSAGES/statusnet.mo Binary files differindex 861243ce2..d3ab4e974 100644 --- a/locale/pl/LC_MESSAGES/statusnet.mo +++ b/locale/pl/LC_MESSAGES/statusnet.mo diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po index 6f5c7433c..94fb477f1 100644 --- a/locale/pl/LC_MESSAGES/statusnet.po +++ b/locale/pl/LC_MESSAGES/statusnet.po @@ -5,12 +5,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-10 20:53+0000\n" -"PO-Revision-Date: 2009-11-10 20:59:32+0000\n" +"POT-Creation-Date: 2009-11-16 19:42+0000\n" +"PO-Revision-Date: 2009-11-16 19:44:02+0000\n" "Language-Team: Polish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pl\n" "X-Message-Group: out-statusnet\n" @@ -22,12 +22,15 @@ msgid "No such page" msgstr "Nie ma takiego znacznika." #: actions/all.php:74 actions/allrss.php:68 -#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofilebackgroundimage.php:116 +#: actions/apiaccountupdateprofileimage.php:105 +#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 #: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 #: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 @@ -114,35 +117,42 @@ msgstr "Ty i przyjaciele" msgid "Updates from %1$s and friends on %2$s!" msgstr "Aktualizacje od %1$s i przyjaciół na %2$s!" -#: actions/apiaccountratelimitstatus.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 -#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:129 actions/apigroupcreate.php:184 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120 -#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101 -#: actions/apigroupshow.php:105 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144 -#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141 -#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130 -#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163 -#: actions/apiusershow.php:101 -msgid "API method not found!" +#: actions/apiaccountratelimitstatus.php:70 +#: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofilebackgroundimage.php:94 +#: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apiaccountupdateprofile.php:97 +#, fuzzy +msgid "API method not found." msgstr "Nie znaleziono metody API!" -#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 +#: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofilebackgroundimage.php:86 +#: actions/apiaccountupdateprofilecolors.php:110 +#: actions/apiaccountupdateprofileimage.php:84 +#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109 +#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "Ta metoda wymaga POST." +#: actions/apiaccountupdatedeliverydevice.php:105 +msgid "" +"You must specify a parameter named 'device' with a value of one of: sms, im, " +"none" +msgstr "" + +#: actions/apiaccountupdatedeliverydevice.php:132 +#, fuzzy +msgid "Could not update user." +msgstr "Nie można zaktualizować użytkownika." + +#: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 #: actions/newnotice.php:94 lib/designsettings.php:283 #, php-format msgid "" @@ -152,12 +162,34 @@ msgstr "" "Serwer nie może obsÅ‚użyć aż tyle danych POST (%s bajty) z powodu bieżącej " "konfiguracji." -#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/apiaccountupdateprofilebackgroundimage.php:136 +#: actions/apiaccountupdateprofilebackgroundimage.php:146 +#: actions/apiaccountupdateprofilecolors.php:164 +#: actions/apiaccountupdateprofilecolors.php:174 +#, fuzzy +msgid "Unable to save your design settings." +msgstr "Nie można zapisać ustawieÅ„ wyglÄ…du!" + +#: actions/apiaccountupdateprofilebackgroundimage.php:187 +#: actions/apiaccountupdateprofilecolors.php:142 +#, fuzzy +msgid "Could not update your design." +msgstr "Nie można zaktualizować wyglÄ…du." + +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 +#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 #: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 msgid "User has no profile." msgstr "Użytkownik nie posiada profilu." +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "Nie można zapisać profilu." + #: actions/apiblockcreate.php:108 msgid "Block user failed." msgstr "Zablokowanie użytkownika nie powiodÅ‚o siÄ™." @@ -205,6 +237,23 @@ msgstr "BezpoÅ›rednia wiadomość do użytkownika %s" msgid "All the direct messages sent to %s" msgstr "Wszystkie bezpoÅ›rednie wiadomoÅ›ci wysÅ‚ane do użytkownika %s" +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 +#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 +#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 +#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149 +#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +msgid "API method not found!" +msgstr "Nie znaleziono metody API!" + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -394,17 +443,17 @@ msgstr "UsuniÄ™to awatar." msgid "No status with that ID found." msgstr "Nie znaleziono statusów z tym identyfikatorem." -#: actions/apistatusesupdate.php:152 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 #: scripts/maildaemon.php:71 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Wpis jest za dÅ‚ugi. Maksymalna dÅ‚ugość to 140 znaków." -#: actions/apistatusesupdate.php:193 +#: actions/apistatusesupdate.php:198 msgid "Not found" msgstr "Nie znaleziono" -#: actions/apistatusesupdate.php:216 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:227 actions/newnotice.php:178 #, fuzzy, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "Maksymalny rozmiar wpisu to 140 znaków, w tym adres URL zaÅ‚Ä…cznika." @@ -487,7 +536,7 @@ msgid "Invalid size." msgstr "NieprawidÅ‚owy rozmiar." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:113 +#: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "Awatar" @@ -535,7 +584,7 @@ msgstr "Przytnij" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:151 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -1676,7 +1725,7 @@ msgid "Nickname" msgstr "Pseudonim" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:116 msgid "Password" msgstr "HasÅ‚o" @@ -1813,9 +1862,9 @@ msgstr "" "status_textarea=%s)!" #: actions/noticesearch.php:124 -#, php-format +#, fuzzy, php-format msgid "" -"Why not [register an account](%%%%action.register%%%%) and be the first to " +"Why not [register an account](%%%%action.register%%%%) and be the first to " "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" msgstr "" "Dlaczego nie [zarejestrujesz konta](%%%%action.register%%%%) i zostaniesz " @@ -1865,8 +1914,8 @@ msgstr "Zawartość" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963 -#: lib/api.php:991 lib/api.php:1101 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 +#: lib/api.php:1027 lib/api.php:1137 msgid "Not a supported data format." msgstr "To nie jest obsÅ‚ugiwany format danych." @@ -1886,11 +1935,15 @@ msgstr "Inne ustawienia" msgid "Manage various other options." msgstr "ZarzÄ…dzaj różnymi innymi opcjami." -#: actions/othersettings.php:117 +#: actions/othersettings.php:108 +msgid " (free service)" +msgstr "" + +#: actions/othersettings.php:116 msgid "Shorten URLs with" msgstr "Skracaj adresy URL za pomocÄ…" -#: actions/othersettings.php:118 +#: actions/othersettings.php:117 msgid "Automatic shortening service to use." msgstr "Używana automatyczna usÅ‚uga skracania." @@ -1924,65 +1977,60 @@ msgstr "To sÄ… wiadomoÅ›ci wysÅ‚ane, czyli prywatne wiadomoÅ›ci, które wysÅ‚aÅ‚ msgid "Change password" msgstr "ZmieÅ„ hasÅ‚o" -#: actions/passwordsettings.php:70 -#, fuzzy -msgid "You are not allowed to change your password" -msgstr "ZmieÅ„ hasÅ‚o" - -#: actions/passwordsettings.php:82 +#: actions/passwordsettings.php:69 msgid "Change your password." msgstr "ZmieÅ„ hasÅ‚o." -#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:96 actions/recoverpassword.php:231 msgid "Password change" msgstr "Zmiana hasÅ‚a" -#: actions/passwordsettings.php:117 +#: actions/passwordsettings.php:104 msgid "Old password" msgstr "Stare hasÅ‚o" -#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:108 actions/recoverpassword.php:235 msgid "New password" msgstr "Nowe hasÅ‚o" -#: actions/passwordsettings.php:122 +#: actions/passwordsettings.php:109 msgid "6 or more characters" msgstr "6 lub wiÄ™cej znaków" -#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:112 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Potwierdź" -#: actions/passwordsettings.php:126 +#: actions/passwordsettings.php:113 msgid "same as password above" msgstr "takie samo jak hasÅ‚o powyżej" -#: actions/passwordsettings.php:130 +#: actions/passwordsettings.php:117 msgid "Change" msgstr "ZmieÅ„" -#: actions/passwordsettings.php:167 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "HasÅ‚o musi mieć sześć lub wiÄ™cej znaków." -#: actions/passwordsettings.php:170 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:233 msgid "Passwords don't match." msgstr "HasÅ‚a nie pasujÄ… do siebie." -#: actions/passwordsettings.php:178 +#: actions/passwordsettings.php:165 msgid "Incorrect old password" msgstr "Niepoprawne stare hasÅ‚o" -#: actions/passwordsettings.php:194 +#: actions/passwordsettings.php:181 msgid "Error saving user; invalid." msgstr "BÅ‚Ä…d podczas zapisywania użytkownika; nieprawidÅ‚owy." -#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Nie można zapisać nowego hasÅ‚a." -#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:192 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Zapisano hasÅ‚o." @@ -2439,7 +2487,7 @@ msgid "Same as password above. Required." msgstr "Takie samo jak powyższe hasÅ‚o. Wymagane." #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:122 +#: lib/accountsettingsaction.php:120 msgid "Email" msgstr "E-mail" @@ -3408,36 +3456,36 @@ msgstr "Problem podczas zapisywania wpisu." msgid "DB error inserting reply: %s" msgstr "BÅ‚Ä…d bazy danych podczas wprowadzania odpowiedzi: %s" -#: classes/User.php:333 +#: classes/User.php:347 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Witaj w %1$s, @%2$s!" -#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Profil" -#: lib/accountsettingsaction.php:110 +#: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "ZmieÅ„ ustawienia profilu" -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:112 msgid "Upload an avatar" msgstr "WyÅ›lij awatar" -#: lib/accountsettingsaction.php:119 +#: lib/accountsettingsaction.php:116 msgid "Change your password" msgstr "ZmieÅ„ hasÅ‚o" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:120 msgid "Change email handling" msgstr "ZmieÅ„ obsÅ‚ugÄ™ adresu e-mail" -#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 +#: lib/accountsettingsaction.php:124 lib/groupnav.php:119 msgid "Design" msgstr "WyglÄ…d" -#: lib/accountsettingsaction.php:126 +#: lib/accountsettingsaction.php:124 msgid "Design your profile" msgstr "WyglÄ…d profilu" @@ -3445,7 +3493,7 @@ msgstr "WyglÄ…d profilu" msgid "Other" msgstr "Inne" -#: lib/accountsettingsaction.php:129 +#: lib/accountsettingsaction.php:128 msgid "Other options" msgstr "Inne opcje" @@ -3614,19 +3662,19 @@ msgstr "Wszystko " msgid "license." msgstr "licencja." -#: lib/action.php:1053 +#: lib/action.php:1052 msgid "Pagination" msgstr "Paginacja" -#: lib/action.php:1062 +#: lib/action.php:1061 msgid "After" msgstr "NastÄ™pne" -#: lib/action.php:1070 +#: lib/action.php:1069 msgid "Before" msgstr "WczeÅ›niej" -#: lib/action.php:1119 +#: lib/action.php:1117 msgid "There was a problem with your session token." msgstr "WystÄ…piÅ‚ problem z tokenem sesji." @@ -3800,7 +3848,37 @@ msgstr "Nie można utworzyć formularza OpenID: %s" msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:613 +#: lib/command.php:618 +#, fuzzy +msgid "You are not subscribed to anyone." +msgstr "Nie jesteÅ› zasubskrybowany do tego profilu." + +#: lib/command.php:620 +#, fuzzy +msgid "You are subscribed to these people: " +msgstr "Nie jesteÅ› zasubskrybowany do tego profilu." + +#: lib/command.php:637 +#, fuzzy +msgid "No one is subscribed to you." +msgstr "Nie można zasubskrybować innych do Ciebie." + +#: lib/command.php:639 +#, fuzzy +msgid "These people are subscribed to you: " +msgstr "Osoby zasubskrybowane do %s" + +#: lib/command.php:656 +#, fuzzy +msgid "You are not a member of any groups." +msgstr "Nie jesteÅ› czÅ‚onkiem tej grupy." + +#: lib/command.php:658 +#, fuzzy +msgid "You are a member of these groups: " +msgstr "Nie jesteÅ› czÅ‚onkiem tej grupy." + +#: lib/command.php:670 #, fuzzy msgid "" "Commands:\n" @@ -3808,6 +3886,9 @@ msgid "" "off - turn off notifications\n" "help - show this help\n" "follow <nickname> - subscribe to user\n" +"groups - lists the groups you have joined\n" +"subscriptions - list the people you follow\n" +"subscribers - list the people that follow you\n" "leave <nickname> - unsubscribe from user\n" "d <nickname> <text> - direct message to user\n" "get <nickname> - get last notice from user\n" @@ -3863,20 +3944,20 @@ msgstr "" "tracks - jeszcze nie zaimplementowano.\n" "tracking - jeszcze nie zaimplementowano.\n" -#: lib/common.php:191 +#: lib/common.php:192 #, fuzzy msgid "No configuration file found. " msgstr "Brak kodu potwierdzajÄ…cego." -#: lib/common.php:192 +#: lib/common.php:193 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:193 +#: lib/common.php:194 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:194 +#: lib/common.php:195 #, fuzzy msgid "Go to the installer." msgstr "Zaloguj siÄ™ na stronÄ™" @@ -4142,9 +4223,9 @@ msgid "Unknown file type" msgstr "Nieznany typ pliku" #: lib/jabber.php:192 -#, fuzzy, php-format -msgid "notice id: %s" -msgstr "Brak identyfikatora wpisu" +#, php-format +msgid "[%s]" +msgstr "" #: lib/joinform.php:114 msgid "Join" @@ -4318,6 +4399,17 @@ msgid "" "With kind regards,\n" "%4$s\n" msgstr "" +"Użytkownik %1$s (%2$s) zastanawia siÄ™, co siÄ™ z TobÄ… dzieje w ostatnich " +"dniach i zaprasza CiÄ™ do wysÅ‚ania jakichÅ› aktualnoÅ›ci.\n" +"\n" +"Tak wiÄ™c do usÅ‚yszenia. :)\n" +"\n" +"%3$s\n" +"\n" +"Nie odpowiadaj na tÄ™ wiadomość e-mail, nie dotrze ona do nich.\n" +"\n" +"Z poważaniem,\n" +"%4$s\n" #: lib/mail.php:509 #, php-format @@ -4342,6 +4434,20 @@ msgid "" "With kind regards,\n" "%5$s\n" msgstr "" +"Użytkownik %1$s (%2$s) wysÅ‚aÅ‚ Ci prywatnÄ… wiadomość:\n" +"\n" +"------------------------------------------------------\n" +"%3$s\n" +"------------------------------------------------------\n" +"\n" +"Tutaj możesz na niÄ… odpowiedzieć:\n" +"\n" +"%4$s\n" +"\n" +"Nie odpowiadaj na tÄ™ wiadomość e-mail, nie dotrze ona do nich.\n" +"\n" +"Z poważaniem,\n" +"%5$s\n" #: lib/mail.php:554 #, fuzzy, php-format @@ -4700,7 +4806,8 @@ msgid "Could not subscribe other to you." msgstr "Nie można zasubskrybować innych do Ciebie." #: lib/subs.php:124 -msgid "Not subscribed!." +#, fuzzy +msgid "Not subscribed!" msgstr "Nie zasubskrybowane!" #: lib/subs.php:136 @@ -4747,47 +4854,47 @@ msgstr "WyÅ›lij bezpoÅ›redniÄ… wiadomość do tego użytkownika" msgid "Message" msgstr "Wiadomość" -#: lib/util.php:818 +#: lib/util.php:821 msgid "a few seconds ago" msgstr "kilka sekund temu" -#: lib/util.php:820 +#: lib/util.php:823 msgid "about a minute ago" msgstr "okoÅ‚o minutÄ™ temu" -#: lib/util.php:822 +#: lib/util.php:825 #, php-format msgid "about %d minutes ago" msgstr "okoÅ‚o %d minut temu" -#: lib/util.php:824 +#: lib/util.php:827 msgid "about an hour ago" msgstr "okoÅ‚o godzinÄ™ temu" -#: lib/util.php:826 +#: lib/util.php:829 #, php-format msgid "about %d hours ago" msgstr "okoÅ‚o %d godzin temu" -#: lib/util.php:828 +#: lib/util.php:831 msgid "about a day ago" msgstr "blisko dzieÅ„ temu" -#: lib/util.php:830 +#: lib/util.php:833 #, php-format msgid "about %d days ago" msgstr "okoÅ‚o %d dni temu" -#: lib/util.php:832 +#: lib/util.php:835 msgid "about a month ago" msgstr "okoÅ‚o miesiÄ…c temu" -#: lib/util.php:834 +#: lib/util.php:837 #, php-format msgid "about %d months ago" msgstr "okoÅ‚o %d miesiÄ™cy temu" -#: lib/util.php:836 +#: lib/util.php:839 msgid "about a year ago" msgstr "okoÅ‚o rok temu" diff --git a/locale/pt/LC_MESSAGES/statusnet.mo b/locale/pt/LC_MESSAGES/statusnet.mo Binary files differindex 116a7bacd..9d79df32c 100644 --- a/locale/pt/LC_MESSAGES/statusnet.mo +++ b/locale/pt/LC_MESSAGES/statusnet.mo diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po index cd7997a50..4577be669 100644 --- a/locale/pt/LC_MESSAGES/statusnet.po +++ b/locale/pt/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-10 20:53+0000\n" -"PO-Revision-Date: 2009-11-10 20:59:35+0000\n" +"POT-Creation-Date: 2009-11-16 19:42+0000\n" +"PO-Revision-Date: 2009-11-16 19:44:05+0000\n" "Language-Team: Portuguese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pt\n" "X-Message-Group: out-statusnet\n" @@ -26,12 +26,15 @@ msgid "No such page" msgstr "" #: actions/all.php:74 actions/allrss.php:68 -#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofilebackgroundimage.php:116 +#: actions/apiaccountupdateprofileimage.php:105 +#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 #: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 #: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 @@ -110,35 +113,42 @@ msgstr "%s e amigos" msgid "Updates from %1$s and friends on %2$s!" msgstr "" -#: actions/apiaccountratelimitstatus.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 -#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:129 actions/apigroupcreate.php:184 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120 -#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101 -#: actions/apigroupshow.php:105 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144 -#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141 -#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130 -#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163 -#: actions/apiusershow.php:101 -msgid "API method not found!" +#: actions/apiaccountratelimitstatus.php:70 +#: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofilebackgroundimage.php:94 +#: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apiaccountupdateprofile.php:97 +#, fuzzy +msgid "API method not found." msgstr "Método da API não encontrado!" -#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 +#: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofilebackgroundimage.php:86 +#: actions/apiaccountupdateprofilecolors.php:110 +#: actions/apiaccountupdateprofileimage.php:84 +#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109 +#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "" +#: actions/apiaccountupdatedeliverydevice.php:105 +msgid "" +"You must specify a parameter named 'device' with a value of one of: sms, im, " +"none" +msgstr "" + +#: actions/apiaccountupdatedeliverydevice.php:132 +#, fuzzy +msgid "Could not update user." +msgstr "Não foi possÃvel actualizar o utilizador." + +#: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 #: actions/newnotice.php:94 lib/designsettings.php:283 #, php-format msgid "" @@ -146,12 +156,33 @@ msgid "" "current configuration." msgstr "" -#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/apiaccountupdateprofilebackgroundimage.php:136 +#: actions/apiaccountupdateprofilebackgroundimage.php:146 +#: actions/apiaccountupdateprofilecolors.php:164 +#: actions/apiaccountupdateprofilecolors.php:174 +msgid "Unable to save your design settings." +msgstr "" + +#: actions/apiaccountupdateprofilebackgroundimage.php:187 +#: actions/apiaccountupdateprofilecolors.php:142 +#, fuzzy +msgid "Could not update your design." +msgstr "Não foi possÃvel actualizar o utilizador." + +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 +#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 #: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 msgid "User has no profile." msgstr "" +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "Não foi possÃvel salvar o perfil." + #: actions/apiblockcreate.php:108 msgid "Block user failed." msgstr "" @@ -197,6 +228,23 @@ msgstr "" msgid "All the direct messages sent to %s" msgstr "" +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 +#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 +#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 +#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149 +#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +msgid "API method not found!" +msgstr "Método da API não encontrado!" + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -387,17 +435,17 @@ msgstr "Avatar actualizado." msgid "No status with that ID found." msgstr "Nenhum estado com esse ID encontrado." -#: actions/apistatusesupdate.php:152 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 #: scripts/maildaemon.php:71 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" -#: actions/apistatusesupdate.php:193 +#: actions/apistatusesupdate.php:198 msgid "Not found" msgstr "" -#: actions/apistatusesupdate.php:216 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:227 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -479,7 +527,7 @@ msgid "Invalid size." msgstr "Tamanho inválido." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:113 +#: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "Avatar" @@ -527,7 +575,7 @@ msgstr "" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:151 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -1634,7 +1682,7 @@ msgid "Nickname" msgstr "Alcunha" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:116 msgid "Password" msgstr "" @@ -1769,7 +1817,7 @@ msgstr "" #: actions/noticesearch.php:124 #, php-format msgid "" -"Why not [register an account](%%%%action.register%%%%) and be the first to " +"Why not [register an account](%%%%action.register%%%%) and be the first to " "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" msgstr "" @@ -1814,8 +1862,8 @@ msgstr "Ligar" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963 -#: lib/api.php:991 lib/api.php:1101 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 +#: lib/api.php:1027 lib/api.php:1137 msgid "Not a supported data format." msgstr "" @@ -1835,11 +1883,15 @@ msgstr "" msgid "Manage various other options." msgstr "" -#: actions/othersettings.php:117 +#: actions/othersettings.php:108 +msgid " (free service)" +msgstr "" + +#: actions/othersettings.php:116 msgid "Shorten URLs with" msgstr "" -#: actions/othersettings.php:118 +#: actions/othersettings.php:117 msgid "Automatic shortening service to use." msgstr "" @@ -1873,66 +1925,61 @@ msgstr "" msgid "Change password" msgstr "Modificar palavra-passe" -#: actions/passwordsettings.php:70 -#, fuzzy -msgid "You are not allowed to change your password" -msgstr "Modificar a sua palavra-passe" - -#: actions/passwordsettings.php:82 +#: actions/passwordsettings.php:69 #, fuzzy msgid "Change your password." msgstr "Modificar a sua palavra-passe" -#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:96 actions/recoverpassword.php:231 msgid "Password change" msgstr "" -#: actions/passwordsettings.php:117 +#: actions/passwordsettings.php:104 msgid "Old password" msgstr "" -#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:108 actions/recoverpassword.php:235 msgid "New password" msgstr "Nova palavra-passe" -#: actions/passwordsettings.php:122 +#: actions/passwordsettings.php:109 msgid "6 or more characters" msgstr "6 ou mais caracteres" -#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:112 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Confirmar" -#: actions/passwordsettings.php:126 +#: actions/passwordsettings.php:113 msgid "same as password above" msgstr "" -#: actions/passwordsettings.php:130 +#: actions/passwordsettings.php:117 msgid "Change" msgstr "Modificar" -#: actions/passwordsettings.php:167 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "" -#: actions/passwordsettings.php:170 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:233 msgid "Passwords don't match." msgstr "" -#: actions/passwordsettings.php:178 +#: actions/passwordsettings.php:165 msgid "Incorrect old password" msgstr "Palavra-passe antiga incorrecta" -#: actions/passwordsettings.php:194 +#: actions/passwordsettings.php:181 msgid "Error saving user; invalid." msgstr "Erro ao guardar utilizador; inválido." -#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Não é possÃvel guardar a nova password." -#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:192 actions/recoverpassword.php:211 msgid "Password saved." msgstr "" @@ -2365,7 +2412,7 @@ msgid "Same as password above. Required." msgstr "" #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:122 +#: lib/accountsettingsaction.php:120 msgid "Email" msgstr "Email" @@ -3254,36 +3301,36 @@ msgstr "" msgid "DB error inserting reply: %s" msgstr "Ocorreu um erro na base de dados ao inserir a resposta: %s" -#: classes/User.php:333 +#: classes/User.php:347 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" -#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 msgid "Profile" msgstr "" -#: lib/accountsettingsaction.php:110 +#: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "Modificar as suas definições de perfil" -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:112 msgid "Upload an avatar" msgstr "" -#: lib/accountsettingsaction.php:119 +#: lib/accountsettingsaction.php:116 msgid "Change your password" msgstr "Modificar a sua palavra-passe" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:120 msgid "Change email handling" msgstr "Alterar email handling" -#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 +#: lib/accountsettingsaction.php:124 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:126 +#: lib/accountsettingsaction.php:124 msgid "Design your profile" msgstr "" @@ -3291,7 +3338,7 @@ msgstr "" msgid "Other" msgstr "" -#: lib/accountsettingsaction.php:129 +#: lib/accountsettingsaction.php:128 msgid "Other options" msgstr "" @@ -3460,20 +3507,20 @@ msgstr "" msgid "license." msgstr "" -#: lib/action.php:1053 +#: lib/action.php:1052 msgid "Pagination" msgstr "" -#: lib/action.php:1062 +#: lib/action.php:1061 msgid "After" msgstr "" -#: lib/action.php:1070 +#: lib/action.php:1069 #, fuzzy msgid "Before" msgstr "Antes »" -#: lib/action.php:1119 +#: lib/action.php:1117 msgid "There was a problem with your session token." msgstr "" @@ -3645,13 +3692,44 @@ msgstr "Não foi possÃvel criar o formulário de OpenID: %s" msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:613 +#: lib/command.php:618 +#, fuzzy +msgid "You are not subscribed to anyone." +msgstr "Não foi possÃvel subscrever outros a si." + +#: lib/command.php:620 +#, fuzzy +msgid "You are subscribed to these people: " +msgstr "Já subscrito!." + +#: lib/command.php:637 +#, fuzzy +msgid "No one is subscribed to you." +msgstr "Não foi possÃvel subscrever outros a si." + +#: lib/command.php:639 +#, fuzzy +msgid "These people are subscribed to you: " +msgstr "Já subscrito!." + +#: lib/command.php:656 +msgid "You are not a member of any groups." +msgstr "" + +#: lib/command.php:658 +msgid "You are a member of these groups: " +msgstr "" + +#: lib/command.php:670 msgid "" "Commands:\n" "on - turn on notifications\n" "off - turn off notifications\n" "help - show this help\n" "follow <nickname> - subscribe to user\n" +"groups - lists the groups you have joined\n" +"subscriptions - list the people you follow\n" +"subscribers - list the people that follow you\n" "leave <nickname> - unsubscribe from user\n" "d <nickname> <text> - direct message to user\n" "get <nickname> - get last notice from user\n" @@ -3681,20 +3759,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:191 +#: lib/common.php:192 #, fuzzy msgid "No configuration file found. " msgstr "Código de confirmação não encontrado" -#: lib/common.php:192 +#: lib/common.php:193 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:193 +#: lib/common.php:194 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:194 +#: lib/common.php:195 msgid "Go to the installer." msgstr "" @@ -3959,9 +4037,9 @@ msgid "Unknown file type" msgstr "" #: lib/jabber.php:192 -#, fuzzy, php-format -msgid "notice id: %s" -msgstr "URI da mensagem inválido" +#, php-format +msgid "[%s]" +msgstr "" #: lib/joinform.php:114 msgid "Join" @@ -4473,8 +4551,9 @@ msgid "Could not subscribe other to you." msgstr "Não foi possÃvel subscrever outros a si." #: lib/subs.php:124 -msgid "Not subscribed!." -msgstr "" +#, fuzzy +msgid "Not subscribed!" +msgstr "Não foi possÃvel subscrever. " #: lib/subs.php:136 msgid "Couldn't delete subscription." @@ -4522,47 +4601,47 @@ msgstr "" msgid "Message" msgstr "" -#: lib/util.php:818 +#: lib/util.php:821 msgid "a few seconds ago" msgstr "" -#: lib/util.php:820 +#: lib/util.php:823 msgid "about a minute ago" msgstr "" -#: lib/util.php:822 +#: lib/util.php:825 #, php-format msgid "about %d minutes ago" msgstr "" -#: lib/util.php:824 +#: lib/util.php:827 msgid "about an hour ago" msgstr "" -#: lib/util.php:826 +#: lib/util.php:829 #, php-format msgid "about %d hours ago" msgstr "" -#: lib/util.php:828 +#: lib/util.php:831 msgid "about a day ago" msgstr "" -#: lib/util.php:830 +#: lib/util.php:833 #, php-format msgid "about %d days ago" msgstr "" -#: lib/util.php:832 +#: lib/util.php:835 msgid "about a month ago" msgstr "" -#: lib/util.php:834 +#: lib/util.php:837 #, php-format msgid "about %d months ago" msgstr "" -#: lib/util.php:836 +#: lib/util.php:839 msgid "about a year ago" msgstr "" diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.mo b/locale/pt_BR/LC_MESSAGES/statusnet.mo Binary files differindex 478729896..634c68c24 100644 --- a/locale/pt_BR/LC_MESSAGES/statusnet.mo +++ b/locale/pt_BR/LC_MESSAGES/statusnet.mo diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po index aa7f47cca..73b63476b 100644 --- a/locale/pt_BR/LC_MESSAGES/statusnet.po +++ b/locale/pt_BR/LC_MESSAGES/statusnet.po @@ -7,12 +7,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-10 20:53+0000\n" -"PO-Revision-Date: 2009-11-10 20:59:40+0000\n" +"POT-Creation-Date: 2009-11-16 19:42+0000\n" +"PO-Revision-Date: 2009-11-16 19:44:09+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(r58872); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pt-br\n" "X-Message-Group: out-statusnet\n" @@ -24,12 +24,15 @@ msgid "No such page" msgstr "Essa etiqueta não existe." #: actions/all.php:74 actions/allrss.php:68 -#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofilebackgroundimage.php:116 +#: actions/apiaccountupdateprofileimage.php:105 +#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 #: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 #: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 @@ -108,35 +111,42 @@ msgstr "%s e amigos" msgid "Updates from %1$s and friends on %2$s!" msgstr "Atualizações de %1$s e amigos no %2$s!" -#: actions/apiaccountratelimitstatus.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 -#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:129 actions/apigroupcreate.php:184 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120 -#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101 -#: actions/apigroupshow.php:105 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144 -#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141 -#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130 -#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163 -#: actions/apiusershow.php:101 -msgid "API method not found!" +#: actions/apiaccountratelimitstatus.php:70 +#: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofilebackgroundimage.php:94 +#: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apiaccountupdateprofile.php:97 +#, fuzzy +msgid "API method not found." msgstr "O método da API não foi encontrado!" -#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 +#: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofilebackgroundimage.php:86 +#: actions/apiaccountupdateprofilecolors.php:110 +#: actions/apiaccountupdateprofileimage.php:84 +#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109 +#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "Este método requer um POST." +#: actions/apiaccountupdatedeliverydevice.php:105 +msgid "" +"You must specify a parameter named 'device' with a value of one of: sms, im, " +"none" +msgstr "" + +#: actions/apiaccountupdatedeliverydevice.php:132 +#, fuzzy +msgid "Could not update user." +msgstr "Não foi possÃvel atualizar o usuário." + +#: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 #: actions/newnotice.php:94 lib/designsettings.php:283 #, php-format msgid "" @@ -144,12 +154,34 @@ msgid "" "current configuration." msgstr "" -#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/apiaccountupdateprofilebackgroundimage.php:136 +#: actions/apiaccountupdateprofilebackgroundimage.php:146 +#: actions/apiaccountupdateprofilecolors.php:164 +#: actions/apiaccountupdateprofilecolors.php:174 +#, fuzzy +msgid "Unable to save your design settings." +msgstr "Não foi possÃvel salvar suas configurações do Twitter!" + +#: actions/apiaccountupdateprofilebackgroundimage.php:187 +#: actions/apiaccountupdateprofilecolors.php:142 +#, fuzzy +msgid "Could not update your design." +msgstr "Não foi possÃvel atualizar o usuário." + +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 +#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 #: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 msgid "User has no profile." msgstr "O usuário não tem perfil." +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "Não foi possÃvel salvar o perfil." + #: actions/apiblockcreate.php:108 msgid "Block user failed." msgstr "Não foi possÃvel bloquear o usuário." @@ -197,6 +229,23 @@ msgstr "Mensagem direta para %s" msgid "All the direct messages sent to %s" msgstr "Todas as mensagens diretas enviadas para %s" +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 +#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 +#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 +#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149 +#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +msgid "API method not found!" +msgstr "O método da API não foi encontrado!" + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -394,17 +443,17 @@ msgstr "" msgid "No status with that ID found." msgstr "Não foi encontrado nenhum status com esse ID." -#: actions/apistatusesupdate.php:152 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 #: scripts/maildaemon.php:71 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Está muito extenso. O tamanho máximo é de 140 caracteres." -#: actions/apistatusesupdate.php:193 +#: actions/apistatusesupdate.php:198 msgid "Not found" msgstr "Não encontrado" -#: actions/apistatusesupdate.php:216 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:227 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -488,7 +537,7 @@ msgid "Invalid size." msgstr "Tamanho inválido." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:113 +#: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "Avatar" @@ -536,7 +585,7 @@ msgstr "Cortar" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:151 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -1698,7 +1747,7 @@ msgid "Nickname" msgstr "Apelido" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Senha" @@ -1840,7 +1889,7 @@ msgstr "" #: actions/noticesearch.php:124 #, php-format msgid "" -"Why not [register an account](%%%%action.register%%%%) and be the first to " +"Why not [register an account](%%%%action.register%%%%) and be the first to " "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" msgstr "" @@ -1886,8 +1935,8 @@ msgstr "" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963 -#: lib/api.php:991 lib/api.php:1101 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 +#: lib/api.php:1027 lib/api.php:1137 msgid "Not a supported data format." msgstr "Formato de dados não suportado." @@ -1907,11 +1956,15 @@ msgstr "Outras configurações" msgid "Manage various other options." msgstr "Gerenciar várias outras opções." -#: actions/othersettings.php:117 +#: actions/othersettings.php:108 +msgid " (free service)" +msgstr "" + +#: actions/othersettings.php:116 msgid "Shorten URLs with" msgstr "" -#: actions/othersettings.php:118 +#: actions/othersettings.php:117 msgid "Automatic shortening service to use." msgstr "Serviço de encolhimento automático a ser utilizado." @@ -1948,67 +2001,62 @@ msgstr "" msgid "Change password" msgstr "Alterar a senha" -#: actions/passwordsettings.php:70 -#, fuzzy -msgid "You are not allowed to change your password" -msgstr "Altere a sua senha" - -#: actions/passwordsettings.php:82 +#: actions/passwordsettings.php:69 #, fuzzy msgid "Change your password." msgstr "Altera a sua senha" -#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:96 actions/recoverpassword.php:231 #, fuzzy msgid "Password change" msgstr "A senha foi salva." -#: actions/passwordsettings.php:117 +#: actions/passwordsettings.php:104 msgid "Old password" msgstr "Senha antiga" -#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:108 actions/recoverpassword.php:235 msgid "New password" msgstr "Nova senha" -#: actions/passwordsettings.php:122 +#: actions/passwordsettings.php:109 msgid "6 or more characters" msgstr "No mÃnimo 6 caracteres" -#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:112 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Confirmar" -#: actions/passwordsettings.php:126 +#: actions/passwordsettings.php:113 msgid "same as password above" msgstr "igual à senha acima" -#: actions/passwordsettings.php:130 +#: actions/passwordsettings.php:117 msgid "Change" msgstr "Alterar" -#: actions/passwordsettings.php:167 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "A senha deve ter 6 ou mais caracteres." -#: actions/passwordsettings.php:170 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:233 msgid "Passwords don't match." msgstr "As senhas não coincidem." -#: actions/passwordsettings.php:178 +#: actions/passwordsettings.php:165 msgid "Incorrect old password" msgstr "A senha antiga está incorreta" -#: actions/passwordsettings.php:194 +#: actions/passwordsettings.php:181 msgid "Error saving user; invalid." msgstr "Erro ao salvar usuário; inválido." -#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Não é possÃvel salvar a nova senha." -#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:192 actions/recoverpassword.php:211 msgid "Password saved." msgstr "A senha foi salva." @@ -2456,7 +2504,7 @@ msgid "Same as password above. Required." msgstr "Igual à senha acima. Obrigatório." #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:122 +#: lib/accountsettingsaction.php:120 msgid "Email" msgstr "E-mail" @@ -3396,36 +3444,36 @@ msgstr "Problema ao salvar a mensagem." msgid "DB error inserting reply: %s" msgstr "Erro no banco de dados na inserção da reposta: %s" -#: classes/User.php:333 +#: classes/User.php:347 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Mensagem para %1$s no %2$s" -#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Perfil" -#: lib/accountsettingsaction.php:110 +#: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "Alterar as suas configurações de perfil" -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:112 msgid "Upload an avatar" msgstr "Enviar um avatar" -#: lib/accountsettingsaction.php:119 +#: lib/accountsettingsaction.php:116 msgid "Change your password" msgstr "Altere a sua senha" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:120 msgid "Change email handling" msgstr "Configurações de uso do e-mail" -#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 +#: lib/accountsettingsaction.php:124 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:126 +#: lib/accountsettingsaction.php:124 #, fuzzy msgid "Design your profile" msgstr "O usuário não tem perfil." @@ -3434,7 +3482,7 @@ msgstr "O usuário não tem perfil." msgid "Other" msgstr "Outras" -#: lib/accountsettingsaction.php:129 +#: lib/accountsettingsaction.php:128 msgid "Other options" msgstr "Outras opções" @@ -3608,19 +3656,19 @@ msgstr "Todas" msgid "license." msgstr "licença" -#: lib/action.php:1053 +#: lib/action.php:1052 msgid "Pagination" msgstr "Paginação" -#: lib/action.php:1062 +#: lib/action.php:1061 msgid "After" msgstr "Próximo" -#: lib/action.php:1070 +#: lib/action.php:1069 msgid "Before" msgstr "Anterior" -#: lib/action.php:1119 +#: lib/action.php:1117 msgid "There was a problem with your session token." msgstr "" "Ocorreu um problema com o seu token de sessão. Tente novamente, por favor." @@ -3796,13 +3844,46 @@ msgstr "Não foi possÃvel criar o formulário OpenID: %s" msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:613 +#: lib/command.php:618 +#, fuzzy +msgid "You are not subscribed to anyone." +msgstr "Você não está assinando esse perfil." + +#: lib/command.php:620 +#, fuzzy +msgid "You are subscribed to these people: " +msgstr "Você não está assinando esse perfil." + +#: lib/command.php:637 +#, fuzzy +msgid "No one is subscribed to you." +msgstr "Não foi possÃvel fazer com que o outros o sigam." + +#: lib/command.php:639 +#, fuzzy +msgid "These people are subscribed to you: " +msgstr "Assinantes de %s" + +#: lib/command.php:656 +#, fuzzy +msgid "You are not a member of any groups." +msgstr "Você não está assinando esse perfil." + +#: lib/command.php:658 +#, fuzzy +msgid "You are a member of these groups: " +msgstr "Você não está assinando esse perfil." + +#: lib/command.php:670 msgid "" "Commands:\n" "on - turn on notifications\n" "off - turn off notifications\n" "help - show this help\n" "follow <nickname> - subscribe to user\n" +"groups - lists the groups you have joined\n" +"subscriptions - list the people you follow\n" +"subscribers - list the people that follow you\n" "leave <nickname> - unsubscribe from user\n" "d <nickname> <text> - direct message to user\n" "get <nickname> - get last notice from user\n" @@ -3832,20 +3913,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:191 +#: lib/common.php:192 #, fuzzy msgid "No configuration file found. " msgstr "Nenhum código de confirmação." -#: lib/common.php:192 +#: lib/common.php:193 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:193 +#: lib/common.php:194 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:194 +#: lib/common.php:195 #, fuzzy msgid "Go to the installer." msgstr "Entrar" @@ -4113,9 +4194,9 @@ msgid "Unknown file type" msgstr "Tipo de arquivo desconhecido" #: lib/jabber.php:192 -#, fuzzy, php-format -msgid "notice id: %s" -msgstr "Feed de mensagens de %s" +#, php-format +msgid "[%s]" +msgstr "" #: lib/joinform.php:114 msgid "Join" @@ -4639,7 +4720,8 @@ msgid "Could not subscribe other to you." msgstr "Não foi possÃvel fazer com que o outros o sigam." #: lib/subs.php:124 -msgid "Not subscribed!." +#, fuzzy +msgid "Not subscribed!" msgstr "Não é seguido!" #: lib/subs.php:136 @@ -4691,47 +4773,47 @@ msgstr "Você não pode enviar uma mensagem para esse usuário." msgid "Message" msgstr "Nova mensagem" -#: lib/util.php:818 +#: lib/util.php:821 msgid "a few seconds ago" msgstr "segundos atrás" -#: lib/util.php:820 +#: lib/util.php:823 msgid "about a minute ago" msgstr "1 min atrás" -#: lib/util.php:822 +#: lib/util.php:825 #, php-format msgid "about %d minutes ago" msgstr "%d mins atrás" -#: lib/util.php:824 +#: lib/util.php:827 msgid "about an hour ago" msgstr "1 hora atrás" -#: lib/util.php:826 +#: lib/util.php:829 #, php-format msgid "about %d hours ago" msgstr "%d horas atrás" -#: lib/util.php:828 +#: lib/util.php:831 msgid "about a day ago" msgstr "1 dia atrás" -#: lib/util.php:830 +#: lib/util.php:833 #, php-format msgid "about %d days ago" msgstr "%d dias atrás" -#: lib/util.php:832 +#: lib/util.php:835 msgid "about a month ago" msgstr "1 mês atrás" -#: lib/util.php:834 +#: lib/util.php:837 #, php-format msgid "about %d months ago" msgstr "%d meses atrás" -#: lib/util.php:836 +#: lib/util.php:839 msgid "about a year ago" msgstr "1 ano atrás" diff --git a/locale/ru/LC_MESSAGES/statusnet.mo b/locale/ru/LC_MESSAGES/statusnet.mo Binary files differindex 7a8ba6e3d..13d14c0f9 100644 --- a/locale/ru/LC_MESSAGES/statusnet.mo +++ b/locale/ru/LC_MESSAGES/statusnet.mo diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po index 80bfd1d72..521b67091 100644 --- a/locale/ru/LC_MESSAGES/statusnet.po +++ b/locale/ru/LC_MESSAGES/statusnet.po @@ -6,29 +6,31 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-10 20:53+0000\n" -"PO-Revision-Date: 2009-11-10 20:59:42+0000\n" +"POT-Creation-Date: 2009-11-16 19:42+0000\n" +"PO-Revision-Date: 2009-11-16 19:44:12+0000\n" "Language-Team: Russian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ru\n" "X-Message-Group: out-statusnet\n" #: actions/all.php:63 actions/public.php:97 actions/replies.php:92 #: actions/showfavorites.php:137 actions/tag.php:51 -#, fuzzy msgid "No such page" -msgstr "Ðет такого тега." +msgstr "Ðет такой Ñтраницы" #: actions/all.php:74 actions/allrss.php:68 -#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofilebackgroundimage.php:116 +#: actions/apiaccountupdateprofileimage.php:105 +#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 #: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 #: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 @@ -107,35 +109,42 @@ msgstr "%s и друзьÑ" msgid "Updates from %1$s and friends on %2$s!" msgstr "Обновлено от %1$s и его друзей на %2$s!" -#: actions/apiaccountratelimitstatus.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 -#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:129 actions/apigroupcreate.php:184 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120 -#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101 -#: actions/apigroupshow.php:105 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144 -#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141 -#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130 -#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163 -#: actions/apiusershow.php:101 -msgid "API method not found!" +#: actions/apiaccountratelimitstatus.php:70 +#: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofilebackgroundimage.php:94 +#: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apiaccountupdateprofile.php:97 +#, fuzzy +msgid "API method not found." msgstr "Метод API не найден!" -#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 +#: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofilebackgroundimage.php:86 +#: actions/apiaccountupdateprofilecolors.php:110 +#: actions/apiaccountupdateprofileimage.php:84 +#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109 +#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "Ðтот метод требует POST." +#: actions/apiaccountupdatedeliverydevice.php:105 +msgid "" +"You must specify a parameter named 'device' with a value of one of: sms, im, " +"none" +msgstr "" + +#: actions/apiaccountupdatedeliverydevice.php:132 +#, fuzzy +msgid "Could not update user." +msgstr "Ðе удаётÑÑ Ð¾Ð±Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ пользователÑ." + +#: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 #: actions/newnotice.php:94 lib/designsettings.php:283 #, php-format msgid "" @@ -143,12 +152,34 @@ msgid "" "current configuration." msgstr "" -#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/apiaccountupdateprofilebackgroundimage.php:136 +#: actions/apiaccountupdateprofilebackgroundimage.php:146 +#: actions/apiaccountupdateprofilecolors.php:164 +#: actions/apiaccountupdateprofilecolors.php:174 +#, fuzzy +msgid "Unable to save your design settings." +msgstr "Ðе удаётÑÑ Ñохранить Ваши уÑтановки по Твиттеру!" + +#: actions/apiaccountupdateprofilebackgroundimage.php:187 +#: actions/apiaccountupdateprofilecolors.php:142 +#, fuzzy +msgid "Could not update your design." +msgstr "Ðе удаётÑÑ Ð¾Ð±Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ пользователÑ." + +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 +#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 #: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 msgid "User has no profile." msgstr "У Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð½ÐµÑ‚ профилÑ." +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "Ðе удаётÑÑ Ñохранить профиль." + #: actions/apiblockcreate.php:108 msgid "Block user failed." msgstr "Ðеудача при блокировке пользователÑ." @@ -196,6 +227,23 @@ msgstr "ПрÑмые ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð´Ð»Ñ %s" msgid "All the direct messages sent to %s" msgstr "Ð’Ñе прÑмые ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¿Ð¾Ñланные Ð´Ð»Ñ %s" +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 +#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 +#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 +#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149 +#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +msgid "API method not found!" +msgstr "Метод API не найден!" + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -394,17 +442,17 @@ msgstr "Ðватар обновлён." msgid "No status with that ID found." msgstr "Ðе найдено ÑтатуÑа Ñ Ñ‚Ð°ÐºÐ¸Ð¼ ID." -#: actions/apistatusesupdate.php:152 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 #: scripts/maildaemon.php:71 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Слишком Ð´Ð»Ð¸Ð½Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ. МакÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ Ð´Ð»Ð¸Ð½Ð° - 140 знаков." -#: actions/apistatusesupdate.php:193 +#: actions/apistatusesupdate.php:198 msgid "Not found" msgstr "Ðе найдено" -#: actions/apistatusesupdate.php:216 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:227 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -488,7 +536,7 @@ msgid "Invalid size." msgstr "Ðеверный размер." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:113 +#: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "Ðватар" @@ -536,7 +584,7 @@ msgstr "Обрезать" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:151 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -1688,7 +1736,7 @@ msgid "Nickname" msgstr "ИмÑ" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Пароль" @@ -1825,7 +1873,7 @@ msgstr "" #: actions/noticesearch.php:124 #, php-format msgid "" -"Why not [register an account](%%%%action.register%%%%) and be the first to " +"Why not [register an account](%%%%action.register%%%%) and be the first to " "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" msgstr "" @@ -1872,8 +1920,8 @@ msgstr "Соединить" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963 -#: lib/api.php:991 lib/api.php:1101 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 +#: lib/api.php:1027 lib/api.php:1137 msgid "Not a supported data format." msgstr "Ðеподдерживаемый формат данных." @@ -1893,11 +1941,15 @@ msgstr "Другие уÑтановки" msgid "Manage various other options." msgstr "Управление другими опциÑми." -#: actions/othersettings.php:117 +#: actions/othersettings.php:108 +msgid " (free service)" +msgstr "" + +#: actions/othersettings.php:116 msgid "Shorten URLs with" msgstr "" -#: actions/othersettings.php:118 +#: actions/othersettings.php:117 msgid "Automatic shortening service to use." msgstr "ÐвтоматичеÑки иÑпользовать выбранный ÑервиÑ" @@ -1934,65 +1986,60 @@ msgstr "" msgid "Change password" msgstr "Изменить пароль" -#: actions/passwordsettings.php:70 -#, fuzzy -msgid "You are not allowed to change your password" -msgstr "Изменить ваш пароль" - -#: actions/passwordsettings.php:82 +#: actions/passwordsettings.php:69 msgid "Change your password." msgstr "Изменить ваш пароль" -#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:96 actions/recoverpassword.php:231 msgid "Password change" msgstr "Пароль Ñохранён." -#: actions/passwordsettings.php:117 +#: actions/passwordsettings.php:104 msgid "Old password" msgstr "Старый пароль" -#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:108 actions/recoverpassword.php:235 msgid "New password" msgstr "Ðовый пароль" -#: actions/passwordsettings.php:122 +#: actions/passwordsettings.php:109 msgid "6 or more characters" msgstr "6 или больше знаков" -#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:112 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Подтвердить" -#: actions/passwordsettings.php:126 +#: actions/passwordsettings.php:113 msgid "same as password above" msgstr "повторить пароль Ñверху" -#: actions/passwordsettings.php:130 +#: actions/passwordsettings.php:117 msgid "Change" msgstr "Изменить" -#: actions/passwordsettings.php:167 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "Пароль должен быть длиной не менее 6 Ñимволов." -#: actions/passwordsettings.php:170 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:233 msgid "Passwords don't match." msgstr "Пароли не Ñовпадают." -#: actions/passwordsettings.php:178 +#: actions/passwordsettings.php:165 msgid "Incorrect old password" msgstr "Ðекорректный Ñтарый пароль" -#: actions/passwordsettings.php:194 +#: actions/passwordsettings.php:181 msgid "Error saving user; invalid." msgstr "Ошибка ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ; неверное имÑ." -#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Ðе удаётÑÑ Ñохранить новый пароль." -#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:192 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Пароль Ñохранён." @@ -2445,7 +2492,7 @@ msgid "Same as password above. Required." msgstr "Тот же пароль что и Ñверху. ОбÑзательно." #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:122 +#: lib/accountsettingsaction.php:120 msgid "Email" msgstr "Email" @@ -3394,36 +3441,36 @@ msgstr "Проблемы Ñ Ñохранением запиÑи." msgid "DB error inserting reply: %s" msgstr "Ошибка баз данных при вÑтавке ответа Ð´Ð»Ñ %s" -#: classes/User.php:333 +#: classes/User.php:347 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Сообщение Ð´Ð»Ñ %1$s на %2$s" -#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Профиль" -#: lib/accountsettingsaction.php:110 +#: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "Изменить ваши наÑтройки профилÑ" -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:112 msgid "Upload an avatar" msgstr "Загрузить аватар" -#: lib/accountsettingsaction.php:119 +#: lib/accountsettingsaction.php:116 msgid "Change your password" msgstr "Изменить ваш пароль" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:120 msgid "Change email handling" msgstr "Изменить Ñлектронный адреÑ" -#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 +#: lib/accountsettingsaction.php:124 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:126 +#: lib/accountsettingsaction.php:124 #, fuzzy msgid "Design your profile" msgstr "Профиль пользователÑ" @@ -3432,7 +3479,7 @@ msgstr "Профиль пользователÑ" msgid "Other" msgstr "Другое" -#: lib/accountsettingsaction.php:129 +#: lib/accountsettingsaction.php:128 msgid "Other options" msgstr "Другие опции" @@ -3603,19 +3650,19 @@ msgstr "Ð’Ñе" msgid "license." msgstr "лицензиÑ." -#: lib/action.php:1053 +#: lib/action.php:1052 msgid "Pagination" msgstr "ПагинациÑ" -#: lib/action.php:1062 +#: lib/action.php:1061 msgid "After" msgstr "Сюда" -#: lib/action.php:1070 +#: lib/action.php:1069 msgid "Before" msgstr "Туда" -#: lib/action.php:1119 +#: lib/action.php:1117 msgid "There was a problem with your session token." msgstr "Проблема Ñ Ð’Ð°ÑˆÐµÐ¹ ÑеÑÑией. Попробуйте ещё раз, пожалуйÑта." @@ -3787,13 +3834,46 @@ msgstr "Ðе удаётÑÑ Ñоздать OpenID-форму: %s " msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:613 +#: lib/command.php:618 +#, fuzzy +msgid "You are not subscribed to anyone." +msgstr "Ð’Ñ‹ не подпиÑаны на Ñтот профиль." + +#: lib/command.php:620 +#, fuzzy +msgid "You are subscribed to these people: " +msgstr "Ð’Ñ‹ не подпиÑаны на Ñтот профиль." + +#: lib/command.php:637 +#, fuzzy +msgid "No one is subscribed to you." +msgstr "Ðе удаётÑÑ Ð¿Ð¾Ð´Ð¿Ð¸Ñать других на вашу ленту." + +#: lib/command.php:639 +#, fuzzy +msgid "These people are subscribed to you: " +msgstr "Люди подпиÑанные на %s" + +#: lib/command.php:656 +#, fuzzy +msgid "You are not a member of any groups." +msgstr "Ð’Ñ‹ не ÑвлÑетеÑÑŒ членом Ñтой группы." + +#: lib/command.php:658 +#, fuzzy +msgid "You are a member of these groups: " +msgstr "Ð’Ñ‹ не ÑвлÑетеÑÑŒ членом Ñтой группы." + +#: lib/command.php:670 msgid "" "Commands:\n" "on - turn on notifications\n" "off - turn off notifications\n" "help - show this help\n" "follow <nickname> - subscribe to user\n" +"groups - lists the groups you have joined\n" +"subscriptions - list the people you follow\n" +"subscribers - list the people that follow you\n" "leave <nickname> - unsubscribe from user\n" "d <nickname> <text> - direct message to user\n" "get <nickname> - get last notice from user\n" @@ -3823,20 +3903,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:191 +#: lib/common.php:192 #, fuzzy msgid "No configuration file found. " msgstr "Ðет кода подтверждениÑ." -#: lib/common.php:192 +#: lib/common.php:193 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:193 +#: lib/common.php:194 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:194 +#: lib/common.php:195 #, fuzzy msgid "Go to the installer." msgstr "Войти" @@ -4104,9 +4184,9 @@ msgid "Unknown file type" msgstr "Ðеподдерживаемый тип файла" #: lib/jabber.php:192 -#, fuzzy, php-format -msgid "notice id: %s" -msgstr "ÐÐ¾Ð²Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ" +#, php-format +msgid "[%s]" +msgstr "" #: lib/joinform.php:114 msgid "Join" @@ -4622,7 +4702,8 @@ msgid "Could not subscribe other to you." msgstr "Ðе удаётÑÑ Ð¿Ð¾Ð´Ð¿Ð¸Ñать других на вашу ленту." #: lib/subs.php:124 -msgid "Not subscribed!." +#, fuzzy +msgid "Not subscribed!" msgstr "Ðе подпиÑан!" #: lib/subs.php:136 @@ -4671,47 +4752,47 @@ msgstr "ПоÑлать приватное Ñообщение Ñтому поль msgid "Message" msgstr "Сообщение" -#: lib/util.php:818 +#: lib/util.php:821 msgid "a few seconds ago" msgstr "пару Ñекунд назад" -#: lib/util.php:820 +#: lib/util.php:823 msgid "about a minute ago" msgstr "около минуты назад" -#: lib/util.php:822 +#: lib/util.php:825 #, php-format msgid "about %d minutes ago" msgstr "около %d минут(Ñ‹) назад" -#: lib/util.php:824 +#: lib/util.php:827 msgid "about an hour ago" msgstr "около чаÑа назад" -#: lib/util.php:826 +#: lib/util.php:829 #, php-format msgid "about %d hours ago" msgstr "около %d чаÑа(ов) назад" -#: lib/util.php:828 +#: lib/util.php:831 msgid "about a day ago" msgstr "около Ð´Ð½Ñ Ð½Ð°Ð·Ð°Ð´" -#: lib/util.php:830 +#: lib/util.php:833 #, php-format msgid "about %d days ago" msgstr "около %d днÑ(ей) назад" -#: lib/util.php:832 +#: lib/util.php:835 msgid "about a month ago" msgstr "около меÑÑца назад" -#: lib/util.php:834 +#: lib/util.php:837 #, php-format msgid "about %d months ago" msgstr "около %d меÑÑца(ев) назад" -#: lib/util.php:836 +#: lib/util.php:839 msgid "about a year ago" msgstr "около года назад" diff --git a/locale/statusnet.po b/locale/statusnet.po index 30d449fba..0d0ea85f6 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: 2009-11-10 20:53+0000\n" +"POT-Creation-Date: 2009-11-16 19:42+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" @@ -22,12 +22,15 @@ msgid "No such page" msgstr "" #: actions/all.php:74 actions/allrss.php:68 -#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofilebackgroundimage.php:116 +#: actions/apiaccountupdateprofileimage.php:105 +#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 #: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 #: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 @@ -105,35 +108,40 @@ msgstr "" msgid "Updates from %1$s and friends on %2$s!" msgstr "" -#: actions/apiaccountratelimitstatus.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 -#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:129 actions/apigroupcreate.php:184 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120 -#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101 -#: actions/apigroupshow.php:105 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144 -#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141 -#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130 -#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163 -#: actions/apiusershow.php:101 -msgid "API method not found!" +#: actions/apiaccountratelimitstatus.php:70 +#: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofilebackgroundimage.php:94 +#: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apiaccountupdateprofile.php:97 +msgid "API method not found." msgstr "" -#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 +#: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofilebackgroundimage.php:86 +#: actions/apiaccountupdateprofilecolors.php:110 +#: actions/apiaccountupdateprofileimage.php:84 +#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109 +#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "" +#: actions/apiaccountupdatedeliverydevice.php:105 +msgid "" +"You must specify a parameter named 'device' with a value of one of: sms, im, " +"none" +msgstr "" + +#: actions/apiaccountupdatedeliverydevice.php:132 +msgid "Could not update user." +msgstr "" + +#: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 #: actions/newnotice.php:94 lib/designsettings.php:283 #, php-format msgid "" @@ -141,12 +149,31 @@ msgid "" "current configuration." msgstr "" -#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/apiaccountupdateprofilebackgroundimage.php:136 +#: actions/apiaccountupdateprofilebackgroundimage.php:146 +#: actions/apiaccountupdateprofilecolors.php:164 +#: actions/apiaccountupdateprofilecolors.php:174 +msgid "Unable to save your design settings." +msgstr "" + +#: actions/apiaccountupdateprofilebackgroundimage.php:187 +#: actions/apiaccountupdateprofilecolors.php:142 +msgid "Could not update your design." +msgstr "" + +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 +#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 #: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 msgid "User has no profile." msgstr "" +#: actions/apiaccountupdateprofile.php:147 +msgid "Could not save profile." +msgstr "" + #: actions/apiblockcreate.php:108 msgid "Block user failed." msgstr "" @@ -192,6 +219,23 @@ msgstr "" msgid "All the direct messages sent to %s" msgstr "" +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 +#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 +#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 +#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149 +#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +msgid "API method not found!" +msgstr "" + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -377,17 +421,17 @@ msgstr "" msgid "No status with that ID found." msgstr "" -#: actions/apistatusesupdate.php:152 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 #: scripts/maildaemon.php:71 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" -#: actions/apistatusesupdate.php:193 +#: actions/apistatusesupdate.php:198 msgid "Not found" msgstr "" -#: actions/apistatusesupdate.php:216 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:227 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -469,7 +513,7 @@ msgid "Invalid size." msgstr "" #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:113 +#: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "" @@ -517,7 +561,7 @@ msgstr "" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:151 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -1572,7 +1616,7 @@ msgid "Nickname" msgstr "" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:116 msgid "Password" msgstr "" @@ -1701,7 +1745,7 @@ msgstr "" #: actions/noticesearch.php:124 #, php-format msgid "" -"Why not [register an account](%%%%action.register%%%%) and be the first to " +"Why not [register an account](%%%%action.register%%%%) and be the first to " "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" msgstr "" @@ -1745,8 +1789,8 @@ msgstr "" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963 -#: lib/api.php:991 lib/api.php:1101 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 +#: lib/api.php:1027 lib/api.php:1137 msgid "Not a supported data format." msgstr "" @@ -1766,11 +1810,15 @@ msgstr "" msgid "Manage various other options." msgstr "" -#: actions/othersettings.php:117 +#: actions/othersettings.php:108 +msgid " (free service)" +msgstr "" + +#: actions/othersettings.php:116 msgid "Shorten URLs with" msgstr "" -#: actions/othersettings.php:118 +#: actions/othersettings.php:117 msgid "Automatic shortening service to use." msgstr "" @@ -1804,64 +1852,60 @@ msgstr "" msgid "Change password" msgstr "" -#: actions/passwordsettings.php:70 -msgid "You are not allowed to change your password" -msgstr "" - -#: actions/passwordsettings.php:82 +#: actions/passwordsettings.php:69 msgid "Change your password." msgstr "" -#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:96 actions/recoverpassword.php:231 msgid "Password change" msgstr "" -#: actions/passwordsettings.php:117 +#: actions/passwordsettings.php:104 msgid "Old password" msgstr "" -#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:108 actions/recoverpassword.php:235 msgid "New password" msgstr "" -#: actions/passwordsettings.php:122 +#: actions/passwordsettings.php:109 msgid "6 or more characters" msgstr "" -#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:112 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "" -#: actions/passwordsettings.php:126 +#: actions/passwordsettings.php:113 msgid "same as password above" msgstr "" -#: actions/passwordsettings.php:130 +#: actions/passwordsettings.php:117 msgid "Change" msgstr "" -#: actions/passwordsettings.php:167 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "" -#: actions/passwordsettings.php:170 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:233 msgid "Passwords don't match." msgstr "" -#: actions/passwordsettings.php:178 +#: actions/passwordsettings.php:165 msgid "Incorrect old password" msgstr "" -#: actions/passwordsettings.php:194 +#: actions/passwordsettings.php:181 msgid "Error saving user; invalid." msgstr "" -#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "" -#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:192 actions/recoverpassword.php:211 msgid "Password saved." msgstr "" @@ -2286,7 +2330,7 @@ msgid "Same as password above. Required." msgstr "" #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:122 +#: lib/accountsettingsaction.php:120 msgid "Email" msgstr "" @@ -3149,36 +3193,36 @@ msgstr "" msgid "DB error inserting reply: %s" msgstr "" -#: classes/User.php:333 +#: classes/User.php:347 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" -#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 msgid "Profile" msgstr "" -#: lib/accountsettingsaction.php:110 +#: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "" -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:112 msgid "Upload an avatar" msgstr "" -#: lib/accountsettingsaction.php:119 +#: lib/accountsettingsaction.php:116 msgid "Change your password" msgstr "" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:120 msgid "Change email handling" msgstr "" -#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 +#: lib/accountsettingsaction.php:124 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:126 +#: lib/accountsettingsaction.php:124 msgid "Design your profile" msgstr "" @@ -3186,7 +3230,7 @@ msgstr "" msgid "Other" msgstr "" -#: lib/accountsettingsaction.php:129 +#: lib/accountsettingsaction.php:128 msgid "Other options" msgstr "" @@ -3348,19 +3392,19 @@ msgstr "" msgid "license." msgstr "" -#: lib/action.php:1053 +#: lib/action.php:1052 msgid "Pagination" msgstr "" -#: lib/action.php:1062 +#: lib/action.php:1061 msgid "After" msgstr "" -#: lib/action.php:1070 +#: lib/action.php:1069 msgid "Before" msgstr "" -#: lib/action.php:1119 +#: lib/action.php:1117 msgid "There was a problem with your session token." msgstr "" @@ -3530,13 +3574,40 @@ msgstr "" msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:613 +#: lib/command.php:618 +msgid "You are not subscribed to anyone." +msgstr "" + +#: lib/command.php:620 +msgid "You are subscribed to these people: " +msgstr "" + +#: lib/command.php:637 +msgid "No one is subscribed to you." +msgstr "" + +#: lib/command.php:639 +msgid "These people are subscribed to you: " +msgstr "" + +#: lib/command.php:656 +msgid "You are not a member of any groups." +msgstr "" + +#: lib/command.php:658 +msgid "You are a member of these groups: " +msgstr "" + +#: lib/command.php:670 msgid "" "Commands:\n" "on - turn on notifications\n" "off - turn off notifications\n" "help - show this help\n" "follow <nickname> - subscribe to user\n" +"groups - lists the groups you have joined\n" +"subscriptions - list the people you follow\n" +"subscribers - list the people that follow you\n" "leave <nickname> - unsubscribe from user\n" "d <nickname> <text> - direct message to user\n" "get <nickname> - get last notice from user\n" @@ -3566,19 +3637,19 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:191 +#: lib/common.php:192 msgid "No configuration file found. " msgstr "" -#: lib/common.php:192 +#: lib/common.php:193 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:193 +#: lib/common.php:194 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:194 +#: lib/common.php:195 msgid "Go to the installer." msgstr "" @@ -3838,7 +3909,7 @@ msgstr "" #: lib/jabber.php:192 #, php-format -msgid "notice id: %s" +msgid "[%s]" msgstr "" #: lib/joinform.php:114 @@ -4339,7 +4410,7 @@ msgid "Could not subscribe other to you." msgstr "" #: lib/subs.php:124 -msgid "Not subscribed!." +msgid "Not subscribed!" msgstr "" #: lib/subs.php:136 @@ -4386,47 +4457,47 @@ msgstr "" msgid "Message" msgstr "" -#: lib/util.php:818 +#: lib/util.php:821 msgid "a few seconds ago" msgstr "" -#: lib/util.php:820 +#: lib/util.php:823 msgid "about a minute ago" msgstr "" -#: lib/util.php:822 +#: lib/util.php:825 #, php-format msgid "about %d minutes ago" msgstr "" -#: lib/util.php:824 +#: lib/util.php:827 msgid "about an hour ago" msgstr "" -#: lib/util.php:826 +#: lib/util.php:829 #, php-format msgid "about %d hours ago" msgstr "" -#: lib/util.php:828 +#: lib/util.php:831 msgid "about a day ago" msgstr "" -#: lib/util.php:830 +#: lib/util.php:833 #, php-format msgid "about %d days ago" msgstr "" -#: lib/util.php:832 +#: lib/util.php:835 msgid "about a month ago" msgstr "" -#: lib/util.php:834 +#: lib/util.php:837 #, php-format msgid "about %d months ago" msgstr "" -#: lib/util.php:836 +#: lib/util.php:839 msgid "about a year ago" msgstr "" diff --git a/locale/sv/LC_MESSAGES/statusnet.mo b/locale/sv/LC_MESSAGES/statusnet.mo Binary files differindex 8c1d54b02..ed78309b1 100644 --- a/locale/sv/LC_MESSAGES/statusnet.mo +++ b/locale/sv/LC_MESSAGES/statusnet.mo diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po index f43a686b7..437c4b244 100644 --- a/locale/sv/LC_MESSAGES/statusnet.po +++ b/locale/sv/LC_MESSAGES/statusnet.po @@ -5,12 +5,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-10 20:53+0000\n" -"PO-Revision-Date: 2009-11-10 20:59:45+0000\n" +"POT-Creation-Date: 2009-11-16 19:42+0000\n" +"PO-Revision-Date: 2009-11-16 19:44:15+0000\n" "Language-Team: Swedish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: sv\n" "X-Message-Group: out-statusnet\n" @@ -22,12 +22,15 @@ msgid "No such page" msgstr "Inget sÃ¥dant meddelande." #: actions/all.php:74 actions/allrss.php:68 -#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofilebackgroundimage.php:116 +#: actions/apiaccountupdateprofileimage.php:105 +#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 #: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 #: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 @@ -106,35 +109,42 @@ msgstr "%s med vänner" msgid "Updates from %1$s and friends on %2$s!" msgstr "Uppdateringar frÃ¥n %1$s och vänner pÃ¥ %2$s!" -#: actions/apiaccountratelimitstatus.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 -#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:129 actions/apigroupcreate.php:184 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120 -#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101 -#: actions/apigroupshow.php:105 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144 -#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141 -#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130 -#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163 -#: actions/apiusershow.php:101 -msgid "API method not found!" +#: actions/apiaccountratelimitstatus.php:70 +#: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofilebackgroundimage.php:94 +#: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apiaccountupdateprofile.php:97 +#, fuzzy +msgid "API method not found." msgstr "API-metoden hittades inte!" -#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 +#: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofilebackgroundimage.php:86 +#: actions/apiaccountupdateprofilecolors.php:110 +#: actions/apiaccountupdateprofileimage.php:84 +#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109 +#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "Denna metod kräver skicka." +#: actions/apiaccountupdatedeliverydevice.php:105 +msgid "" +"You must specify a parameter named 'device' with a value of one of: sms, im, " +"none" +msgstr "" + +#: actions/apiaccountupdatedeliverydevice.php:132 +#, fuzzy +msgid "Could not update user." +msgstr "Kunde inte uppdatera användare." + +#: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 #: actions/newnotice.php:94 lib/designsettings.php:283 #, php-format msgid "" @@ -142,12 +152,34 @@ msgid "" "current configuration." msgstr "" -#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/apiaccountupdateprofilebackgroundimage.php:136 +#: actions/apiaccountupdateprofilebackgroundimage.php:146 +#: actions/apiaccountupdateprofilecolors.php:164 +#: actions/apiaccountupdateprofilecolors.php:174 +#, fuzzy +msgid "Unable to save your design settings." +msgstr "Kunde inte spara dina Twitter inställningar!" + +#: actions/apiaccountupdateprofilebackgroundimage.php:187 +#: actions/apiaccountupdateprofilecolors.php:142 +#, fuzzy +msgid "Could not update your design." +msgstr "Kunde inte uppdatera användare." + +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 +#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 #: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 msgid "User has no profile." msgstr "Användaren har ingen profil." +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "Kunde inte spara profil." + #: actions/apiblockcreate.php:108 msgid "Block user failed." msgstr "" @@ -194,6 +226,23 @@ msgstr "Direktmeddelande till %s" msgid "All the direct messages sent to %s" msgstr "Alla direktmeddelanden skickade till %s" +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 +#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 +#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 +#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149 +#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +msgid "API method not found!" +msgstr "API-metoden hittades inte!" + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -391,17 +440,17 @@ msgstr "Användarbilden uppdaterad." msgid "No status with that ID found." msgstr "Ingen status med det ID hittades." -#: actions/apistatusesupdate.php:152 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 #: scripts/maildaemon.php:71 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "För lÃ¥ngt. Maximalt 140 tecken" -#: actions/apistatusesupdate.php:193 +#: actions/apistatusesupdate.php:198 msgid "Not found" msgstr "Hittades inte" -#: actions/apistatusesupdate.php:216 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:227 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -486,7 +535,7 @@ msgid "Invalid size." msgstr "Felaktig storlek" #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:113 +#: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "Användarbild" @@ -536,7 +585,7 @@ msgstr "" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:151 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -1698,7 +1747,7 @@ msgid "Nickname" msgstr "Smeknamn" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Lösenord" @@ -1836,7 +1885,7 @@ msgstr "" #: actions/noticesearch.php:124 #, php-format msgid "" -"Why not [register an account](%%%%action.register%%%%) and be the first to " +"Why not [register an account](%%%%action.register%%%%) and be the first to " "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" msgstr "" @@ -1881,8 +1930,8 @@ msgstr "Anslut" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963 -#: lib/api.php:991 lib/api.php:1101 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 +#: lib/api.php:1027 lib/api.php:1137 msgid "Not a supported data format." msgstr "Ingen support för det formatet." @@ -1903,11 +1952,15 @@ msgstr "Twitter inställningar" msgid "Manage various other options." msgstr "" -#: actions/othersettings.php:117 +#: actions/othersettings.php:108 +msgid " (free service)" +msgstr "" + +#: actions/othersettings.php:116 msgid "Shorten URLs with" msgstr "" -#: actions/othersettings.php:118 +#: actions/othersettings.php:117 msgid "Automatic shortening service to use." msgstr "" @@ -1943,67 +1996,62 @@ msgstr "Detta är din outbox som innehÃ¥ller meddelanden som du skickat." msgid "Change password" msgstr "Byt lösenord" -#: actions/passwordsettings.php:70 -#, fuzzy -msgid "You are not allowed to change your password" -msgstr "Ändra ditt lösenord" - -#: actions/passwordsettings.php:82 +#: actions/passwordsettings.php:69 #, fuzzy msgid "Change your password." msgstr "Ändra ditt lösenord" -#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:96 actions/recoverpassword.php:231 #, fuzzy msgid "Password change" msgstr "Lösenord är sparat." -#: actions/passwordsettings.php:117 +#: actions/passwordsettings.php:104 msgid "Old password" msgstr "Gammalt lösenord" -#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:108 actions/recoverpassword.php:235 msgid "New password" msgstr "Nytt lösenord" -#: actions/passwordsettings.php:122 +#: actions/passwordsettings.php:109 msgid "6 or more characters" msgstr "Minst 6 tecken" -#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:112 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Bekräfta" -#: actions/passwordsettings.php:126 +#: actions/passwordsettings.php:113 msgid "same as password above" msgstr "samma som lösenordet ovan" -#: actions/passwordsettings.php:130 +#: actions/passwordsettings.php:117 msgid "Change" msgstr "Ändra" -#: actions/passwordsettings.php:167 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "Lösenordet mÃ¥ste vara minst 6 tecken." -#: actions/passwordsettings.php:170 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:233 msgid "Passwords don't match." msgstr "Lösenorden matchar inte." -#: actions/passwordsettings.php:178 +#: actions/passwordsettings.php:165 msgid "Incorrect old password" msgstr "Felaktigt, gammalt lösenord" -#: actions/passwordsettings.php:194 +#: actions/passwordsettings.php:181 msgid "Error saving user; invalid." msgstr "Fel uppstog när användare skulle sparas." -#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Kan inte spara det nya lösenordet." -#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:192 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Lösenord är sparat." @@ -2446,7 +2494,7 @@ msgid "Same as password above. Required." msgstr "Samma som lösenordet ovan. MÃ¥ste fyllas i." #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:122 +#: lib/accountsettingsaction.php:120 msgid "Email" msgstr "Epost" @@ -3382,37 +3430,37 @@ msgstr "Det var ett problem när inlägget sparades." msgid "DB error inserting reply: %s" msgstr "Databasfel för svar: %s" -#: classes/User.php:333 +#: classes/User.php:347 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Meddelande till %1$s pÃ¥ %2$s" -#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Profil" -#: lib/accountsettingsaction.php:110 +#: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "Ändra dina profilinställningar" -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:112 #, fuzzy msgid "Upload an avatar" msgstr "Uppdatering av profilbild misslyckades." -#: lib/accountsettingsaction.php:119 +#: lib/accountsettingsaction.php:116 msgid "Change your password" msgstr "Ändra ditt lösenord" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:120 msgid "Change email handling" msgstr "Ändra email hantering" -#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 +#: lib/accountsettingsaction.php:124 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:126 +#: lib/accountsettingsaction.php:124 #, fuzzy msgid "Design your profile" msgstr "Användaren har ingen profil." @@ -3421,7 +3469,7 @@ msgstr "Användaren har ingen profil." msgid "Other" msgstr "" -#: lib/accountsettingsaction.php:129 +#: lib/accountsettingsaction.php:128 msgid "Other options" msgstr "" @@ -3599,21 +3647,21 @@ msgstr "" msgid "license." msgstr "" -#: lib/action.php:1053 +#: lib/action.php:1052 msgid "Pagination" msgstr "" -#: lib/action.php:1062 +#: lib/action.php:1061 #, fuzzy msgid "After" msgstr "« Nyare" -#: lib/action.php:1070 +#: lib/action.php:1069 #, fuzzy msgid "Before" msgstr "Tidigare »" -#: lib/action.php:1119 +#: lib/action.php:1117 #, fuzzy msgid "There was a problem with your session token." msgstr "Det var nÃ¥got problem med din session. Försök igen, tack." @@ -3786,13 +3834,46 @@ msgstr "Kan inte skapa OpenID formulär: %s" msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:613 +#: lib/command.php:618 +#, fuzzy +msgid "You are not subscribed to anyone." +msgstr "Du skickade inte oss den profilen" + +#: lib/command.php:620 +#, fuzzy +msgid "You are subscribed to these people: " +msgstr "Du skickade inte oss den profilen" + +#: lib/command.php:637 +#, fuzzy +msgid "No one is subscribed to you." +msgstr "Kunde inte prenumerera pÃ¥ annat Ã¥t dig." + +#: lib/command.php:639 +#, fuzzy +msgid "These people are subscribed to you: " +msgstr "Fjärrprenumerera" + +#: lib/command.php:656 +#, fuzzy +msgid "You are not a member of any groups." +msgstr "Du skickade inte oss den profilen" + +#: lib/command.php:658 +#, fuzzy +msgid "You are a member of these groups: " +msgstr "Du skickade inte oss den profilen" + +#: lib/command.php:670 msgid "" "Commands:\n" "on - turn on notifications\n" "off - turn off notifications\n" "help - show this help\n" "follow <nickname> - subscribe to user\n" +"groups - lists the groups you have joined\n" +"subscriptions - list the people you follow\n" +"subscribers - list the people that follow you\n" "leave <nickname> - unsubscribe from user\n" "d <nickname> <text> - direct message to user\n" "get <nickname> - get last notice from user\n" @@ -3822,20 +3903,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:191 +#: lib/common.php:192 #, fuzzy msgid "No configuration file found. " msgstr "Ingen bekräftelsekod." -#: lib/common.php:192 +#: lib/common.php:193 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:193 +#: lib/common.php:194 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:194 +#: lib/common.php:195 msgid "Go to the installer." msgstr "" @@ -4113,8 +4194,8 @@ msgstr "okänd fil typ" #: lib/jabber.php:192 #, php-format -msgid "notice id: %s" -msgstr "Nytt inlägg" +msgid "[%s]" +msgstr "" #: lib/joinform.php:114 #, fuzzy @@ -4647,7 +4728,8 @@ msgid "Could not subscribe other to you." msgstr "Kunde inte prenumerera pÃ¥ annat Ã¥t dig." #: lib/subs.php:124 -msgid "Not subscribed!." +#, fuzzy +msgid "Not subscribed!" msgstr "Ingen prenumerant!" #: lib/subs.php:136 @@ -4700,47 +4782,47 @@ msgstr "Du kan inte skicka meddelande till den användaren." msgid "Message" msgstr "Nytt meddelande" -#: lib/util.php:818 +#: lib/util.php:821 msgid "a few seconds ago" msgstr "ett par sekunder sedan" -#: lib/util.php:820 +#: lib/util.php:823 msgid "about a minute ago" msgstr "för nÃ¥n minut sedan" -#: lib/util.php:822 +#: lib/util.php:825 #, php-format msgid "about %d minutes ago" msgstr "för %d minuter sedan" -#: lib/util.php:824 +#: lib/util.php:827 msgid "about an hour ago" msgstr "för en timma sedan" -#: lib/util.php:826 +#: lib/util.php:829 #, php-format msgid "about %d hours ago" msgstr "för %d timmar sedan" -#: lib/util.php:828 +#: lib/util.php:831 msgid "about a day ago" msgstr "för en dag sedan" -#: lib/util.php:830 +#: lib/util.php:833 #, php-format msgid "about %d days ago" msgstr "för %d dagar sedan" -#: lib/util.php:832 +#: lib/util.php:835 msgid "about a month ago" msgstr "för en mÃ¥nad sedan" -#: lib/util.php:834 +#: lib/util.php:837 #, php-format msgid "about %d months ago" msgstr "för %d mÃ¥nader sedan" -#: lib/util.php:836 +#: lib/util.php:839 msgid "about a year ago" msgstr "för ett Ã¥r sedan" diff --git a/locale/te/LC_MESSAGES/statusnet.mo b/locale/te/LC_MESSAGES/statusnet.mo Binary files differindex d1784c5d8..059365e86 100644 --- a/locale/te/LC_MESSAGES/statusnet.mo +++ b/locale/te/LC_MESSAGES/statusnet.mo diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po index b044aef99..b45d8a5a9 100644 --- a/locale/te/LC_MESSAGES/statusnet.po +++ b/locale/te/LC_MESSAGES/statusnet.po @@ -6,12 +6,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-10 20:53+0000\n" -"PO-Revision-Date: 2009-11-10 20:59:48+0000\n" +"POT-Creation-Date: 2009-11-16 19:42+0000\n" +"PO-Revision-Date: 2009-11-16 19:44:17+0000\n" "Language-Team: Telugu\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: te\n" "X-Message-Group: out-statusnet\n" @@ -22,12 +22,15 @@ msgid "No such page" msgstr "à°…à°Ÿà±à°µà°‚à°Ÿà°¿ పేజీ లేదà±" #: actions/all.php:74 actions/allrss.php:68 -#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofilebackgroundimage.php:116 +#: actions/apiaccountupdateprofileimage.php:105 +#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 #: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 #: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 @@ -73,7 +76,7 @@ msgstr "%s యొకà±à°• మితà±à°°à±à°² ఫీడౠ(ఆటమà±)" #, php-format msgid "" "This is the timeline for %s and friends but no one has posted anything yet." -msgstr "" +msgstr "ఇది %s మరియౠమితà±à°°à±à°² కాలరేఖ కానీ ఇంకా ఎవరూ à°à°®à±€ రాయలేదà±." #: actions/all.php:132 #, php-format @@ -105,35 +108,42 @@ msgstr "మీరౠమరియౠమీ à°¸à±à°¨à±‡à°¹à°¿à°¤à±à°²à±" msgid "Updates from %1$s and friends on %2$s!" msgstr "" -#: actions/apiaccountratelimitstatus.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 -#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:129 actions/apigroupcreate.php:184 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120 -#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101 -#: actions/apigroupshow.php:105 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144 -#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141 -#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130 -#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163 -#: actions/apiusershow.php:101 -msgid "API method not found!" -msgstr "" +#: actions/apiaccountratelimitstatus.php:70 +#: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofilebackgroundimage.php:94 +#: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apiaccountupdateprofile.php:97 +#, fuzzy +msgid "API method not found." +msgstr "నిరà±à°§à°¾à°°à°£ సంకేతం కనబడలేదà±." -#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 +#: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofilebackgroundimage.php:86 +#: actions/apiaccountupdateprofilecolors.php:110 +#: actions/apiaccountupdateprofileimage.php:84 +#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109 +#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "" +#: actions/apiaccountupdatedeliverydevice.php:105 +msgid "" +"You must specify a parameter named 'device' with a value of one of: sms, im, " +"none" +msgstr "" + +#: actions/apiaccountupdatedeliverydevice.php:132 +#, fuzzy +msgid "Could not update user." +msgstr "వాడà±à°•à°°à°¿à°¨à°¿ తాజాకరించలేకà±à°¨à±à°¨à°¾à°‚." + +#: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 #: actions/newnotice.php:94 lib/designsettings.php:283 #, php-format msgid "" @@ -141,12 +151,33 @@ msgid "" "current configuration." msgstr "" -#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/apiaccountupdateprofilebackgroundimage.php:136 +#: actions/apiaccountupdateprofilebackgroundimage.php:146 +#: actions/apiaccountupdateprofilecolors.php:164 +#: actions/apiaccountupdateprofilecolors.php:174 +msgid "Unable to save your design settings." +msgstr "" + +#: actions/apiaccountupdateprofilebackgroundimage.php:187 +#: actions/apiaccountupdateprofilecolors.php:142 +#, fuzzy +msgid "Could not update your design." +msgstr "వాడà±à°•à°°à°¿à°¨à°¿ తాజాకరించలేకà±à°¨à±à°¨à°¾à°‚." + +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 +#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 #: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 msgid "User has no profile." msgstr "వాడà±à°•à°°à°¿à°•à°¿ à°ªà±à°°à±Šà°«à±ˆà°²à± లేదà±." +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "à°ªà±à°°à±Šà°«à±ˆà°²à±à°¨à°¿ à°à°¦à±à°°à°ªà°°à°šà°²à±‡à°•à±à°¨à±à°¨à°¾à°‚." + #: actions/apiblockcreate.php:108 msgid "Block user failed." msgstr "వాడà±à°•à°°à°¿ నిరోధం విఫలమైంది." @@ -192,15 +223,31 @@ msgstr "" msgid "All the direct messages sent to %s" msgstr "" +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 +#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 +#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 +#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149 +#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +msgid "API method not found!" +msgstr "" + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 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." @@ -247,9 +294,8 @@ msgid "Could not find target user." msgstr "వాడà±à°•à°°à°¿à°¨à°¿ తాజాకరించలేకà±à°¨à±à°¨à°¾à°‚." #: actions/apigroupcreate.php:136 actions/newgroup.php:204 -#, fuzzy msgid "Could not create group." -msgstr "అవతారపౠసమాచారానà±à°¨à°¿ à°à°¦à±à°°à°ªà°°à°šà°²à±‡à°•à±à°¨à±à°¨à°¾à°‚" +msgstr "à°—à±à°‚à°ªà±à°¨à°¿ సృషà±à°Ÿà°¿à°‚చలేకపోయాం." #: actions/apigroupcreate.php:147 actions/editgroup.php:259 #: actions/newgroup.php:210 @@ -384,17 +430,17 @@ msgstr "à°¸à±à°¥à°¿à°¤à°¿à°¨à°¿ తొలగించాం." msgid "No status with that ID found." msgstr "" -#: actions/apistatusesupdate.php:152 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 #: scripts/maildaemon.php:71 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "ఇది చాలా పొడవà±à°‚ది. à°—à°°à°¿à°·à±à° సందేశ పరిమాణం 140 à°…à°•à±à°·à°°à°¾à°²à±." -#: actions/apistatusesupdate.php:193 +#: actions/apistatusesupdate.php:198 msgid "Not found" msgstr "దొరకలేదà±" -#: actions/apistatusesupdate.php:216 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:227 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -456,14 +502,12 @@ msgid "Updates tagged with %1$s on %2$s!" msgstr "%s యొకà±à°• మైకà±à°°à±‹à°¬à±à°²à°¾à°—à±" #: actions/apiusershow.php:96 -#, fuzzy msgid "Not found." -msgstr "à°…à°à±à°¯à°°à±à°¥à°¨à°²à±‡à°®à±€ కనబడలేదà±!" +msgstr "కనబడలేదà±." #: actions/attachment.php:73 -#, fuzzy msgid "No such attachment." -msgstr "à°…à°Ÿà±à°µà°‚à°Ÿà°¿ పతà±à°°à°®à±‡à°®à±€ లేదà±." +msgstr "à°…à°Ÿà±à°µà°‚à°Ÿà°¿ జోడింపౠలేదà±." #: actions/avatarbynickname.php:59 actions/leavegroup.php:76 #, fuzzy @@ -479,7 +523,7 @@ msgid "Invalid size." msgstr "తపà±à°ªà±à°¡à± పరిమాణం." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:113 +#: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "అవతారం" @@ -527,7 +571,7 @@ msgstr "à°•à°¤à±à°¤à°¿à°°à°¿à°‚à°šà±" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:151 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -644,9 +688,8 @@ msgid "No" msgstr "కాదà±" #: actions/block.php:149 -#, fuzzy msgid "Do not block this user" -msgstr "à°…à°Ÿà±à°µà°‚à°Ÿà°¿ వాడà±à°•à°°à°¿ లేరà±." +msgstr "à°ˆ వాడà±à°•à°°à°¿à°¨à°¿ నిరోధించకà±" #: actions/block.php:150 actions/deletenotice.php:146 #: actions/groupblock.php:179 @@ -659,13 +702,12 @@ msgid "Block this user" msgstr "à°ˆ వాడà±à°•à°°à°¿à°¨à°¿ నిరోధించà±" #: actions/block.php:165 -#, fuzzy msgid "You have already blocked this user." -msgstr "మీరౠఇపà±à°ªà°Ÿà°¿à°•à±‡ లోనికి à°ªà±à°°à°µà±‡à°¶à°¿à°‚చారà±!" +msgstr "మీరౠఇపà±à°ªà°Ÿà°¿à°•à±‡ à°ˆ వాడà±à°•à°°à°¿à°¨à°¿ నిరోధించారà±." #: actions/block.php:170 msgid "Failed to save block information." -msgstr "" +msgstr "నిరోధపౠసమాచారానà±à°¨à°¿ à°à°¦à±à°°à°ªà°°à°šà°¡à°‚లో విఫలమయà±à°¯à°¾à°‚." #: actions/bookmarklet.php:50 msgid "Post to " @@ -739,7 +781,7 @@ msgstr "" #: actions/deletenotice.php:109 actions/deletenotice.php:141 msgid "Delete notice" -msgstr "" +msgstr "నోటీసà±à°¨à°¿ తొలగించà±" #: actions/deletenotice.php:144 msgid "Are you sure you want to delete this notice?" @@ -764,7 +806,7 @@ msgstr "" #: actions/disfavor.php:94 msgid "Add to favorites" -msgstr "" +msgstr "ఇషà±à°Ÿà°¾à°‚శాలకౠచేరà±à°šà±" #: actions/doc.php:69 msgid "No such document." @@ -773,7 +815,7 @@ msgstr "à°…à°Ÿà±à°µà°‚à°Ÿà°¿ పతà±à°°à°®à±‡à°®à±€ లేదà±." #: actions/editgroup.php:56 #, php-format msgid "Edit %s group" -msgstr "" +msgstr "%s à°—à±à°‚à°ªà±à°¨à°¿ మారà±à°šà±" #: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65 msgid "You must be logged in to create a group." @@ -789,9 +831,9 @@ msgid "Use this form to edit the group." msgstr "" #: actions/editgroup.php:201 actions/newgroup.php:145 -#, fuzzy, php-format +#, php-format msgid "description is too long (max %d chars)." -msgstr "à°¸à±à°µà°ªà°°à°¿à°šà°¯à°‚ చాలా పెదà±à°¦à°—à°¾ ఉంది (140 à°…à°•à±à°·à°°à°¾à°²à± à°—à°°à°¿à°·à±à° à°‚)." +msgstr "వివరణ చాలా పెదà±à°¦à°¦à°¿à°—à°¾ ఉంది (140 à°…à°•à±à°·à°°à°¾à°²à± à°—à°°à°¿à°·à±à° à°‚)." #: actions/editgroup.php:253 #, fuzzy @@ -914,7 +956,7 @@ msgstr "à°…à°à°¿à°°à±à°šà±à°²à± à°à°¦à±à°°à°®à°¯à±à°¯à°¾à°¯à°¿." #: actions/emailsettings.php:319 msgid "No email address." -msgstr "" +msgstr "ఈమెయిలౠచిరà±à°¨à°¾à°®à°¾ లేదà±." #: actions/emailsettings.php:326 msgid "Cannot normalize that email address" @@ -922,7 +964,7 @@ msgstr "" #: actions/emailsettings.php:330 msgid "Not a valid email address" -msgstr "" +msgstr "సరైన ఈమెయిలౠచిరà±à°¨à°¾à°®à°¾ కాదà±" #: actions/emailsettings.php:333 msgid "That is already your email address." @@ -959,7 +1001,7 @@ msgstr "నిరà±à°§à°¾à°°à°£ à°°à°¦à±à°¦à°¯à°¿à°‚ది." #: actions/emailsettings.php:412 msgid "That is not your email address." -msgstr "" +msgstr "అది మీ ఈమెయిలౠచిరà±à°¨à°¾à°®à°¾ కాదà±." #: actions/emailsettings.php:431 actions/imsettings.php:408 #: actions/smssettings.php:425 @@ -985,14 +1027,13 @@ msgstr "" #: actions/favorited.php:65 lib/popularnoticesection.php:87 #: lib/publicgroupnav.php:93 -#, fuzzy msgid "Popular notices" -msgstr "à°…à°Ÿà±à°µà°‚à°Ÿà°¿ సందేశమేమీ లేదà±." +msgstr "à°ªà±à°°à°¾à°šà±à°°à±à°¯ నోటీసà±à°²à±" #: actions/favorited.php:67 -#, fuzzy, php-format +#, php-format msgid "Popular notices, page %d" -msgstr "à°…à°Ÿà±à°µà°‚à°Ÿà°¿ సందేశమేమీ లేదà±." +msgstr "à°ªà±à°°à°¾à°šà±à°°à±à°¯ నోటీసà±à°²à±, పేజీ %d" #: actions/favorited.php:79 msgid "The most popular notices on the site right now." @@ -1019,7 +1060,7 @@ msgstr "" #: lib/personalgroupnav.php:115 #, php-format msgid "%s's favorite notices" -msgstr "" +msgstr "%sà°•à°¿ ఇషà±à°Ÿà°®à±ˆà°¨ నోటీసà±à°²à±" #: actions/favoritesrss.php:115 #, fuzzy, php-format @@ -1028,7 +1069,7 @@ msgstr "%s యొకà±à°• మైకà±à°°à±‹à°¬à±à°²à°¾à°—à±" #: actions/favor.php:79 msgid "This notice is already a favorite!" -msgstr "" +msgstr "à°ˆ నోటీసౠఇపà±à°ªà°Ÿà°¿à°•à±‡ మీ ఇషà±à°Ÿà°¾à°‚శం!" #: actions/favor.php:92 lib/disfavorform.php:140 msgid "Disfavor favorite" @@ -1055,9 +1096,8 @@ msgid "No notice id" msgstr "కొతà±à°¤ సందేశం" #: actions/file.php:38 -#, fuzzy msgid "No notice" -msgstr "కొతà±à°¤ సందేశం" +msgstr "సందేశం లేదà±" #: actions/file.php:42 msgid "No attachments" @@ -1065,7 +1105,7 @@ msgstr "జోడింపà±à°²à± లేవà±" #: actions/file.php:51 msgid "No uploaded attachments" -msgstr "" +msgstr "à°Žà°•à±à°•à°¿à°‚à°šà°¿à°¨ జోడింపà±à°²à±‡à°®à±€ లేవà±" #: actions/finishremotesubscribe.php:69 msgid "Not expecting this response!" @@ -1106,14 +1146,12 @@ msgid "No such group." msgstr "à°…à°Ÿà±à°µà°‚à°Ÿà°¿ à°—à±à°‚పౠలేదà±." #: actions/getfile.php:75 -#, fuzzy msgid "No such file." -msgstr "à°…à°Ÿà±à°µà°‚à°Ÿà°¿ సందేశమేమీ లేదà±." +msgstr "à°…à°Ÿà±à°µà°‚à°Ÿà°¿ ఫైలౠలేదà±." #: actions/getfile.php:79 -#, fuzzy msgid "Cannot read file." -msgstr "à°…à°Ÿà±à°µà°‚à°Ÿà°¿ సందేశమేమీ లేదà±." +msgstr "ఫైలà±à°¨à°¿ చదవలేకపోతà±à°¨à±à°¨à°¾à°‚." #: actions/groupblock.php:81 actions/groupunblock.php:81 #: actions/makeadmin.php:81 @@ -1122,7 +1160,7 @@ msgstr "" #: actions/groupblock.php:91 msgid "Only an admin can block group members." -msgstr "" +msgstr "నిరà±à°µà°¾à°¹à°•à±à°²à± మాతà±à°°à°®à±‡ à°—à±à°‚పౠసà°à±à°¯à±à°²à°¨à± నిరోధించగలరà±." #: actions/groupblock.php:95 msgid "User is already blocked from group." @@ -1130,12 +1168,11 @@ msgstr "వాడà±à°•à°°à°¿à°¨à°¿ ఇపà±à°ªà°Ÿà°¿à°•à±‡ à°—à±à°‚à°ªà±à°¨à #: actions/groupblock.php:100 msgid "User is not a member of group." -msgstr "" +msgstr "వాడà±à°•à°°à°¿ à°ˆ à°—à±à°‚à°ªà±à°²à±‹ à°¸à°à±à°¯à±à°²à± కాదà±." #: actions/groupblock.php:136 actions/groupmembers.php:314 -#, fuzzy msgid "Block user from group" -msgstr "à°…à°Ÿà±à°µà°‚à°Ÿà°¿ వాడà±à°•à°°à°¿ లేరà±." +msgstr "వాడà±à°•à°°à°¿à°¨à°¿ à°—à±à°‚పౠనà±à°‚à°¡à°¿ నిరోధించà±" #: actions/groupblock.php:162 #, php-format @@ -1164,11 +1201,11 @@ msgstr "" #: actions/groupdesignsettings.php:68 msgid "You must be logged in to edit a group." -msgstr "" +msgstr "à°—à±à°‚à°ªà±à°¨à°¿ మారà±à°šà°¡à°¾à°¨à°¿à°•à°¿ మీరౠపà±à°°à°µà±‡à°¶à°¿à°‚à°šà°¿ ఉండాలి." #: actions/groupdesignsettings.php:141 msgid "Group design" -msgstr "" +msgstr "à°—à±à°‚పౠఅలంకారం" #: actions/groupdesignsettings.php:152 msgid "" @@ -1245,7 +1282,7 @@ msgstr "" #: actions/groupmembers.php:473 msgid "Make Admin" -msgstr "" +msgstr "నిరà±à°µà°¾à°¹à°•à±à°¨à±à°¨à°¿ చేయి" #: actions/groupmembers.php:473 msgid "Make this user an admin" @@ -1266,15 +1303,13 @@ msgstr "" "ఖాళీలతో వేరà±à°šà±‡à°¯à°‚à°¡à°¿; à°’à°•à±à°•à±‹ పదంలో 3 లేదా అంతకంటే à°Žà°•à±à°•à±à°µ à°…à°•à±à°·à°°à°¾à°²à± ఉండాలి." #: actions/groupsearch.php:58 -#, fuzzy msgid "Group search" -msgstr "à°µà±à°¯à°•à±à°¤à±à°² à°…à°¨à±à°µà±‡à°·à°£" +msgstr "à°—à±à°‚à°ªà±à°² à°…à°¨à±à°µà±‡à°·à°£" #: actions/groupsearch.php:79 actions/noticesearch.php:117 #: actions/peoplesearch.php:83 -#, fuzzy msgid "No results." -msgstr "ఫలితాలేమీ లేవà±" +msgstr "ఫలితాలేమీ లేవà±." #: actions/groupsearch.php:82 #, php-format @@ -1572,7 +1607,7 @@ msgstr "ఓపెనà±à°à°¡à±€ ఫారమà±à°¨à± సృషà±à°Ÿà°¿à°‚à°šà #: actions/leavegroup.php:134 lib/command.php:289 #, php-format msgid "%s left group %s" -msgstr "" +msgstr "%2$s à°—à±à°‚పౠనà±à°‚à°¡à°¿ %1$s వైదొలిగారà±" #: actions/login.php:79 actions/register.php:137 msgid "Already logged in." @@ -1608,7 +1643,7 @@ msgid "Nickname" msgstr "పేరà±" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:116 msgid "Password" msgstr "సంకేతపదం" @@ -1659,7 +1694,7 @@ msgstr "" #: actions/microsummary.php:69 msgid "No current status" -msgstr "" +msgstr "à°ªà±à°°à°¸à±à°¤à±à°¤ à°¸à±à°¥à°¿à°¤à°¿ à°à°®à±€ లేదà±" #: actions/newgroup.php:53 msgid "New group" @@ -1741,7 +1776,7 @@ msgstr "" #: actions/noticesearch.php:124 #, php-format msgid "" -"Why not [register an account](%%%%action.register%%%%) and be the first to " +"Why not [register an account](%%%%action.register%%%%) and be the first to " "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" msgstr "" @@ -1786,18 +1821,18 @@ msgstr "à°…à°¨à±à°¸à°‚ధానించà±" msgid "Only " msgstr "మాతà±à°°à°®à±‡ " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963 -#: lib/api.php:991 lib/api.php:1101 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 +#: lib/api.php:1027 lib/api.php:1137 msgid "Not a supported data format." msgstr "" #: actions/opensearch.php:64 msgid "People Search" -msgstr "" +msgstr "à°ªà±à°°à°œà°² à°…à°¨à±à°µà±‡à°·à°£" #: actions/opensearch.php:67 msgid "Notice Search" -msgstr "" +msgstr "నోటీసà±à°² à°…à°¨à±à°µà±‡à°·à°£" #: actions/othersettings.php:60 msgid "Other Settings" @@ -1807,13 +1842,17 @@ msgstr "ఇతర అమరికలà±" msgid "Manage various other options." msgstr "" -#: actions/othersettings.php:117 +#: actions/othersettings.php:108 +msgid " (free service)" +msgstr " (à°¸à±à°µà±‡à°šà±à°›à°¾ సేవ)" + +#: actions/othersettings.php:116 msgid "Shorten URLs with" -msgstr "" +msgstr "URL à°•à±à°¦à°¿à°‚పౠసేవ" -#: actions/othersettings.php:118 +#: actions/othersettings.php:117 msgid "Automatic shortening service to use." -msgstr "" +msgstr "ఉపయోగించాలà±à°¸à°¿à°¨ యాంతà±à°°à°¿à°• à°•à±à°¦à°¿à°‚పౠసేవ." #: actions/othersettings.php:122 #, fuzzy @@ -1825,9 +1864,8 @@ msgid "Show or hide profile designs." msgstr "" #: actions/othersettings.php:153 -#, fuzzy msgid "URL shortening service is too long (max 50 chars)." -msgstr "à°ªà±à°°à°¾à°‚తం పేరౠమరీ పెదà±à°¦à°—à°¾ ఉంది (255 à°…à°•à±à°·à°°à°¾à°²à± à°—à°°à°¿à°·à±à° à°‚)." +msgstr "URL à°•à±à°¦à°¿à°‚పౠసేవ మరీ పెదà±à°¦à°—à°¾ ఉంది (50 à°…à°•à±à°·à°°à°¾à°²à± à°—à°°à°¿à°·à±à° à°‚)." #: actions/outbox.php:58 #, php-format @@ -1847,66 +1885,61 @@ msgstr "" msgid "Change password" msgstr "సంకేతపదం మారà±à°šà±à°•à±‹à°‚à°¡à°¿" -#: actions/passwordsettings.php:70 -msgid "You are not allowed to change your password" -msgstr "" - -#: actions/passwordsettings.php:82 -#, fuzzy +#: actions/passwordsettings.php:69 msgid "Change your password." -msgstr "సంకేతపదం మారà±à°šà±à°•à±‹à°‚à°¡à°¿" +msgstr "మీ సంకేతపదం మారà±à°šà±à°•à±‹à°‚à°¡à°¿." -#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:96 actions/recoverpassword.php:231 #, fuzzy msgid "Password change" msgstr "సంకేతపదం à°à°¦à±à°°à°®à°¯à±à°¯à°¿à°‚ది." -#: actions/passwordsettings.php:117 +#: actions/passwordsettings.php:104 msgid "Old password" msgstr "పాత సంకేతపదం" -#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:108 actions/recoverpassword.php:235 msgid "New password" msgstr "కొతà±à°¤ సంకేతపదం" -#: actions/passwordsettings.php:122 +#: actions/passwordsettings.php:109 msgid "6 or more characters" msgstr "6 లేదా అంతకంటే à°Žà°•à±à°•à±à°µ à°…à°•à±à°·à°°à°¾à°²à±" -#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:112 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "నిరà±à°¥à°¾à°°à°¿à°‚à°šà±" -#: actions/passwordsettings.php:126 +#: actions/passwordsettings.php:113 msgid "same as password above" msgstr "పై సంకేతపదం వలెనే" -#: actions/passwordsettings.php:130 +#: actions/passwordsettings.php:117 msgid "Change" msgstr "మారà±à°šà±" -#: actions/passwordsettings.php:167 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "" -#: actions/passwordsettings.php:170 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:233 msgid "Passwords don't match." msgstr "సంకేతపదాలౠసరిపోలలేదà±." -#: actions/passwordsettings.php:178 +#: actions/passwordsettings.php:165 msgid "Incorrect old password" msgstr "పాత సంకేతపదం తపà±à°ªà±" -#: actions/passwordsettings.php:194 +#: actions/passwordsettings.php:181 msgid "Error saving user; invalid." msgstr "వాడà±à°•à°°à°¿à°¨à°¿ à°à°¦à±à°°à°ªà°°à°šà°¡à°‚లో పొరపాటà±: సరికాదà±." -#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "కొతà±à°¤ సంకేతపదానà±à°¨à°¿ à°à°¦à±à°°à°ªà°°à°šà°²à±‡à°®à±." -#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:192 actions/recoverpassword.php:211 msgid "Password saved." msgstr "సంకేతపదం à°à°¦à±à°°à°®à°¯à±à°¯à°¿à°‚ది." @@ -1952,9 +1985,8 @@ msgid "" msgstr "" #: actions/profilesettings.php:99 -#, fuzzy msgid "Profile information" -msgstr "à°…à°œà±à°žà°¾à°¤ à°ªà±à°°à±Šà°«à±ˆà°²à±" +msgstr "à°ªà±à°°à±Šà°«à±ˆà°²à± సమాచారం" #: actions/profilesettings.php:108 lib/groupeditform.php:154 msgid "1-64 lowercase letters or numbers, no punctuation or spaces" @@ -1976,14 +2008,13 @@ msgid "URL of your homepage, blog, or profile on another site" msgstr "మీ హోమౠపేజీ, à°¬à±à°²à°¾à°—à±, లేదా వేరే సేటà±à°²à±‹à°¨à°¿ మీ à°ªà±à°°à±Šà°«à±ˆà°²à± యొకà±à°• à°šà°¿à°°à±à°¨à°¾à°®à°¾" #: actions/profilesettings.php:122 actions/register.php:460 -#, fuzzy, php-format +#, php-format msgid "Describe yourself and your interests in %d chars" -msgstr "మీ à°—à±à°°à°¿à°‚à°šà°¿ మరియౠమీ ఆసకà±à°¤à±à°² à°—à±à°°à°¿à°‚à°šà°¿ 140 à°…à°•à±à°·à°°à°¾à°²à±à°²à±‹ చెపà±à°ªà°‚à°¡à°¿" +msgstr "మీ à°—à±à°°à°¿à°‚à°šà°¿ మరియౠమీ ఆసకà±à°¤à±à°² à°—à±à°°à°¿à°‚à°šà°¿ %d à°…à°•à±à°·à°°à°¾à°²à±à°²à±‹ చెపà±à°ªà°‚à°¡à°¿" #: actions/profilesettings.php:125 actions/register.php:463 -#, fuzzy msgid "Describe yourself and your interests" -msgstr "మీ à°—à±à°°à°¿à°‚à°šà°¿ మరియౠమీ ఆసకà±à°¤à±à°² à°—à±à°°à°¿à°‚à°šà°¿ 140 à°…à°•à±à°·à°°à°¾à°²à±à°²à±‹ చెపà±à°ªà°‚à°¡à°¿" +msgstr "మీ à°—à±à°°à°¿à°‚à°šà°¿ మరియౠమీ ఆసకà±à°¤à±à°² à°—à±à°°à°¿à°‚à°šà°¿ చెపà±à°ªà°‚à°¡à°¿" #: actions/profilesettings.php:127 actions/register.php:465 msgid "Bio" @@ -2004,7 +2035,7 @@ msgstr "మీరౠఎకà±à°•à°¡ à°¨à±à°‚à°¡à°¿, \"నగరం, రాషà #: actions/tagother.php:209 lib/subscriptionlist.php:106 #: lib/subscriptionlist.php:108 lib/userprofile.php:209 msgid "Tags" -msgstr "" +msgstr "à°Ÿà±à°¯à°¾à°—à±à°²à±" #: actions/profilesettings.php:140 msgid "" @@ -2043,7 +2074,7 @@ msgstr "కాలమండలానà±à°¨à°¿ à°Žà°‚à°šà±à°•à±‹à°²à±‡à°¦à±." #: actions/profilesettings.php:234 msgid "Language is too long (max 50 chars)." -msgstr "" +msgstr "à°à°¾à°· మరీ పెదà±à°¦à°—à°¾ ఉంది (50 à°…à°•à±à°·à°°à°¾à°²à± à°—à°°à°¿à°·à±à° à°‚)." #: actions/profilesettings.php:246 actions/tagother.php:178 #, fuzzy, php-format @@ -2059,9 +2090,8 @@ msgid "Couldn't save profile." msgstr "à°ªà±à°°à±Šà°«à±ˆà°²à±à°¨à°¿ à°à°¦à±à°°à°ªà°°à°šà°²à±‡à°•à±à°¨à±à°¨à°¾à°‚." #: actions/profilesettings.php:336 -#, fuzzy msgid "Couldn't save tags." -msgstr "à°ªà±à°°à±Šà°«à±ˆà°²à±à°¨à°¿ à°à°¦à±à°°à°ªà°°à°šà°²à±‡à°•à±à°¨à±à°¨à°¾à°‚." +msgstr "à°Ÿà±à°¯à°¾à°—à±à°²à°¨à°¿ à°à°¦à±à°°à°ªà°°à°šà°²à±‡à°•à±à°¨à±à°¨à°¾à°‚." #: actions/profilesettings.php:344 msgid "Settings saved." @@ -2077,9 +2107,9 @@ msgid "Could not retrieve public stream." msgstr "" #: actions/public.php:129 -#, fuzzy, php-format +#, php-format msgid "Public timeline, page %d" -msgstr "à°ªà±à°°à°œà°¾ కాలరేఖ" +msgstr "à°ªà±à°°à°œà°¾ కాలరేఖ, పేజీ %d" #: actions/public.php:131 lib/publicgroupnav.php:79 msgid "Public timeline" @@ -2162,7 +2192,7 @@ msgstr "" #: actions/publictagcloud.php:135 msgid "Tag cloud" -msgstr "" +msgstr "à°Ÿà±à°¯à°¾à°—ౠమేఘం" #: actions/recoverpassword.php:36 msgid "You are already logged in!" @@ -2208,7 +2238,7 @@ msgstr "" #: actions/recoverpassword.php:191 msgid "Nickname or email address" -msgstr "" +msgstr "à°®à±à°¦à±à°¦à±à°ªà±‡à°°à± లేదా ఈమెయిలౠచిరà±à°¨à°¾à°®à°¾" #: actions/recoverpassword.php:193 msgid "Your nickname on this server, or your registered email address." @@ -2286,7 +2316,7 @@ msgstr "మీ కొతà±à°¤ సంకేతపదం à°à°¦à±à°°à°®à±ˆà°‚à°¦ #: actions/register.php:85 actions/register.php:189 actions/register.php:404 msgid "Sorry, only invited people can register." -msgstr "" +msgstr "à°•à±à°·à°®à°¿à°‚à°šà°‚à°¡à°¿, ఆహà±à°µà°¾à°¨à°¿à°¤à±à°²à± మాతà±à°°à°®à±‡ నమోదà±à°•à°¾à°—లరà±." #: actions/register.php:92 #, fuzzy @@ -2295,7 +2325,7 @@ msgstr "నిరà±à°§à°¾à°°à°£ సంకేతంలో పొరపాటà±. #: actions/register.php:112 msgid "Registration successful" -msgstr "" +msgstr "నమోదౠవిజయవంతం" #: actions/register.php:114 actions/register.php:502 lib/action.php:450 #: lib/logingroupnav.php:85 @@ -2338,10 +2368,10 @@ msgstr "6 లేదా అంతకంటే à°Žà°•à±à°•à±à°µ à°…à°•à±à°·à°°à #: actions/register.php:433 msgid "Same as password above. Required." -msgstr "" +msgstr "పై సంకేతపదం మరోసారి. తపà±à°ªà°¨à°¿à°¸à°°à°¿." #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:122 +#: lib/accountsettingsaction.php:120 msgid "Email" msgstr "ఈమెయిలà±" @@ -2351,7 +2381,7 @@ msgstr "తాజా విశేషాలà±, à°ªà±à°°à°•à°Ÿà°¨à°²à±, మరà #: actions/register.php:449 msgid "Longer name, preferably your \"real\" name" -msgstr "" +msgstr "పొడà±à°—ాటి పేరà±, మీ \"అసలà±\" పేరైతే మంచిది" #: actions/register.php:493 msgid "My text and files are available under " @@ -2429,7 +2459,7 @@ msgstr "" #: actions/remotesubscribe.php:137 lib/subscribeform.php:139 #: lib/userprofile.php:321 msgid "Subscribe" -msgstr "" +msgstr "చందాచేరà±" #: actions/remotesubscribe.php:159 msgid "Invalid profile URL (bad format)" @@ -2557,7 +2587,7 @@ msgstr "%s à°—à±à°‚à°ªà±" #: actions/showgroup.php:84 #, php-format msgid "%s group, page %d" -msgstr "" +msgstr "%s à°—à±à°‚à°ªà±, పేజీ %d" #: actions/showgroup.php:218 msgid "Group profile" @@ -2570,9 +2600,8 @@ msgstr "" #: actions/showgroup.php:274 actions/tagother.php:128 #: actions/userauthorization.php:179 lib/userprofile.php:194 -#, fuzzy msgid "Note" -msgstr "సందేశాలà±" +msgstr "గమనిక" #: actions/showgroup.php:284 lib/groupeditform.php:184 msgid "Aliases" @@ -2646,7 +2675,7 @@ msgstr "" #: actions/showgroup.php:482 msgid "Admins" -msgstr "" +msgstr "నిరà±à°µà°¾à°¹à°•à±à°²à±" #: actions/showmessage.php:81 msgid "No such message." @@ -2667,9 +2696,8 @@ msgid "Message from %1$s on %2$s" msgstr "" #: actions/shownotice.php:90 -#, fuzzy msgid "Notice deleted." -msgstr "సందేశాలà±" +msgstr "నోటీసà±à°¨à°¿ తొలగించాం." #: actions/showstream.php:73 #, php-format @@ -2892,14 +2920,14 @@ msgid "" msgstr "" #: actions/subscriptions.php:52 -#, fuzzy, php-format +#, php-format msgid "%s subscriptions" -msgstr "à°…à°¨à±à°¨à°¿ చందాలà±" +msgstr "%s చందాలà±" #: actions/subscriptions.php:54 -#, fuzzy, php-format +#, php-format msgid "%s subscriptions, page %d" -msgstr "à°…à°¨à±à°¨à°¿ చందాలà±" +msgstr "%s చందాలà±, పేజీ %d" #: actions/subscriptions.php:65 msgid "These are the people whose notices you listen to." @@ -2935,9 +2963,8 @@ msgid "SMS" msgstr "" #: actions/tagother.php:33 -#, fuzzy msgid "Not logged in" -msgstr "లోనికి à°ªà±à°°à°µà±‡à°¶à°¿à°‚చలేదà±." +msgstr "లోనికి à°ªà±à°°à°µà±‡à°¶à°¿à°‚చలేదà±" #: actions/tagother.php:39 #, fuzzy @@ -2950,9 +2977,8 @@ msgid "Tag %s" msgstr "" #: actions/tagother.php:77 lib/userprofile.php:75 -#, fuzzy msgid "User profile" -msgstr "వాడà±à°•à°°à°¿à°•à°¿ à°ªà±à°°à±Šà°«à±ˆà°²à± లేదà±." +msgstr "వాడà±à°•à°°à°¿ à°ªà±à°°à±Šà°«à±ˆà°²à±" #: actions/tagother.php:81 lib/userprofile.php:102 msgid "Photo" @@ -2974,9 +3000,8 @@ msgid "" msgstr "" #: actions/tagother.php:200 -#, fuzzy msgid "Could not save tags." -msgstr "అవతారపౠసమాచారానà±à°¨à°¿ à°à°¦à±à°°à°ªà°°à°šà°²à±‡à°•à±à°¨à±à°¨à°¾à°‚" +msgstr "à°Ÿà±à°¯à°¾à°—à±à°²à°¨à°¿ à°à°¦à±à°°à°ªà°°à°šà°²à±‡à°•à°ªà±‹à°¯à°¾à°‚." #: actions/tagother.php:236 msgid "Use this form to add tags to your subscribers or subscriptions." @@ -3050,9 +3075,8 @@ msgstr "అంగీకరించà±" #: actions/userauthorization.php:210 lib/subscribeform.php:115 #: lib/subscribeform.php:139 -#, fuzzy msgid "Subscribe to this user" -msgstr "చందాదారà±à°²à±" +msgstr "à°ˆ వాడà±à°•à°°à°¿à°•à°¿ చందాచేరà±" #: actions/userauthorization.php:211 msgid "Reject" @@ -3226,37 +3250,36 @@ msgstr "సందేశానà±à°¨à°¿ à°à°¦à±à°°à°ªà°°à°šà°¡à°‚లో పొà msgid "DB error inserting reply: %s" msgstr "" -#: classes/User.php:333 +#: classes/User.php:347 #, php-format msgid "Welcome to %1$s, @%2$s!" -msgstr "" +msgstr "@%2$s, %1$sà°•à°¿ à°¸à±à°µà°¾à°—తం!" -#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 msgid "Profile" msgstr "à°ªà±à°°à±Šà°«à±ˆà°²à±" -#: lib/accountsettingsaction.php:110 +#: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "" -#: lib/accountsettingsaction.php:114 -#, fuzzy +#: lib/accountsettingsaction.php:112 msgid "Upload an avatar" -msgstr "అవతారపౠతాజాకరణ విఫలమైంది." +msgstr "à°’à°• అవతారానà±à°¨à°¿ à°Žà°•à±à°•à°¿à°‚à°šà°‚à°¡à°¿" -#: lib/accountsettingsaction.php:119 +#: lib/accountsettingsaction.php:116 msgid "Change your password" -msgstr "" +msgstr "మీ సంకేతపదానà±à°¨à°¿ మారà±à°šà±à°•à±‹à°‚à°¡à°¿" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:120 msgid "Change email handling" msgstr "" -#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 +#: lib/accountsettingsaction.php:124 lib/groupnav.php:119 msgid "Design" -msgstr "" +msgstr "రూపà±à°°à±‡à°–à°²à±" -#: lib/accountsettingsaction.php:126 +#: lib/accountsettingsaction.php:124 #, fuzzy msgid "Design your profile" msgstr "వాడà±à°•à°°à°¿à°•à°¿ à°ªà±à°°à±Šà°«à±ˆà°²à± లేదà±." @@ -3265,7 +3288,7 @@ msgstr "వాడà±à°•à°°à°¿à°•à°¿ à°ªà±à°°à±Šà°«à±ˆà°²à± లేదà±." msgid "Other" msgstr "ఇతర" -#: lib/accountsettingsaction.php:129 +#: lib/accountsettingsaction.php:128 msgid "Other options" msgstr "ఇతర ఎంపికలà±" @@ -3324,9 +3347,8 @@ msgid "Logout from the site" msgstr "" #: lib/action.php:450 -#, fuzzy msgid "Create an account" -msgstr "కొతà±à°¤ ఖాతా సృషà±à°Ÿà°¿à°‚à°šà±à°•à±‹à°‚à°¡à°¿" +msgstr "కొతà±à°¤ ఖాతా సృషà±à°Ÿà°¿à°‚à°šà±" #: lib/action.php:453 msgid "Login to the site" @@ -3373,13 +3395,12 @@ msgid "About" msgstr "à°—à±à°°à°¿à°‚à°šà°¿" #: lib/action.php:723 -#, fuzzy msgid "FAQ" -msgstr "తవసం" +msgstr "à°ªà±à°°à°¶à±à°¨à°²à±" #: lib/action.php:727 msgid "TOS" -msgstr "" +msgstr "సేవా నియమాలà±" #: lib/action.php:730 msgid "Privacy" @@ -3402,13 +3423,13 @@ msgid "StatusNet software license" msgstr "" #: lib/action.php:767 -#, fuzzy, php-format +#, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." "broughtby%%](%%site.broughtbyurl%%). " msgstr "" -"[%%site.broughtby%%](%%site.broughtbyurl%%) వారౠఅందిసà±à°¤à±à°¨à±à°¨ à°ˆ **%%site.name%%** " -"అనేది మైకà±à°°à±‹ à°¬à±à°²à°¾à°—ింగౠసదà±à°ªà°¾à°¯à°‚." +"**%%site.name%%** అనేది [%%site.broughtby%%](%%site.broughtbyurl%%) వారౠ" +"అందిసà±à°¤à±à°¨à±à°¨ మైకà±à°°à±‹ à°¬à±à°²à°¾à°—ింగౠసదà±à°ªà°¾à°¯à°‚. " #: lib/action.php:769 #, php-format @@ -3422,6 +3443,9 @@ msgid "" "s, available under the [GNU Affero General Public License](http://www.fsf." "org/licensing/licenses/agpl-3.0.html)." msgstr "" +"ఇది [à°—à±à°¨à±‚ ఆఫెరో జెనరలౠపబà±à°²à°¿à°•à± లైసెనà±à°¸à±](http://www.fsf.org/licensing/licenses/agpl-3.0." +"html) à°•à°¿à°‚à°¦ à°²à°à±à°¯à°®à°¯à±à°¯à±‡ [à°¸à±à°Ÿà±‡à°Ÿà°¸à±‌నెటà±](http://status.net/) మైకà±à°°à±‹à°¬à±à°²à°¾à°—ింగౠఉపకరణం సంచిక %s " +"పై నడà±à°¸à±à°¤à±à°‚ది." #: lib/action.php:785 #, fuzzy @@ -3436,19 +3460,19 @@ msgstr "à°…à°¨à±à°¨à±€ " msgid "license." msgstr "" -#: lib/action.php:1053 +#: lib/action.php:1052 msgid "Pagination" -msgstr "" +msgstr "పేజీకరణ" -#: lib/action.php:1062 +#: lib/action.php:1061 msgid "After" msgstr "తరà±à°µà°¾à°¤" -#: lib/action.php:1070 +#: lib/action.php:1069 msgid "Before" msgstr "ఇంతకà±à°°à°¿à°¤à°‚" -#: lib/action.php:1119 +#: lib/action.php:1117 msgid "There was a problem with your session token." msgstr "" @@ -3510,6 +3534,9 @@ msgid "" "Subscribers: %2$s\n" "Notices: %3$s" msgstr "" +"చందాలà±: %1$s\n" +"చందాదారà±à°²à±: %2$s\n" +"నోటీసà±à°²à±: %3$s" #: lib/command.php:152 lib/command.php:400 msgid "Notice with that id does not exist" @@ -3560,7 +3587,7 @@ msgstr "" #: lib/command.php:431 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" -msgstr "" +msgstr "నోటిసౠచాలా పొడవà±à°—à°¾ ఉంది - %d à°…à°•à±à°·à°°à°¾à°²à± à°—à°°à°¿à°·à±à° à°‚, మీరౠ%d పంపించారà±" #: lib/command.php:439 #, fuzzy, php-format @@ -3620,13 +3647,46 @@ msgstr "ఓపెనà±à°à°¡à±€ ఫారమà±à°¨à± సృషà±à°Ÿà°¿à°‚à°šà msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:613 +#: lib/command.php:618 +#, fuzzy +msgid "You are not subscribed to anyone." +msgstr "%sà°•à°¿ à°¸à±à°ªà°‚దనలà±" + +#: lib/command.php:620 +#, fuzzy +msgid "You are subscribed to these people: " +msgstr "%sà°•à°¿ à°¸à±à°ªà°‚దనలà±" + +#: lib/command.php:637 +#, fuzzy +msgid "No one is subscribed to you." +msgstr "%sà°•à°¿ à°¸à±à°ªà°‚దనలà±" + +#: lib/command.php:639 +#, fuzzy +msgid "These people are subscribed to you: " +msgstr "%sà°•à°¿ à°¸à±à°ªà°‚దనలà±" + +#: lib/command.php:656 +#, fuzzy +msgid "You are not a member of any groups." +msgstr "మీరౠఇపà±à°ªà°Ÿà°¿à°•à±‡ లోనికి à°ªà±à°°à°µà±‡à°¶à°¿à°‚చారà±!" + +#: lib/command.php:658 +#, fuzzy +msgid "You are a member of these groups: " +msgstr "మీరౠఇపà±à°ªà°Ÿà°¿à°•à±‡ లోనికి à°ªà±à°°à°µà±‡à°¶à°¿à°‚చారà±!" + +#: lib/command.php:670 msgid "" "Commands:\n" "on - turn on notifications\n" "off - turn off notifications\n" "help - show this help\n" "follow <nickname> - subscribe to user\n" +"groups - lists the groups you have joined\n" +"subscriptions - list the people you follow\n" +"subscribers - list the people that follow you\n" "leave <nickname> - unsubscribe from user\n" "d <nickname> <text> - direct message to user\n" "get <nickname> - get last notice from user\n" @@ -3656,20 +3716,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:191 +#: lib/common.php:192 #, fuzzy msgid "No configuration file found. " msgstr "నిరà±à°§à°¾à°°à°£ సంకేతం లేదà±." -#: lib/common.php:192 +#: lib/common.php:193 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:193 +#: lib/common.php:194 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:194 +#: lib/common.php:195 msgid "Go to the installer." msgstr "" @@ -3691,7 +3751,7 @@ msgstr "" #: lib/designsettings.php:101 msgid "Change background image" -msgstr "" +msgstr "నేపథà±à°¯ à°šà°¿à°¤à±à°°à°¾à°¨à±à°¨à°¿ మారà±à°šà±" #: lib/designsettings.php:105 #, fuzzy @@ -3701,7 +3761,7 @@ msgstr "à°Žà°—à±à°®à°¤à°¿à°‚à°šà±" #: lib/designsettings.php:109 msgid "" "You can upload your personal background image. The maximum file size is 2Mb." -msgstr "" +msgstr "మీ à°¸à±à°µà°‚à°¤ నేపథà±à°¯à°ªà± à°šà°¿à°¤à±à°°à°¾à°¨à±à°¨à°¿ మీరౠఎకà±à°•à°¿à°‚చవచà±à°šà±. à°—à°°à°¿à°·à±à° ఫైలౠపరిమాణం 2మెబై." #: lib/designsettings.php:139 msgid "On" @@ -3733,18 +3793,16 @@ msgid "Content" msgstr "à°…à°¨à±à°¸à°‚ధానించà±" #: lib/designsettings.php:204 -#, fuzzy msgid "Sidebar" -msgstr "వెతà±à°•à±" +msgstr "పకà±à°•à°ªà°Ÿà±à°Ÿà±€" #: lib/designsettings.php:217 msgid "Text" msgstr "పాఠà±à°¯à°‚" #: lib/designsettings.php:230 -#, fuzzy msgid "Links" -msgstr "à°ªà±à°°à°µà±‡à°¶à°¿à°‚à°šà°‚à°¡à°¿" +msgstr "లంకెలà±" #: lib/designsettings.php:247 msgid "Use defaults" @@ -3760,7 +3818,7 @@ msgstr "" #: lib/designsettings.php:257 msgid "Save design" -msgstr "" +msgstr "రూపà±à°°à±‡à°–లని à°à°¦à±à°°à°ªà°°à°šà±" #: lib/designsettings.php:372 msgid "Bad default color settings: " @@ -3867,9 +3925,9 @@ msgid "Blocked" msgstr "à°…à°Ÿà±à°µà°‚à°Ÿà°¿ వాడà±à°•à°°à°¿ లేరà±." #: lib/groupnav.php:102 -#, fuzzy, php-format +#, php-format msgid "%s blocked users" -msgstr "à°…à°Ÿà±à°µà°‚à°Ÿà°¿ వాడà±à°•à°°à°¿ లేరà±." +msgstr "%s నిరోధిత వాడà±à°•à°°à±à°²à±" #: lib/groupnav.php:108 #, php-format @@ -3892,11 +3950,11 @@ msgstr "" #: lib/groupsbymemberssection.php:71 msgid "Groups with most members" -msgstr "" +msgstr "à°Žà°•à±à°•à±à°µà°®à°‚ది à°¸à°à±à°¯à±à°²à±à°¨à±à°¨ à°—à±à°‚à°ªà±à°²à±" #: lib/groupsbypostssection.php:71 msgid "Groups with most posts" -msgstr "" +msgstr "à°Žà°•à±à°•à±à°µ టపాలà±à°¨à±à°¨ à°—à±à°‚à°ªà±à°²à±" #: lib/grouptagcloudsection.php:56 #, php-format @@ -3935,27 +3993,24 @@ msgstr "à°…à°Ÿà±à°µà°‚à°Ÿà°¿ సందేశమేమీ లేదà±." #: lib/imagefile.php:150 lib/imagefile.php:197 msgid "Unknown file type" -msgstr "" +msgstr "తెలియని ఫైలౠరకం" #: lib/jabber.php:192 #, php-format -msgid "notice id: %s" -msgstr "కొతà±à°¤ సందేశం" +msgid "[%s]" +msgstr "[%s]" #: lib/joinform.php:114 -#, fuzzy msgid "Join" -msgstr "à°ªà±à°°à°µà±‡à°¶à°¿à°‚à°šà°‚à°¡à°¿" +msgstr "చేరà±" #: lib/leaveform.php:114 -#, fuzzy msgid "Leave" -msgstr "à°à°¦à±à°°à°ªà°°à°šà±" +msgstr "వైదొలగà±" #: lib/logingroupnav.php:80 -#, fuzzy msgid "Login with a username and password" -msgstr "వాడà±à°•à°°à°¿à°ªà±‡à°°à± లేదా సంకేతపదం తపà±à°ªà±." +msgstr "వాడà±à°•à°°à°¿à°ªà±‡à°°à± మరియౠసంకేతపదాలతో à°ªà±à°°à°µà±‡à°¶à°¿à°‚à°šà°‚à°¡à°¿" #: lib/logingroupnav.php:86 #, fuzzy @@ -3973,9 +4028,8 @@ msgid "" msgstr "" #: lib/mailbox.php:227 lib/noticelist.php:424 -#, fuzzy msgid "from" -msgstr " à°¨à±à°‚à°¡à°¿ " +msgstr "à°¨à±à°‚à°¡à°¿" #: lib/mail.php:172 msgid "Email address confirmation" @@ -4024,9 +4078,9 @@ msgid "Location: %s\n" msgstr "à°ªà±à°°à°¾à°‚తం: %s\n" #: lib/mail.php:255 -#, fuzzy, php-format +#, php-format msgid "Homepage: %s\n" -msgstr "హోమౠపేజీ\n" +msgstr "హోమౠపేజీ: %s\n" #: lib/mail.php:257 #, php-format @@ -4060,7 +4114,7 @@ msgstr "%s à°¸à±à°¥à°¿à°¤à°¿" #: lib/mail.php:438 msgid "SMS confirmation" -msgstr "" +msgstr "SMS నిరà±à°§à°¾à°°à°£" #: lib/mail.php:462 #, php-format @@ -4086,7 +4140,7 @@ msgstr "" #: lib/mail.php:509 #, php-format msgid "New private message from %s" -msgstr "" +msgstr "%s à°¨à±à°‚à°¡à°¿ కొతà±à°¤ అంతరంగిక సందేశం" #: lib/mail.php:513 #, php-format @@ -4215,9 +4269,8 @@ msgid "To" msgstr "" #: lib/messageform.php:162 lib/noticeform.php:173 -#, fuzzy msgid "Available characters" -msgstr "6 లేదా అంతకంటే à°Žà°•à±à°•à±à°µ à°…à°•à±à°·à°°à°¾à°²à±" +msgstr "à°…à°‚à°¦à±à°¬à°¾à°Ÿà±à°²à±‹ ఉనà±à°¨ à°…à°•à±à°·à°°à°¾à°²à±" #: lib/noticeform.php:145 #, fuzzy @@ -4235,7 +4288,7 @@ msgstr "జోడించà±" #: lib/noticeform.php:184 msgid "Attach a file" -msgstr "" +msgstr "à°’à°• ఫైలà±à°¨à°¿ జోడించà±" #: lib/noticelist.php:478 #, fuzzy @@ -4244,12 +4297,11 @@ msgstr "విషయం లేదà±!" #: lib/noticelist.php:498 msgid "Reply to this notice" -msgstr "" +msgstr "à°ˆ నోటీసà±à°ªà±ˆ à°¸à±à°ªà°‚దించండి" #: lib/noticelist.php:499 -#, fuzzy msgid "Reply" -msgstr "à°¸à±à°ªà°‚దించà±" +msgstr "à°¸à±à°ªà°‚దించండి" #: lib/nudgeform.php:116 msgid "Nudge this user" @@ -4335,14 +4387,12 @@ msgid "Subscribers" msgstr "చందాదారà±à°²à±" #: lib/profileaction.php:157 -#, fuzzy msgid "All subscribers" -msgstr "చందాదారà±à°²à±" +msgstr "అందరౠచందాదారà±à°²à±" #: lib/profileaction.php:177 -#, fuzzy msgid "User ID" -msgstr "వాడà±à°•à°°à°¿" +msgstr "వాడà±à°•à°°à°¿ ID" #: lib/profileaction.php:182 msgid "Member since" @@ -4362,16 +4412,15 @@ msgstr "వాడà±à°•à°°à°¿ à°—à±à°‚à°ªà±à°²à±" #: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85 msgid "Recent tags" -msgstr "" +msgstr "ఇటీవలి à°Ÿà±à°¯à°¾à°—à±à°²à±" #: lib/publicgroupnav.php:88 msgid "Featured" -msgstr "" +msgstr "విశేషం" #: lib/publicgroupnav.php:92 -#, fuzzy msgid "Popular" -msgstr "à°µà±à°¯à°•à±à°¤à±à°² à°…à°¨à±à°µà±‡à°·à°£" +msgstr "à°ªà±à°°à°¾à°šà±à°°à±à°¯à°‚" #: lib/searchaction.php:120 #, fuzzy @@ -4410,7 +4459,7 @@ msgstr "" #: lib/section.php:106 msgid "More..." -msgstr "" +msgstr "మరింత..." #: lib/subgroupnav.php:83 #, php-format @@ -4425,7 +4474,7 @@ msgstr "%sà°•à°¿ à°¸à±à°ªà°‚దనలà±" #: lib/subgroupnav.php:99 #, php-format msgid "Groups %s is a member of" -msgstr "" +msgstr "%s à°¸à°à±à°¯à±à°²à±à°—à°¾ ఉనà±à°¨ à°—à±à°‚à°ªà±à°²à±" #: lib/subscriberspeopleselftagcloudsection.php:48 #: lib/subscriptionspeopleselftagcloudsection.php:48 @@ -4446,9 +4495,8 @@ msgid "Already subscribed!" msgstr "" #: lib/subs.php:52 -#, fuzzy msgid "User has blocked you." -msgstr "వాడà±à°•à°°à°¿à°•à°¿ à°ªà±à°°à±Šà°«à±ˆà°²à± లేదà±." +msgstr "వాడà±à°•à°°à°¿ మిమà±à°®à°²à±à°¨à°¿ నిరోధించారà±." #: lib/subs.php:56 msgid "Could not subscribe." @@ -4459,8 +4507,9 @@ msgid "Could not subscribe other to you." msgstr "" #: lib/subs.php:124 -msgid "Not subscribed!." -msgstr "" +#, fuzzy +msgid "Not subscribed!" +msgstr "చందాదారà±à°²à±" #: lib/subs.php:136 msgid "Couldn't delete subscription." @@ -4468,7 +4517,7 @@ msgstr "చందాని తొలగించలేకపోయాం." #: lib/tagcloudsection.php:56 msgid "None" -msgstr "" +msgstr "à°à°®à±€à°²à±‡à°¦à±" #: lib/topposterssection.php:74 msgid "Top posters" @@ -4480,12 +4529,11 @@ msgstr "" #: lib/unsubscribeform.php:137 msgid "Unsubscribe" -msgstr "" +msgstr "చందామానà±" #: lib/userprofile.php:116 -#, fuzzy msgid "Edit Avatar" -msgstr "అవతారం" +msgstr "అవతారానà±à°¨à°¿ మారà±à°šà±" #: lib/userprofile.php:236 msgid "User actions" @@ -4498,7 +4546,7 @@ msgstr "à°«à±à°°à±Šà°«à±ˆà°²à± అమరికలà±" #: lib/userprofile.php:249 msgid "Edit" -msgstr "" +msgstr "మారà±à°šà±" #: lib/userprofile.php:272 msgid "Send a direct message to this user" @@ -4508,54 +4556,54 @@ msgstr "" msgid "Message" msgstr "సందేశం" -#: lib/util.php:818 +#: lib/util.php:821 msgid "a few seconds ago" msgstr "కొనà±à°¨à°¿ à°•à±à°·à°£à°¾à°² à°•à±à°°à°¿à°¤à°‚" -#: lib/util.php:820 +#: lib/util.php:823 msgid "about a minute ago" msgstr "à°“ నిమిషం à°•à±à°°à°¿à°¤à°‚" -#: lib/util.php:822 +#: lib/util.php:825 #, php-format msgid "about %d minutes ago" msgstr "%d నిమిషాల à°•à±à°°à°¿à°¤à°‚" -#: lib/util.php:824 +#: lib/util.php:827 msgid "about an hour ago" msgstr "à°’à°• à°—à°‚à°Ÿ à°•à±à°°à°¿à°¤à°‚" -#: lib/util.php:826 +#: lib/util.php:829 #, php-format msgid "about %d hours ago" msgstr "%d à°—à°‚à°Ÿà°² à°•à±à°°à°¿à°¤à°‚" -#: lib/util.php:828 +#: lib/util.php:831 msgid "about a day ago" msgstr "à°“ రోజౠకà±à°°à°¿à°¤à°‚" -#: lib/util.php:830 +#: lib/util.php:833 #, php-format msgid "about %d days ago" msgstr "%d రోజà±à°² à°•à±à°°à°¿à°¤à°‚" -#: lib/util.php:832 +#: lib/util.php:835 msgid "about a month ago" msgstr "à°“ నెల à°•à±à°°à°¿à°¤à°‚" -#: lib/util.php:834 +#: lib/util.php:837 #, php-format msgid "about %d months ago" msgstr "%d నెలల à°•à±à°°à°¿à°¤à°‚" -#: lib/util.php:836 +#: lib/util.php:839 msgid "about a year ago" msgstr "à°’à°• సంవతà±à°¸à°°à°‚ à°•à±à°°à°¿à°¤à°‚" #: lib/webcolor.php:82 -#, fuzzy, php-format +#, php-format msgid "%s is not a valid color!" -msgstr "హోమౠపేజీ URL సరైనది కాదà±." +msgstr "%s అనేది సరైన రంగౠకాదà±!" #: lib/webcolor.php:123 #, php-format @@ -4568,7 +4616,7 @@ msgstr "" #: scripts/maildaemon.php:53 msgid "Not a registered user." -msgstr "" +msgstr "నమోదైన వాడà±à°•à°°à°¿ కాదà±." #: scripts/maildaemon.php:57 msgid "Sorry, that is not your incoming email address." diff --git a/locale/tr/LC_MESSAGES/statusnet.mo b/locale/tr/LC_MESSAGES/statusnet.mo Binary files differindex 49093b4dc..84e32897a 100644 --- a/locale/tr/LC_MESSAGES/statusnet.mo +++ b/locale/tr/LC_MESSAGES/statusnet.mo diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po index c25d1a8a6..78261edbb 100644 --- a/locale/tr/LC_MESSAGES/statusnet.po +++ b/locale/tr/LC_MESSAGES/statusnet.po @@ -5,12 +5,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-10 20:53+0000\n" -"PO-Revision-Date: 2009-11-10 20:59:50+0000\n" +"POT-Creation-Date: 2009-11-16 19:42+0000\n" +"PO-Revision-Date: 2009-11-16 19:44:20+0000\n" "Language-Team: Turkish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: tr\n" "X-Message-Group: out-statusnet\n" @@ -22,12 +22,15 @@ msgid "No such page" msgstr "Böyle bir durum mesajı yok." #: actions/all.php:74 actions/allrss.php:68 -#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofilebackgroundimage.php:116 +#: actions/apiaccountupdateprofileimage.php:105 +#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 #: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 #: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 @@ -106,35 +109,42 @@ msgstr "%s ve arkadaÅŸları" msgid "Updates from %1$s and friends on %2$s!" msgstr "" -#: actions/apiaccountratelimitstatus.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 -#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:129 actions/apigroupcreate.php:184 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120 -#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101 -#: actions/apigroupshow.php:105 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144 -#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141 -#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130 -#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163 -#: actions/apiusershow.php:101 -msgid "API method not found!" -msgstr "" +#: actions/apiaccountratelimitstatus.php:70 +#: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofilebackgroundimage.php:94 +#: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apiaccountupdateprofile.php:97 +#, fuzzy +msgid "API method not found." +msgstr "Onay kodu bulunamadı." -#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 +#: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofilebackgroundimage.php:86 +#: actions/apiaccountupdateprofilecolors.php:110 +#: actions/apiaccountupdateprofileimage.php:84 +#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109 +#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "" +#: actions/apiaccountupdatedeliverydevice.php:105 +msgid "" +"You must specify a parameter named 'device' with a value of one of: sms, im, " +"none" +msgstr "" + +#: actions/apiaccountupdatedeliverydevice.php:132 +#, fuzzy +msgid "Could not update user." +msgstr "Kullanıcı güncellenemedi." + +#: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 #: actions/newnotice.php:94 lib/designsettings.php:283 #, php-format msgid "" @@ -142,12 +152,33 @@ msgid "" "current configuration." msgstr "" -#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/apiaccountupdateprofilebackgroundimage.php:136 +#: actions/apiaccountupdateprofilebackgroundimage.php:146 +#: actions/apiaccountupdateprofilecolors.php:164 +#: actions/apiaccountupdateprofilecolors.php:174 +msgid "Unable to save your design settings." +msgstr "" + +#: actions/apiaccountupdateprofilebackgroundimage.php:187 +#: actions/apiaccountupdateprofilecolors.php:142 +#, fuzzy +msgid "Could not update your design." +msgstr "Kullanıcı güncellenemedi." + +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 +#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 #: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 msgid "User has no profile." msgstr "Kullanıcının profili yok." +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "Profil kaydedilemedi." + #: actions/apiblockcreate.php:108 msgid "Block user failed." msgstr "" @@ -194,6 +225,23 @@ msgstr "" msgid "All the direct messages sent to %s" msgstr "" +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 +#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 +#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 +#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149 +#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +msgid "API method not found!" +msgstr "" + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -390,18 +438,18 @@ msgstr "Avatar güncellendi." msgid "No status with that ID found." msgstr "" -#: actions/apistatusesupdate.php:152 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 #: scripts/maildaemon.php:71 #, 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:193 +#: actions/apistatusesupdate.php:198 msgid "Not found" msgstr "" -#: actions/apistatusesupdate.php:216 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:227 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -486,7 +534,7 @@ msgid "Invalid size." msgstr "Geçersiz büyüklük." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:113 +#: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "Avatar" @@ -535,7 +583,7 @@ msgstr "" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:151 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -1641,7 +1689,7 @@ msgid "Nickname" msgstr "Takma ad" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Parola" @@ -1779,7 +1827,7 @@ msgstr "" #: actions/noticesearch.php:124 #, php-format msgid "" -"Why not [register an account](%%%%action.register%%%%) and be the first to " +"Why not [register an account](%%%%action.register%%%%) and be the first to " "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" msgstr "" @@ -1824,8 +1872,8 @@ msgstr "BaÄŸlan" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963 -#: lib/api.php:991 lib/api.php:1101 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 +#: lib/api.php:1027 lib/api.php:1137 msgid "Not a supported data format." msgstr "" @@ -1846,11 +1894,15 @@ msgstr "Ayarlar" msgid "Manage various other options." msgstr "" -#: actions/othersettings.php:117 +#: actions/othersettings.php:108 +msgid " (free service)" +msgstr "" + +#: actions/othersettings.php:116 msgid "Shorten URLs with" msgstr "" -#: actions/othersettings.php:118 +#: actions/othersettings.php:117 msgid "Automatic shortening service to use." msgstr "" @@ -1886,66 +1938,62 @@ msgstr "" msgid "Change password" msgstr "Parolayı deÄŸiÅŸtir" -#: actions/passwordsettings.php:70 -msgid "You are not allowed to change your password" -msgstr "" - -#: actions/passwordsettings.php:82 +#: actions/passwordsettings.php:69 #, fuzzy msgid "Change your password." msgstr "Parolayı deÄŸiÅŸtir" -#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:96 actions/recoverpassword.php:231 #, fuzzy msgid "Password change" msgstr "Parola kaydedildi." -#: actions/passwordsettings.php:117 +#: actions/passwordsettings.php:104 msgid "Old password" msgstr "Eski parola" -#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:108 actions/recoverpassword.php:235 msgid "New password" msgstr "Yeni parola" -#: actions/passwordsettings.php:122 +#: actions/passwordsettings.php:109 msgid "6 or more characters" msgstr "6 veya daha fazla karakter" -#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:112 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Onayla" -#: actions/passwordsettings.php:126 +#: actions/passwordsettings.php:113 msgid "same as password above" msgstr "yukaridaki parola ile aynı" -#: actions/passwordsettings.php:130 +#: actions/passwordsettings.php:117 msgid "Change" msgstr "DeÄŸiÅŸtir" -#: actions/passwordsettings.php:167 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "" -#: actions/passwordsettings.php:170 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:233 msgid "Passwords don't match." msgstr "Parolalar birbirini tutmuyor." -#: actions/passwordsettings.php:178 +#: actions/passwordsettings.php:165 msgid "Incorrect old password" msgstr "Eski parola yanlış" -#: actions/passwordsettings.php:194 +#: actions/passwordsettings.php:181 msgid "Error saving user; invalid." msgstr "Kullanıcıyı kaydetmede hata oluÅŸtu; geçersiz." -#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Yeni parola kaydedilemedi." -#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:192 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Parola kaydedildi." @@ -2388,7 +2436,7 @@ msgid "Same as password above. Required." msgstr "" #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:122 +#: lib/accountsettingsaction.php:120 msgid "Email" msgstr "Eposta" @@ -3285,37 +3333,37 @@ msgstr "Durum mesajını kaydederken hata oluÅŸtu." msgid "DB error inserting reply: %s" msgstr "Cevap eklenirken veritabanı hatası: %s" -#: classes/User.php:333 +#: classes/User.php:347 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" -#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Profil" -#: lib/accountsettingsaction.php:110 +#: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "" -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:112 #, fuzzy msgid "Upload an avatar" msgstr "Avatar güncellemede hata." -#: lib/accountsettingsaction.php:119 +#: lib/accountsettingsaction.php:116 msgid "Change your password" msgstr "" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:120 msgid "Change email handling" msgstr "" -#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 +#: lib/accountsettingsaction.php:124 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:126 +#: lib/accountsettingsaction.php:124 #, fuzzy msgid "Design your profile" msgstr "Kullanıcının profili yok." @@ -3324,7 +3372,7 @@ msgstr "Kullanıcının profili yok." msgid "Other" msgstr "" -#: lib/accountsettingsaction.php:129 +#: lib/accountsettingsaction.php:128 msgid "Other options" msgstr "" @@ -3499,21 +3547,21 @@ msgstr "" msgid "license." msgstr "" -#: lib/action.php:1053 +#: lib/action.php:1052 msgid "Pagination" msgstr "" -#: lib/action.php:1062 +#: lib/action.php:1061 #, fuzzy msgid "After" msgstr "« Sonra" -#: lib/action.php:1070 +#: lib/action.php:1069 #, fuzzy msgid "Before" msgstr "Önce »" -#: lib/action.php:1119 +#: lib/action.php:1117 msgid "There was a problem with your session token." msgstr "" @@ -3685,13 +3733,46 @@ msgstr "OpenID formu yaratılamadı: %s" msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:613 +#: lib/command.php:618 +#, fuzzy +msgid "You are not subscribed to anyone." +msgstr "Bize o profili yollamadınız" + +#: lib/command.php:620 +#, fuzzy +msgid "You are subscribed to these people: " +msgstr "Bize o profili yollamadınız" + +#: lib/command.php:637 +#, fuzzy +msgid "No one is subscribed to you." +msgstr "Uzaktan abonelik" + +#: lib/command.php:639 +#, fuzzy +msgid "These people are subscribed to you: " +msgstr "Uzaktan abonelik" + +#: lib/command.php:656 +#, fuzzy +msgid "You are not a member of any groups." +msgstr "Bize o profili yollamadınız" + +#: lib/command.php:658 +#, fuzzy +msgid "You are a member of these groups: " +msgstr "Bize o profili yollamadınız" + +#: lib/command.php:670 msgid "" "Commands:\n" "on - turn on notifications\n" "off - turn off notifications\n" "help - show this help\n" "follow <nickname> - subscribe to user\n" +"groups - lists the groups you have joined\n" +"subscriptions - list the people you follow\n" +"subscribers - list the people that follow you\n" "leave <nickname> - unsubscribe from user\n" "d <nickname> <text> - direct message to user\n" "get <nickname> - get last notice from user\n" @@ -3721,20 +3802,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:191 +#: lib/common.php:192 #, fuzzy msgid "No configuration file found. " msgstr "Onay kodu yok." -#: lib/common.php:192 +#: lib/common.php:193 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:193 +#: lib/common.php:194 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:194 +#: lib/common.php:195 msgid "Go to the installer." msgstr "" @@ -4009,8 +4090,8 @@ msgstr "" #: lib/jabber.php:192 #, php-format -msgid "notice id: %s" -msgstr "Yeni durum mesajı" +msgid "[%s]" +msgstr "" #: lib/joinform.php:114 #, fuzzy @@ -4532,7 +4613,8 @@ msgid "Could not subscribe other to you." msgstr "" #: lib/subs.php:124 -msgid "Not subscribed!." +#, fuzzy +msgid "Not subscribed!" msgstr "Bu kullanıcıyı zaten takip etmiyorsunuz!" #: lib/subs.php:136 @@ -4581,47 +4663,47 @@ msgstr "" msgid "Message" msgstr "" -#: lib/util.php:818 +#: lib/util.php:821 msgid "a few seconds ago" msgstr "birkaç saniye önce" -#: lib/util.php:820 +#: lib/util.php:823 msgid "about a minute ago" msgstr "yaklaşık bir dakika önce" -#: lib/util.php:822 +#: lib/util.php:825 #, php-format msgid "about %d minutes ago" msgstr "yaklaşık %d dakika önce" -#: lib/util.php:824 +#: lib/util.php:827 msgid "about an hour ago" msgstr "yaklaşık bir saat önce" -#: lib/util.php:826 +#: lib/util.php:829 #, php-format msgid "about %d hours ago" msgstr "yaklaşık %d saat önce" -#: lib/util.php:828 +#: lib/util.php:831 msgid "about a day ago" msgstr "yaklaşık bir gün önce" -#: lib/util.php:830 +#: lib/util.php:833 #, php-format msgid "about %d days ago" msgstr "yaklaşık %d gün önce" -#: lib/util.php:832 +#: lib/util.php:835 msgid "about a month ago" msgstr "yaklaşık bir ay önce" -#: lib/util.php:834 +#: lib/util.php:837 #, php-format msgid "about %d months ago" msgstr "yaklaşık %d ay önce" -#: lib/util.php:836 +#: lib/util.php:839 msgid "about a year ago" msgstr "yaklaşık bir yıl önce" diff --git a/locale/uk/LC_MESSAGES/statusnet.mo b/locale/uk/LC_MESSAGES/statusnet.mo Binary files differindex e7e6fe0ea..9cbb4440f 100644 --- a/locale/uk/LC_MESSAGES/statusnet.mo +++ b/locale/uk/LC_MESSAGES/statusnet.mo diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po index a1a002b85..2c54591aa 100644 --- a/locale/uk/LC_MESSAGES/statusnet.po +++ b/locale/uk/LC_MESSAGES/statusnet.po @@ -5,12 +5,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-10 20:53+0000\n" -"PO-Revision-Date: 2009-11-10 20:59:53+0000\n" +"POT-Creation-Date: 2009-11-16 19:42+0000\n" +"PO-Revision-Date: 2009-11-16 19:44:23+0000\n" "Language-Team: Ukrainian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: uk\n" "X-Message-Group: out-statusnet\n" @@ -22,12 +22,15 @@ msgid "No such page" msgstr "Такого тегу немає." #: actions/all.php:74 actions/allrss.php:68 -#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofilebackgroundimage.php:116 +#: actions/apiaccountupdateprofileimage.php:105 +#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 #: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 #: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 @@ -106,35 +109,42 @@ msgstr "%s з друзÑми" msgid "Updates from %1$s and friends on %2$s!" msgstr "ÐžÐ½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð²Ñ–Ð´ %1$s та друзів на %2$s!" -#: actions/apiaccountratelimitstatus.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 -#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:129 actions/apigroupcreate.php:184 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120 -#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101 -#: actions/apigroupshow.php:105 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144 -#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141 -#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130 -#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163 -#: actions/apiusershow.php:101 -msgid "API method not found!" +#: actions/apiaccountratelimitstatus.php:70 +#: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofilebackgroundimage.php:94 +#: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apiaccountupdateprofile.php:97 +#, fuzzy +msgid "API method not found." msgstr "API метод не знайдено!" -#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 +#: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofilebackgroundimage.php:86 +#: actions/apiaccountupdateprofilecolors.php:110 +#: actions/apiaccountupdateprofileimage.php:84 +#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109 +#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "Цей метод потребує ÐÐПИСÐТИ." +#: actions/apiaccountupdatedeliverydevice.php:105 +msgid "" +"You must specify a parameter named 'device' with a value of one of: sms, im, " +"none" +msgstr "" + +#: actions/apiaccountupdatedeliverydevice.php:132 +#, fuzzy +msgid "Could not update user." +msgstr "Ðе вдалоÑÑ Ð¾Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ кориÑтувача." + +#: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 #: actions/newnotice.php:94 lib/designsettings.php:283 #, php-format msgid "" @@ -142,12 +152,34 @@ msgid "" "current configuration." msgstr "" -#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/apiaccountupdateprofilebackgroundimage.php:136 +#: actions/apiaccountupdateprofilebackgroundimage.php:146 +#: actions/apiaccountupdateprofilecolors.php:164 +#: actions/apiaccountupdateprofilecolors.php:174 +#, fuzzy +msgid "Unable to save your design settings." +msgstr "Ðе маю можливоÑÑ‚Ñ– зберегти ваші Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð¢Ð²Ñ–Ñ‚Ñ‚ÐµÑ€Ð°!" + +#: actions/apiaccountupdateprofilebackgroundimage.php:187 +#: actions/apiaccountupdateprofilecolors.php:142 +#, fuzzy +msgid "Could not update your design." +msgstr "Ðе вдалоÑÑ Ð¾Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ кориÑтувача." + +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 +#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 #: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 msgid "User has no profile." msgstr "КориÑтувач не має профілю." +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "Ðе вдалоÑÑ Ð·Ð±ÐµÑ€ÐµÐ³Ñ‚Ð¸ профіль." + #: actions/apiblockcreate.php:108 msgid "Block user failed." msgstr "Спроба заблокувати кориÑтувача невдала." @@ -194,6 +226,23 @@ msgstr "ПрÑме Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð´Ð¾ %s" msgid "All the direct messages sent to %s" msgstr "Ð’ÑÑ– прÑмі Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð½Ð°Ð´Ñ–Ñлані до %s" +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 +#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 +#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 +#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149 +#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +msgid "API method not found!" +msgstr "API метод не знайдено!" + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -390,17 +439,17 @@ msgstr "Ðватару оновлено." msgid "No status with that ID found." msgstr "Ðе знайдено жодних ÑтатуÑів з таким ID." -#: actions/apistatusesupdate.php:152 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 #: scripts/maildaemon.php:71 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Ðадто довго. МакÑимальний розмір Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ 140 знаків." -#: actions/apistatusesupdate.php:193 +#: actions/apistatusesupdate.php:198 msgid "Not found" msgstr "Ðе знайдено" -#: actions/apistatusesupdate.php:216 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:227 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -484,7 +533,7 @@ msgid "Invalid size." msgstr "ÐедійÑний розмір." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:113 +#: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "Ðватара" @@ -532,7 +581,7 @@ msgstr "Ð’Ñ‚Ñти" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:151 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -1683,7 +1732,7 @@ msgid "Nickname" msgstr "Ім'Ñ ÐºÐ¾Ñ€Ð¸Ñтувача" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Пароль" @@ -1824,7 +1873,7 @@ msgstr "" #: actions/noticesearch.php:124 #, php-format msgid "" -"Why not [register an account](%%%%action.register%%%%) and be the first to " +"Why not [register an account](%%%%action.register%%%%) and be the first to " "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" msgstr "" @@ -1871,8 +1920,8 @@ msgstr "З'єднаннÑ" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963 -#: lib/api.php:991 lib/api.php:1101 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 +#: lib/api.php:1027 lib/api.php:1137 msgid "Not a supported data format." msgstr "Такий формат даних не підтримуєтьÑÑ." @@ -1892,11 +1941,15 @@ msgstr "Інші опції" msgid "Manage various other options." msgstr "ÐšÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð´ÐµÑкими іншими опціÑми" -#: actions/othersettings.php:117 +#: actions/othersettings.php:108 +msgid " (free service)" +msgstr "" + +#: actions/othersettings.php:116 msgid "Shorten URLs with" msgstr "" -#: actions/othersettings.php:118 +#: actions/othersettings.php:117 msgid "Automatic shortening service to use." msgstr "СервіÑи доÑтупні Ð´Ð»Ñ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑтаннÑ" @@ -1933,65 +1986,60 @@ msgstr "" msgid "Change password" msgstr "Змінити пароль" -#: actions/passwordsettings.php:70 -#, fuzzy -msgid "You are not allowed to change your password" -msgstr "Змінити ваш пароль" - -#: actions/passwordsettings.php:82 +#: actions/passwordsettings.php:69 msgid "Change your password." msgstr "Змінити пароль." -#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:96 actions/recoverpassword.php:231 msgid "Password change" msgstr "Пароль замінено" -#: actions/passwordsettings.php:117 +#: actions/passwordsettings.php:104 msgid "Old password" msgstr "Старий пароль" -#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:108 actions/recoverpassword.php:235 msgid "New password" msgstr "Ðовий пароль" -#: actions/passwordsettings.php:122 +#: actions/passwordsettings.php:109 msgid "6 or more characters" msgstr "6 або більше знаків" -#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:112 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Підтвердити" -#: actions/passwordsettings.php:126 +#: actions/passwordsettings.php:113 msgid "same as password above" msgstr "такий Ñамо, Ñк Ñ– пароль вище" -#: actions/passwordsettings.php:130 +#: actions/passwordsettings.php:117 msgid "Change" msgstr "Змінити" -#: actions/passwordsettings.php:167 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "Пароль має ÑкладатиÑÑŒ з 6-ти або більше знаків." -#: actions/passwordsettings.php:170 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:233 msgid "Passwords don't match." msgstr "Паролі не Ñпівпадають." -#: actions/passwordsettings.php:178 +#: actions/passwordsettings.php:165 msgid "Incorrect old password" msgstr "Старий пароль неточний" -#: actions/passwordsettings.php:194 +#: actions/passwordsettings.php:181 msgid "Error saving user; invalid." msgstr "Помилка при збереженні кориÑтувача; недійÑний." -#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Ðе можна зберегти новий пароль." -#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:192 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Пароль збережено." @@ -2439,7 +2487,7 @@ msgid "Same as password above. Required." msgstr "Такий Ñамо, Ñк Ñ– пароль вище. Ðеодмінно." #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:122 +#: lib/accountsettingsaction.php:120 msgid "Email" msgstr "Пошта" @@ -3371,36 +3419,36 @@ msgstr "Проблема при збереженні повідомленнÑ." msgid "DB error inserting reply: %s" msgstr "Помилка бази даних при додаванні відповіді: %s" -#: classes/User.php:333 +#: classes/User.php:347 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "ÐŸÐ¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð´Ð¾ %1$s на %2$s" -#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Профіль" -#: lib/accountsettingsaction.php:110 +#: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "Змінити Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ñ€Ð¾Ñ„Ñ–Ð»ÑŽ" -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:112 msgid "Upload an avatar" msgstr "Ð—Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð°Ð²Ð°Ñ‚Ð°Ñ€Ð¸" -#: lib/accountsettingsaction.php:119 +#: lib/accountsettingsaction.php:116 msgid "Change your password" msgstr "Змінити ваш пароль" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:120 msgid "Change email handling" msgstr "Змінити електронну адреÑу вручну" -#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 +#: lib/accountsettingsaction.php:124 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:126 +#: lib/accountsettingsaction.php:124 #, fuzzy msgid "Design your profile" msgstr "Профіль кориÑтувача." @@ -3409,7 +3457,7 @@ msgstr "Профіль кориÑтувача." msgid "Other" msgstr "Інше" -#: lib/accountsettingsaction.php:129 +#: lib/accountsettingsaction.php:128 msgid "Other options" msgstr "Інші опції" @@ -3579,19 +3627,19 @@ msgstr "Ð’ÑÑ– " msgid "license." msgstr "ліцензіÑ." -#: lib/action.php:1053 +#: lib/action.php:1052 msgid "Pagination" msgstr "ÐÑƒÐ¼ÐµÑ€Ð°Ñ†Ñ–Ñ Ñторінок" -#: lib/action.php:1062 +#: lib/action.php:1061 msgid "After" msgstr "Вперед" -#: lib/action.php:1070 +#: lib/action.php:1069 msgid "Before" msgstr "Ðазад" -#: lib/action.php:1119 +#: lib/action.php:1117 msgid "There was a problem with your session token." msgstr "Виникли певні проблеми з токеном поточної ÑеÑÑ–Ñ—." @@ -3763,13 +3811,46 @@ msgstr "Ðе вдалоÑÑ Ñтворити форму OpenID: %s" msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:613 +#: lib/command.php:618 +#, fuzzy +msgid "You are not subscribed to anyone." +msgstr "Ви не підпиÑані до цього профілю." + +#: lib/command.php:620 +#, fuzzy +msgid "You are subscribed to these people: " +msgstr "Ви не підпиÑані до цього профілю." + +#: lib/command.php:637 +#, fuzzy +msgid "No one is subscribed to you." +msgstr "Ðе вдалоÑÑ Ð¿Ñ–Ð´Ð¿Ð¸Ñати іншого до ваÑ." + +#: lib/command.php:639 +#, fuzzy +msgid "These people are subscribed to you: " +msgstr "Люди підпиÑані до %s" + +#: lib/command.php:656 +#, fuzzy +msgid "You are not a member of any groups." +msgstr "Ви не Ñ” учаÑником цієї групи." + +#: lib/command.php:658 +#, fuzzy +msgid "You are a member of these groups: " +msgstr "Ви не Ñ” учаÑником цієї групи." + +#: lib/command.php:670 msgid "" "Commands:\n" "on - turn on notifications\n" "off - turn off notifications\n" "help - show this help\n" "follow <nickname> - subscribe to user\n" +"groups - lists the groups you have joined\n" +"subscriptions - list the people you follow\n" +"subscribers - list the people that follow you\n" "leave <nickname> - unsubscribe from user\n" "d <nickname> <text> - direct message to user\n" "get <nickname> - get last notice from user\n" @@ -3799,20 +3880,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:191 +#: lib/common.php:192 #, fuzzy msgid "No configuration file found. " msgstr "Ðемає коду підтвердженнÑ." -#: lib/common.php:192 +#: lib/common.php:193 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:193 +#: lib/common.php:194 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:194 +#: lib/common.php:195 #, fuzzy msgid "Go to the installer." msgstr "Увійти на Ñайт" @@ -4081,8 +4162,8 @@ msgstr "Тип файлу не підтримуєтьÑÑ" #: lib/jabber.php:192 #, php-format -msgid "notice id: %s" -msgstr "Ðове повідомленнÑ" +msgid "[%s]" +msgstr "" #: lib/joinform.php:114 msgid "Join" @@ -4605,7 +4686,8 @@ msgid "Could not subscribe other to you." msgstr "Ðе вдалоÑÑ Ð¿Ñ–Ð´Ð¿Ð¸Ñати іншого до ваÑ." #: lib/subs.php:124 -msgid "Not subscribed!." +#, fuzzy +msgid "Not subscribed!" msgstr "Ðе підпиÑано!." #: lib/subs.php:136 @@ -4654,47 +4736,47 @@ msgstr "ÐадіÑлати прÑме Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ñ†ÑŒÐ¾Ð¼Ñƒ кор msgid "Message" msgstr "ПовідомленнÑ" -#: lib/util.php:818 +#: lib/util.php:821 msgid "a few seconds ago" msgstr "мить тому" -#: lib/util.php:820 +#: lib/util.php:823 msgid "about a minute ago" msgstr "хвилину тому" -#: lib/util.php:822 +#: lib/util.php:825 #, php-format msgid "about %d minutes ago" msgstr "близько %d хвилин тому" -#: lib/util.php:824 +#: lib/util.php:827 msgid "about an hour ago" msgstr "годину тому" -#: lib/util.php:826 +#: lib/util.php:829 #, php-format msgid "about %d hours ago" msgstr "близько %d годин тому" -#: lib/util.php:828 +#: lib/util.php:831 msgid "about a day ago" msgstr "день тому" -#: lib/util.php:830 +#: lib/util.php:833 #, php-format msgid "about %d days ago" msgstr "близько %d днів тому" -#: lib/util.php:832 +#: lib/util.php:835 msgid "about a month ago" msgstr "міÑÑць тому" -#: lib/util.php:834 +#: lib/util.php:837 #, php-format msgid "about %d months ago" msgstr "близько %d міÑÑців тому" -#: lib/util.php:836 +#: lib/util.php:839 msgid "about a year ago" msgstr "рік тому" diff --git a/locale/vi/LC_MESSAGES/statusnet.mo b/locale/vi/LC_MESSAGES/statusnet.mo Binary files differindex bb42fbee7..0480dfd01 100644 --- a/locale/vi/LC_MESSAGES/statusnet.mo +++ b/locale/vi/LC_MESSAGES/statusnet.mo diff --git a/locale/vi/LC_MESSAGES/statusnet.po b/locale/vi/LC_MESSAGES/statusnet.po index f1b61c263..c0616649e 100644 --- a/locale/vi/LC_MESSAGES/statusnet.po +++ b/locale/vi/LC_MESSAGES/statusnet.po @@ -5,12 +5,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-10 20:53+0000\n" -"PO-Revision-Date: 2009-11-10 20:59:55+0000\n" +"POT-Creation-Date: 2009-11-16 19:42+0000\n" +"PO-Revision-Date: 2009-11-16 19:44:26+0000\n" "Language-Team: Vietnamese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: vi\n" "X-Message-Group: out-statusnet\n" @@ -22,12 +22,15 @@ msgid "No such page" msgstr "Không có tin nhắn nà o." #: actions/all.php:74 actions/allrss.php:68 -#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofilebackgroundimage.php:116 +#: actions/apiaccountupdateprofileimage.php:105 +#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 #: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 #: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 @@ -106,35 +109,42 @@ msgstr "%s và bạn bè" msgid "Updates from %1$s and friends on %2$s!" msgstr "" -#: actions/apiaccountratelimitstatus.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 -#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:129 actions/apigroupcreate.php:184 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120 -#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101 -#: actions/apigroupshow.php:105 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144 -#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141 -#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130 -#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163 -#: actions/apiusershow.php:101 -msgid "API method not found!" +#: actions/apiaccountratelimitstatus.php:70 +#: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofilebackgroundimage.php:94 +#: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apiaccountupdateprofile.php:97 +#, fuzzy +msgid "API method not found." msgstr "PhÆ°Æ¡ng thức API không tìm thấy!" -#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 +#: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofilebackgroundimage.php:86 +#: actions/apiaccountupdateprofilecolors.php:110 +#: actions/apiaccountupdateprofileimage.php:84 +#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109 +#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "PhÆ°Æ¡ng thức nà y yêu cầu là POST." +#: actions/apiaccountupdatedeliverydevice.php:105 +msgid "" +"You must specify a parameter named 'device' with a value of one of: sms, im, " +"none" +msgstr "" + +#: actions/apiaccountupdatedeliverydevice.php:132 +#, fuzzy +msgid "Could not update user." +msgstr "Không thể cáºp nháºt thà nh viên." + +#: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 #: actions/newnotice.php:94 lib/designsettings.php:283 #, php-format msgid "" @@ -142,12 +152,34 @@ msgid "" "current configuration." msgstr "" -#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/apiaccountupdateprofilebackgroundimage.php:136 +#: actions/apiaccountupdateprofilebackgroundimage.php:146 +#: actions/apiaccountupdateprofilecolors.php:164 +#: actions/apiaccountupdateprofilecolors.php:174 +#, fuzzy +msgid "Unable to save your design settings." +msgstr "Không thể lÆ°u thông tin Twitter của bạn!" + +#: actions/apiaccountupdateprofilebackgroundimage.php:187 +#: actions/apiaccountupdateprofilecolors.php:142 +#, fuzzy +msgid "Could not update your design." +msgstr "Không thể cáºp nháºt thà nh viên." + +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 +#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 #: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 msgid "User has no profile." msgstr "NgÆ°á»i dùng không có thông tin." +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "Không thể lÆ°u hồ sÆ¡ cá nhân." + #: actions/apiblockcreate.php:108 msgid "Block user failed." msgstr "" @@ -195,6 +227,23 @@ msgstr "Tin nhắn riêng" msgid "All the direct messages sent to %s" msgstr "" +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 +#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 +#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 +#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149 +#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +msgid "API method not found!" +msgstr "PhÆ°Æ¡ng thức API không tìm thấy!" + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -393,17 +442,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:152 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 #: scripts/maildaemon.php:71 #, 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:193 +#: actions/apistatusesupdate.php:198 msgid "Not found" msgstr "Không tìm thấy" -#: actions/apistatusesupdate.php:216 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:227 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -488,7 +537,7 @@ msgid "Invalid size." msgstr "KÃch thÆ°á»›c không hợp lệ." #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:113 +#: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "Hình đại diện" @@ -541,7 +590,7 @@ msgstr "Nhóm" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:151 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -1719,7 +1768,7 @@ msgid "Nickname" msgstr "Biệt danh" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Máºt khẩu" @@ -1861,7 +1910,7 @@ msgstr "" #: actions/noticesearch.php:124 #, php-format msgid "" -"Why not [register an account](%%%%action.register%%%%) and be the first to " +"Why not [register an account](%%%%action.register%%%%) and be the first to " "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" msgstr "" @@ -1908,8 +1957,8 @@ msgstr "Kết nối" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963 -#: lib/api.php:991 lib/api.php:1101 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 +#: lib/api.php:1027 lib/api.php:1137 msgid "Not a supported data format." msgstr "Không há»— trợ định dạng dữ liệu nà y." @@ -1931,11 +1980,15 @@ msgstr "Thiết láºp tà i khoản Twitter" msgid "Manage various other options." msgstr "" -#: actions/othersettings.php:117 +#: actions/othersettings.php:108 +msgid " (free service)" +msgstr "" + +#: actions/othersettings.php:116 msgid "Shorten URLs with" msgstr "" -#: actions/othersettings.php:118 +#: actions/othersettings.php:117 msgid "Automatic shortening service to use." msgstr "" @@ -1973,68 +2026,63 @@ msgstr "" msgid "Change password" msgstr "Äổi máºt khẩu" -#: actions/passwordsettings.php:70 -#, fuzzy -msgid "You are not allowed to change your password" -msgstr "Thay đổi máºt khẩu của bạn" - -#: actions/passwordsettings.php:82 +#: actions/passwordsettings.php:69 #, fuzzy msgid "Change your password." msgstr "Thay đổi máºt khẩu của bạn" -#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:96 actions/recoverpassword.php:231 #, fuzzy msgid "Password change" msgstr "Äã lÆ°u máºt khẩu." -#: actions/passwordsettings.php:117 +#: actions/passwordsettings.php:104 msgid "Old password" msgstr "Máºt khẩu cÅ©" -#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:108 actions/recoverpassword.php:235 msgid "New password" msgstr "Máºt khẩu má»›i" -#: actions/passwordsettings.php:122 +#: actions/passwordsettings.php:109 msgid "6 or more characters" msgstr "Nhiá»u hÆ¡n 6 ký tá»±" -#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:112 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "Xác nháºn" -#: actions/passwordsettings.php:126 +#: actions/passwordsettings.php:113 msgid "same as password above" msgstr "cùng máºt khẩu ở trên" -#: actions/passwordsettings.php:130 +#: actions/passwordsettings.php:117 msgid "Change" msgstr "Thay đổi" -#: actions/passwordsettings.php:167 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:230 #, fuzzy msgid "Password must be 6 or more characters." msgstr "Máºt khẩu phải nhiá»u hÆ¡n 6 ký tá»±." -#: actions/passwordsettings.php:170 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:233 msgid "Passwords don't match." msgstr "Máºt khẩu không khá»›p." -#: actions/passwordsettings.php:178 +#: actions/passwordsettings.php:165 msgid "Incorrect old password" msgstr "Máºt khẩu cÅ© sai" -#: actions/passwordsettings.php:194 +#: actions/passwordsettings.php:181 msgid "Error saving user; invalid." msgstr "Lá»—i xảy ra khi lÆ°u thà nh viên; không hợp lệ." -#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "Không thể lÆ°u máºt khẩu má»›i" -#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:192 actions/recoverpassword.php:211 msgid "Password saved." msgstr "Äã lÆ°u máºt khẩu." @@ -2480,7 +2528,7 @@ msgid "Same as password above. Required." msgstr "Cùng máºt khẩu ở trên. Bắt buá»™c." #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:122 +#: lib/accountsettingsaction.php:120 msgid "Email" msgstr "Email" @@ -3420,37 +3468,37 @@ msgstr "Có lá»—i xảy ra khi lÆ°u tin nhắn." msgid "DB error inserting reply: %s" msgstr "Lá»—i cÆ¡ sở dữ liệu khi chèn trả lá»i: %s" -#: classes/User.php:333 +#: classes/User.php:347 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "%s chà o mừng bạn " -#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 msgid "Profile" msgstr "Hồ sÆ¡ " -#: lib/accountsettingsaction.php:110 +#: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "Thay đổi các thiết láºp trong hồ sÆ¡ cá nhân của bạn" -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:112 #, fuzzy msgid "Upload an avatar" msgstr "Cáºp nháºt hình đại diện không thà nh công." -#: lib/accountsettingsaction.php:119 +#: lib/accountsettingsaction.php:116 msgid "Change your password" msgstr "Thay đổi máºt khẩu của bạn" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:120 msgid "Change email handling" msgstr "Äang thá»±c hiện việc thay đổi email" -#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 +#: lib/accountsettingsaction.php:124 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:126 +#: lib/accountsettingsaction.php:124 #, fuzzy msgid "Design your profile" msgstr "Hồ sÆ¡" @@ -3460,7 +3508,7 @@ msgstr "Hồ sÆ¡" msgid "Other" msgstr "Sau" -#: lib/accountsettingsaction.php:129 +#: lib/accountsettingsaction.php:128 msgid "Other options" msgstr "" @@ -3639,21 +3687,21 @@ msgstr "" msgid "license." msgstr "" -#: lib/action.php:1053 +#: lib/action.php:1052 msgid "Pagination" msgstr "" -#: lib/action.php:1062 +#: lib/action.php:1061 #, fuzzy msgid "After" msgstr "Sau" -#: lib/action.php:1070 +#: lib/action.php:1069 #, fuzzy msgid "Before" msgstr "TrÆ°á»›c" -#: lib/action.php:1119 +#: lib/action.php:1117 #, 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." @@ -3833,13 +3881,46 @@ msgstr "Không thể tạo OpenID mẫu: %s" msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:613 +#: lib/command.php:618 +#, fuzzy +msgid "You are not subscribed to anyone." +msgstr "Bạn chÆ°a cáºp nháºt thông tin riêng" + +#: lib/command.php:620 +#, fuzzy +msgid "You are subscribed to these people: " +msgstr "Bạn chÆ°a cáºp nháºt thông tin riêng" + +#: lib/command.php:637 +#, fuzzy +msgid "No one is subscribed to you." +msgstr "Không thể tạo favorite." + +#: lib/command.php:639 +#, fuzzy +msgid "These people are subscribed to you: " +msgstr "Theo nhóm nà y" + +#: lib/command.php:656 +#, fuzzy +msgid "You are not a member of any groups." +msgstr "Bạn chÆ°a cáºp nháºt thông tin riêng" + +#: lib/command.php:658 +#, fuzzy +msgid "You are a member of these groups: " +msgstr "Bạn chÆ°a cáºp nháºt thông tin riêng" + +#: lib/command.php:670 msgid "" "Commands:\n" "on - turn on notifications\n" "off - turn off notifications\n" "help - show this help\n" "follow <nickname> - subscribe to user\n" +"groups - lists the groups you have joined\n" +"subscriptions - list the people you follow\n" +"subscribers - list the people that follow you\n" "leave <nickname> - unsubscribe from user\n" "d <nickname> <text> - direct message to user\n" "get <nickname> - get last notice from user\n" @@ -3869,20 +3950,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:191 +#: lib/common.php:192 #, fuzzy msgid "No configuration file found. " msgstr "Không có mã số xác nháºn." -#: lib/common.php:192 +#: lib/common.php:193 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:193 +#: lib/common.php:194 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:194 +#: lib/common.php:195 msgid "Go to the installer." msgstr "" @@ -4166,8 +4247,8 @@ msgstr "Không há»— trợ kiểu file ảnh nà y." #: lib/jabber.php:192 #, php-format -msgid "notice id: %s" -msgstr "Thông báo má»›i" +msgid "[%s]" +msgstr "" #: lib/joinform.php:114 #, fuzzy @@ -4362,6 +4443,20 @@ msgid "" "With kind regards,\n" "%5$s\n" msgstr "" +"%1$s (%2$s) đã gá»i đến bạn tin nhắn riêng:\n" +"\n" +"------------------------------------------------------\n" +"%3$s\n" +"------------------------------------------------------\n" +"\n" +"Bạn có thể trả lá»i tại:\n" +"\n" +"%4$s\n" +"\n" +"Äừng trả lá»i lại thÆ° nà y; sẽ không có ai nháºn thÆ°.\n" +"\n" +"Chúc sức khá»e,\n" +"%5$s\n" #: lib/mail.php:554 #, fuzzy, php-format @@ -4735,7 +4830,8 @@ msgid "Could not subscribe other to you." msgstr "Không thể tạo favorite." #: lib/subs.php:124 -msgid "Not subscribed!." +#, fuzzy +msgid "Not subscribed!" msgstr "ChÆ°a đăng nháºn!" #: lib/subs.php:136 @@ -4789,47 +4885,47 @@ msgstr "Bạn đã theo những ngÆ°á»i nà y:" msgid "Message" msgstr "Tin má»›i nhất" -#: lib/util.php:818 +#: lib/util.php:821 msgid "a few seconds ago" msgstr "và i giây trÆ°á»›c" -#: lib/util.php:820 +#: lib/util.php:823 msgid "about a minute ago" msgstr "1 phút trÆ°á»›c" -#: lib/util.php:822 +#: lib/util.php:825 #, php-format msgid "about %d minutes ago" msgstr "%d phút trÆ°á»›c" -#: lib/util.php:824 +#: lib/util.php:827 msgid "about an hour ago" msgstr "1 giá» trÆ°á»›c" -#: lib/util.php:826 +#: lib/util.php:829 #, php-format msgid "about %d hours ago" msgstr "%d giá» trÆ°á»›c" -#: lib/util.php:828 +#: lib/util.php:831 msgid "about a day ago" msgstr "1 ngà y trÆ°á»›c" -#: lib/util.php:830 +#: lib/util.php:833 #, php-format msgid "about %d days ago" msgstr "%d ngà y trÆ°á»›c" -#: lib/util.php:832 +#: lib/util.php:835 msgid "about a month ago" msgstr "1 tháng trÆ°á»›c" -#: lib/util.php:834 +#: lib/util.php:837 #, php-format msgid "about %d months ago" msgstr "%d tháng trÆ°á»›c" -#: lib/util.php:836 +#: lib/util.php:839 msgid "about a year ago" msgstr "1 năm trÆ°á»›c" diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.mo b/locale/zh_CN/LC_MESSAGES/statusnet.mo Binary files differindex f3b08115d..4fd7cd1dc 100644 --- a/locale/zh_CN/LC_MESSAGES/statusnet.mo +++ b/locale/zh_CN/LC_MESSAGES/statusnet.mo diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po index 1a5c6d5ba..722af7d34 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: 2009-11-10 20:53+0000\n" -"PO-Revision-Date: 2009-11-10 20:59:58+0000\n" +"POT-Creation-Date: 2009-11-16 19:42+0000\n" +"PO-Revision-Date: 2009-11-16 19:44:29+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(r58872); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: zh-hans\n" "X-Message-Group: out-statusnet\n" @@ -27,12 +27,15 @@ msgid "No such page" msgstr "未找到æ¤æ¶ˆæ¯ã€‚" #: actions/all.php:74 actions/allrss.php:68 -#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofilebackgroundimage.php:116 +#: actions/apiaccountupdateprofileimage.php:105 +#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 #: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 #: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 @@ -111,35 +114,42 @@ msgstr "%s åŠå¥½å‹" msgid "Updates from %1$s and friends on %2$s!" msgstr "%2$s 上 %1$s 和好å‹çš„æ›´æ–°ï¼" -#: actions/apiaccountratelimitstatus.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 -#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:129 actions/apigroupcreate.php:184 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120 -#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101 -#: actions/apigroupshow.php:105 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144 -#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141 -#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130 -#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163 -#: actions/apiusershow.php:101 -msgid "API method not found!" +#: actions/apiaccountratelimitstatus.php:70 +#: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofilebackgroundimage.php:94 +#: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apiaccountupdateprofile.php:97 +#, fuzzy +msgid "API method not found." msgstr "API 方法未实现ï¼" -#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 +#: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofilebackgroundimage.php:86 +#: actions/apiaccountupdateprofilecolors.php:110 +#: actions/apiaccountupdateprofileimage.php:84 +#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109 +#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "æ¤æ–¹æ³•æŽ¥å—POST请求。" +#: actions/apiaccountupdatedeliverydevice.php:105 +msgid "" +"You must specify a parameter named 'device' with a value of one of: sms, im, " +"none" +msgstr "" + +#: actions/apiaccountupdatedeliverydevice.php:132 +#, fuzzy +msgid "Could not update user." +msgstr "æ— æ³•æ›´æ–°ç”¨æˆ·ã€‚" + +#: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 #: actions/newnotice.php:94 lib/designsettings.php:283 #, php-format msgid "" @@ -147,12 +157,34 @@ msgid "" "current configuration." msgstr "" -#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/apiaccountupdateprofilebackgroundimage.php:136 +#: actions/apiaccountupdateprofilebackgroundimage.php:146 +#: actions/apiaccountupdateprofilecolors.php:164 +#: actions/apiaccountupdateprofilecolors.php:174 +#, fuzzy +msgid "Unable to save your design settings." +msgstr "æ— æ³•ä¿å˜ Twitter 设置ï¼" + +#: actions/apiaccountupdateprofilebackgroundimage.php:187 +#: actions/apiaccountupdateprofilecolors.php:142 +#, fuzzy +msgid "Could not update your design." +msgstr "æ— æ³•æ›´æ–°ç”¨æˆ·ã€‚" + +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 +#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 #: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 msgid "User has no profile." msgstr "用户没有个人信æ¯ã€‚" +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "æ— æ³•ä¿å˜ä¸ªäººä¿¡æ¯ã€‚" + #: actions/apiblockcreate.php:108 msgid "Block user failed." msgstr "阻æ¢ç”¨æˆ·å¤±è´¥ã€‚" @@ -198,6 +230,23 @@ msgstr "å‘ç»™ %s 的直接消æ¯" msgid "All the direct messages sent to %s" msgstr "å‘ç»™ %s 的直接消æ¯" +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 +#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 +#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 +#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149 +#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +msgid "API method not found!" +msgstr "API 方法未实现ï¼" + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -393,17 +442,17 @@ msgstr "头åƒå·²æ›´æ–°ã€‚" msgid "No status with that ID found." msgstr "没有找到æ¤IDçš„ä¿¡æ¯ã€‚" -#: actions/apistatusesupdate.php:152 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 #: scripts/maildaemon.php:71 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "超出长度é™åˆ¶ã€‚ä¸èƒ½è¶…过 140 个å—符。" -#: actions/apistatusesupdate.php:193 +#: actions/apistatusesupdate.php:198 msgid "Not found" msgstr "未找到" -#: actions/apistatusesupdate.php:216 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:227 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -488,7 +537,7 @@ msgid "Invalid size." msgstr "大å°ä¸æ£ç¡®ã€‚" #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:113 +#: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "头åƒ" @@ -537,7 +586,7 @@ msgstr "剪è£" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:151 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -1677,7 +1726,7 @@ msgid "Nickname" msgstr "昵称" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:116 msgid "Password" msgstr "密ç " @@ -1811,7 +1860,7 @@ msgstr "" #: actions/noticesearch.php:124 #, php-format msgid "" -"Why not [register an account](%%%%action.register%%%%) and be the first to " +"Why not [register an account](%%%%action.register%%%%) and be the first to " "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" msgstr "" @@ -1856,8 +1905,8 @@ msgstr "连接" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963 -#: lib/api.php:991 lib/api.php:1101 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 +#: lib/api.php:1027 lib/api.php:1137 msgid "Not a supported data format." msgstr "ä¸æ”¯æŒçš„æ•°æ®æ ¼å¼ã€‚" @@ -1878,11 +1927,15 @@ msgstr "Twitter 设置" msgid "Manage various other options." msgstr "管ç†å…¶ä»–选项。" -#: actions/othersettings.php:117 +#: actions/othersettings.php:108 +msgid " (free service)" +msgstr "" + +#: actions/othersettings.php:116 msgid "Shorten URLs with" msgstr "" -#: actions/othersettings.php:118 +#: actions/othersettings.php:117 msgid "Automatic shortening service to use." msgstr "è¦ä½¿ç”¨çš„自动缩çŸæœåŠ¡ã€‚" @@ -1918,67 +1971,62 @@ msgstr "这是您的å‘件箱，包å«æ‚¨å‘é€çš„ç§äººæ¶ˆæ¯ã€‚" msgid "Change password" msgstr "修改密ç " -#: actions/passwordsettings.php:70 -#, fuzzy -msgid "You are not allowed to change your password" -msgstr "修改密ç " - -#: actions/passwordsettings.php:82 +#: actions/passwordsettings.php:69 #, fuzzy msgid "Change your password." msgstr "修改密ç " -#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:96 actions/recoverpassword.php:231 #, fuzzy msgid "Password change" msgstr "密ç å·²ä¿å˜ã€‚" -#: actions/passwordsettings.php:117 +#: actions/passwordsettings.php:104 msgid "Old password" msgstr "旧密ç " -#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:108 actions/recoverpassword.php:235 msgid "New password" msgstr "新密ç " -#: actions/passwordsettings.php:122 +#: actions/passwordsettings.php:109 msgid "6 or more characters" msgstr "6 个或更多å—符" -#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:112 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "确认" -#: actions/passwordsettings.php:126 +#: actions/passwordsettings.php:113 msgid "same as password above" msgstr "相åŒçš„密ç " -#: actions/passwordsettings.php:130 +#: actions/passwordsettings.php:117 msgid "Change" msgstr "修改" -#: actions/passwordsettings.php:167 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "密ç å¿…é¡»åŒ…å« 6 个或更多å—符。" -#: actions/passwordsettings.php:170 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:233 msgid "Passwords don't match." msgstr "密ç ä¸åŒ¹é…。" -#: actions/passwordsettings.php:178 +#: actions/passwordsettings.php:165 msgid "Incorrect old password" msgstr "旧密ç ä¸æ£ç¡®" -#: actions/passwordsettings.php:194 +#: actions/passwordsettings.php:181 msgid "Error saving user; invalid." msgstr "ä¿å˜ç”¨æˆ·æ—¶å‡ºé”™ï¼›ä¸æ£ç¡®ã€‚" -#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "æ— æ³•ä¿å˜æ–°å¯†ç 。" -#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:192 actions/recoverpassword.php:211 msgid "Password saved." msgstr "密ç å·²ä¿å˜ã€‚" @@ -2416,7 +2464,7 @@ msgid "Same as password above. Required." msgstr "相åŒçš„密ç 。æ¤é¡¹å¿…填。" #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:122 +#: lib/accountsettingsaction.php:120 msgid "Email" msgstr "电å邮件" @@ -3345,36 +3393,36 @@ msgstr "ä¿å˜é€šå‘Šæ—¶å‡ºé”™ã€‚" msgid "DB error inserting reply: %s" msgstr "æ·»åŠ å›žå¤æ—¶æ•°æ®åº“出错：%s" -#: classes/User.php:333 +#: classes/User.php:347 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "å‘é€ç»™ %1$s çš„ %2$s 消æ¯" -#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 msgid "Profile" msgstr "个人信æ¯" -#: lib/accountsettingsaction.php:110 +#: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "修改您的个人信æ¯" -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:112 msgid "Upload an avatar" msgstr "上载一个头åƒã€‚" -#: lib/accountsettingsaction.php:119 +#: lib/accountsettingsaction.php:116 msgid "Change your password" msgstr "修改密ç " -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:120 msgid "Change email handling" msgstr "修改电å邮件" -#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 +#: lib/accountsettingsaction.php:124 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:126 +#: lib/accountsettingsaction.php:124 #, fuzzy msgid "Design your profile" msgstr "用户没有个人信æ¯ã€‚" @@ -3383,7 +3431,7 @@ msgstr "用户没有个人信æ¯ã€‚" msgid "Other" msgstr "其他" -#: lib/accountsettingsaction.php:129 +#: lib/accountsettingsaction.php:128 msgid "Other options" msgstr "其他选项" @@ -3559,21 +3607,21 @@ msgstr "全部" msgid "license." msgstr "注册è¯" -#: lib/action.php:1053 +#: lib/action.php:1052 msgid "Pagination" msgstr "分页" -#: lib/action.php:1062 +#: lib/action.php:1061 #, fuzzy msgid "After" msgstr "« 之åŽ" -#: lib/action.php:1070 +#: lib/action.php:1069 #, fuzzy msgid "Before" msgstr "ä¹‹å‰ Â»" -#: lib/action.php:1119 +#: lib/action.php:1117 #, fuzzy msgid "There was a problem with your session token." msgstr "会è¯æ ‡è¯†æœ‰é—®é¢˜ï¼Œè¯·é‡è¯•ã€‚" @@ -3746,13 +3794,46 @@ msgstr "æ— æ³•åˆ›å»º OpenID 表å•ï¼š%s" msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:613 +#: lib/command.php:618 +#, fuzzy +msgid "You are not subscribed to anyone." +msgstr "您未告知æ¤ä¸ªäººä¿¡æ¯" + +#: lib/command.php:620 +#, fuzzy +msgid "You are subscribed to these people: " +msgstr "您未告知æ¤ä¸ªäººä¿¡æ¯" + +#: lib/command.php:637 +#, fuzzy +msgid "No one is subscribed to you." +msgstr "æ— æ³•è®¢é˜…ä»–äººæ›´æ–°ã€‚" + +#: lib/command.php:639 +#, fuzzy +msgid "These people are subscribed to you: " +msgstr "订阅 %s" + +#: lib/command.php:656 +#, fuzzy +msgid "You are not a member of any groups." +msgstr "您未告知æ¤ä¸ªäººä¿¡æ¯" + +#: lib/command.php:658 +#, fuzzy +msgid "You are a member of these groups: " +msgstr "您未告知æ¤ä¸ªäººä¿¡æ¯" + +#: lib/command.php:670 msgid "" "Commands:\n" "on - turn on notifications\n" "off - turn off notifications\n" "help - show this help\n" "follow <nickname> - subscribe to user\n" +"groups - lists the groups you have joined\n" +"subscriptions - list the people you follow\n" +"subscribers - list the people that follow you\n" "leave <nickname> - unsubscribe from user\n" "d <nickname> <text> - direct message to user\n" "get <nickname> - get last notice from user\n" @@ -3782,20 +3863,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:191 +#: lib/common.php:192 #, fuzzy msgid "No configuration file found. " msgstr "没有验è¯ç " -#: lib/common.php:192 +#: lib/common.php:193 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:193 +#: lib/common.php:194 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:194 +#: lib/common.php:195 #, fuzzy msgid "Go to the installer." msgstr "登入本站" @@ -4073,8 +4154,8 @@ msgstr "未知文件类型" #: lib/jabber.php:192 #, php-format -msgid "notice id: %s" -msgstr "新通告" +msgid "[%s]" +msgstr "" #: lib/joinform.php:114 #, fuzzy @@ -4610,7 +4691,8 @@ msgid "Could not subscribe other to you." msgstr "æ— æ³•è®¢é˜…ä»–äººæ›´æ–°ã€‚" #: lib/subs.php:124 -msgid "Not subscribed!." +#, fuzzy +msgid "Not subscribed!" msgstr "未订阅ï¼" #: lib/subs.php:136 @@ -4665,47 +4747,47 @@ msgstr "æ— æ³•å‘æ¤ç”¨æˆ·å‘é€æ¶ˆæ¯ã€‚" msgid "Message" msgstr "新消æ¯" -#: lib/util.php:818 +#: lib/util.php:821 msgid "a few seconds ago" msgstr "å‡ ç§’å‰" -#: lib/util.php:820 +#: lib/util.php:823 msgid "about a minute ago" msgstr "一分钟å‰" -#: lib/util.php:822 +#: lib/util.php:825 #, php-format msgid "about %d minutes ago" msgstr "%d 分钟å‰" -#: lib/util.php:824 +#: lib/util.php:827 msgid "about an hour ago" msgstr "一å°æ—¶å‰" -#: lib/util.php:826 +#: lib/util.php:829 #, php-format msgid "about %d hours ago" msgstr "%d å°æ—¶å‰" -#: lib/util.php:828 +#: lib/util.php:831 msgid "about a day ago" msgstr "一天å‰" -#: lib/util.php:830 +#: lib/util.php:833 #, php-format msgid "about %d days ago" msgstr "%d 天å‰" -#: lib/util.php:832 +#: lib/util.php:835 msgid "about a month ago" msgstr "一个月å‰" -#: lib/util.php:834 +#: lib/util.php:837 #, php-format msgid "about %d months ago" msgstr "%d 个月å‰" -#: lib/util.php:836 +#: lib/util.php:839 msgid "about a year ago" msgstr "一年å‰" diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.mo b/locale/zh_TW/LC_MESSAGES/statusnet.mo Binary files differindex 36cdef3ba..0db278848 100644 --- a/locale/zh_TW/LC_MESSAGES/statusnet.mo +++ b/locale/zh_TW/LC_MESSAGES/statusnet.mo diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.po b/locale/zh_TW/LC_MESSAGES/statusnet.po index 0843684be..d251d4aa4 100644 --- a/locale/zh_TW/LC_MESSAGES/statusnet.po +++ b/locale/zh_TW/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-10 20:53+0000\n" -"PO-Revision-Date: 2009-11-10 21:00:00+0000\n" +"POT-Creation-Date: 2009-11-16 19:42+0000\n" +"PO-Revision-Date: 2009-11-16 19:44:31+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(r58872); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: zh-hant\n" "X-Message-Group: out-statusnet\n" @@ -27,12 +27,15 @@ msgid "No such page" msgstr "ç„¡æ¤é€šçŸ¥" #: actions/all.php:74 actions/allrss.php:68 -#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97 +#: actions/apiaccountupdatedeliverydevice.php:113 +#: actions/apiaccountupdateprofilebackgroundimage.php:116 +#: actions/apiaccountupdateprofileimage.php:105 +#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97 #: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75 #: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:139 actions/apisubscriptions.php:87 +#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81 #: actions/avatarbynickname.php:75 actions/favoritesrss.php:74 @@ -111,35 +114,42 @@ msgstr "%s與好å‹" msgid "Updates from %1$s and friends on %2$s!" msgstr "" -#: actions/apiaccountratelimitstatus.php:70 actions/apidirectmessage.php:156 -#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 -#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:129 actions/apigroupcreate.php:184 -#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 -#: actions/apigroupleave.php:141 actions/apigrouplistall.php:120 -#: actions/apigrouplist.php:132 actions/apigroupmembership.php:101 -#: actions/apigroupshow.php:105 actions/apihelptest.php:88 -#: actions/apistatusesdestroy.php:102 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:144 -#: actions/apitimelinefriends.php:154 actions/apitimelinegroup.php:141 -#: actions/apitimelinementions.php:149 actions/apitimelinepublic.php:130 -#: actions/apitimelinetag.php:139 actions/apitimelineuser.php:163 -#: actions/apiusershow.php:101 -msgid "API method not found!" -msgstr "" +#: actions/apiaccountratelimitstatus.php:70 +#: actions/apiaccountupdatedeliverydevice.php:93 +#: actions/apiaccountupdateprofilebackgroundimage.php:94 +#: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apiaccountupdateprofile.php:97 +#, fuzzy +msgid "API method not found." +msgstr "確èªç¢¼éºå¤±" -#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89 +#: actions/apiaccountupdatedeliverydevice.php:85 +#: actions/apiaccountupdateprofilebackgroundimage.php:86 +#: actions/apiaccountupdateprofilecolors.php:110 +#: actions/apiaccountupdateprofileimage.php:84 +#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89 #: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:117 #: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91 #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 -#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:109 +#: actions/apigroupleave.php:91 actions/apistatusesupdate.php:114 msgid "This method requires a POST." msgstr "" +#: actions/apiaccountupdatedeliverydevice.php:105 +msgid "" +"You must specify a parameter named 'device' with a value of one of: sms, im, " +"none" +msgstr "" + +#: actions/apiaccountupdatedeliverydevice.php:132 +#, fuzzy +msgid "Could not update user." +msgstr "無法更新使用者" + +#: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254 +#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254 #: actions/newnotice.php:94 lib/designsettings.php:283 #, php-format msgid "" @@ -147,12 +157,33 @@ msgid "" "current configuration." msgstr "" -#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 +#: actions/apiaccountupdateprofilebackgroundimage.php:136 +#: actions/apiaccountupdateprofilebackgroundimage.php:146 +#: actions/apiaccountupdateprofilecolors.php:164 +#: actions/apiaccountupdateprofilecolors.php:174 +msgid "Unable to save your design settings." +msgstr "" + +#: actions/apiaccountupdateprofilebackgroundimage.php:187 +#: actions/apiaccountupdateprofilecolors.php:142 +#, fuzzy +msgid "Could not update your design." +msgstr "無法更新使用者" + +#: actions/apiaccountupdateprofilebackgroundimage.php:194 +#: actions/apiaccountupdateprofilecolors.php:185 +#: actions/apiaccountupdateprofileimage.php:130 +#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 #: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 msgid "User has no profile." msgstr "" +#: actions/apiaccountupdateprofile.php:147 +#, fuzzy +msgid "Could not save profile." +msgstr "無法儲å˜å€‹äººè³‡æ–™" + #: actions/apiblockcreate.php:108 msgid "Block user failed." msgstr "" @@ -198,6 +229,23 @@ msgstr "" msgid "All the direct messages sent to %s" msgstr "" +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132 +#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133 +#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 +#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154 +#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149 +#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139 +#: actions/apitimelineuser.php:163 actions/apiusershow.php:101 +msgid "API method not found!" +msgstr "" + #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." @@ -391,17 +439,17 @@ msgstr "更新個人圖åƒ" msgid "No status with that ID found." msgstr "" -#: actions/apistatusesupdate.php:152 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 #: scripts/maildaemon.php:71 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" -#: actions/apistatusesupdate.php:193 +#: actions/apistatusesupdate.php:198 msgid "Not found" msgstr "" -#: actions/apistatusesupdate.php:216 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:227 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -485,7 +533,7 @@ msgid "Invalid size." msgstr "尺寸錯誤" #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:113 +#: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "個人圖åƒ" @@ -534,7 +582,7 @@ msgstr "" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:151 +#: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -1619,7 +1667,7 @@ msgid "Nickname" msgstr "暱稱" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:116 msgid "Password" msgstr "" @@ -1748,7 +1796,7 @@ msgstr "" #: actions/noticesearch.php:124 #, php-format msgid "" -"Why not [register an account](%%%%action.register%%%%) and be the first to " +"Why not [register an account](%%%%action.register%%%%) and be the first to " "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" msgstr "" @@ -1793,8 +1841,8 @@ msgstr "連çµ" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:963 -#: lib/api.php:991 lib/api.php:1101 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999 +#: lib/api.php:1027 lib/api.php:1137 msgid "Not a supported data format." msgstr "" @@ -1815,11 +1863,15 @@ msgstr "線上å³æ™‚通è¨å®š" msgid "Manage various other options." msgstr "" -#: actions/othersettings.php:117 +#: actions/othersettings.php:108 +msgid " (free service)" +msgstr "" + +#: actions/othersettings.php:116 msgid "Shorten URLs with" msgstr "" -#: actions/othersettings.php:118 +#: actions/othersettings.php:117 msgid "Automatic shortening service to use." msgstr "" @@ -1854,65 +1906,61 @@ msgstr "" msgid "Change password" msgstr "更改密碼" -#: actions/passwordsettings.php:70 -msgid "You are not allowed to change your password" -msgstr "" - -#: actions/passwordsettings.php:82 +#: actions/passwordsettings.php:69 #, fuzzy msgid "Change your password." msgstr "更改密碼" -#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:96 actions/recoverpassword.php:231 msgid "Password change" msgstr "" -#: actions/passwordsettings.php:117 +#: actions/passwordsettings.php:104 msgid "Old password" msgstr "" -#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:108 actions/recoverpassword.php:235 msgid "New password" msgstr "新密碼" -#: actions/passwordsettings.php:122 +#: actions/passwordsettings.php:109 msgid "6 or more characters" msgstr "6個以上å—å…ƒ" -#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:112 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "確èª" -#: actions/passwordsettings.php:126 +#: actions/passwordsettings.php:113 msgid "same as password above" msgstr "" -#: actions/passwordsettings.php:130 +#: actions/passwordsettings.php:117 msgid "Change" msgstr "更改" -#: actions/passwordsettings.php:167 actions/register.php:230 +#: actions/passwordsettings.php:154 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "" -#: actions/passwordsettings.php:170 actions/register.php:233 +#: actions/passwordsettings.php:157 actions/register.php:233 msgid "Passwords don't match." msgstr "" -#: actions/passwordsettings.php:178 +#: actions/passwordsettings.php:165 msgid "Incorrect old password" msgstr "舊密碼錯誤" -#: actions/passwordsettings.php:194 +#: actions/passwordsettings.php:181 msgid "Error saving user; invalid." msgstr "儲å˜ä½¿ç”¨è€…發生錯誤;使用者å稱無效" -#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "無法å˜å–新密碼" -#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:192 actions/recoverpassword.php:211 msgid "Password saved." msgstr "" @@ -2341,7 +2389,7 @@ msgid "Same as password above. Required." msgstr "" #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:122 +#: lib/accountsettingsaction.php:120 msgid "Email" msgstr "é›»åä¿¡ç®±" @@ -3226,37 +3274,37 @@ msgstr "" msgid "DB error inserting reply: %s" msgstr "å¢žåŠ å›žè¦†æ™‚,資料庫發生錯誤: %s" -#: classes/User.php:333 +#: classes/User.php:347 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" -#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 msgid "Profile" msgstr "" -#: lib/accountsettingsaction.php:110 +#: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "" -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:112 #, fuzzy msgid "Upload an avatar" msgstr "無法上傳個人圖åƒ" -#: lib/accountsettingsaction.php:119 +#: lib/accountsettingsaction.php:116 msgid "Change your password" msgstr "" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:120 msgid "Change email handling" msgstr "" -#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 +#: lib/accountsettingsaction.php:124 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:126 +#: lib/accountsettingsaction.php:124 #, fuzzy msgid "Design your profile" msgstr "ç„¡æ¤é€šçŸ¥" @@ -3265,7 +3313,7 @@ msgstr "ç„¡æ¤é€šçŸ¥" msgid "Other" msgstr "" -#: lib/accountsettingsaction.php:129 +#: lib/accountsettingsaction.php:128 msgid "Other options" msgstr "" @@ -3436,20 +3484,20 @@ msgstr "" msgid "license." msgstr "" -#: lib/action.php:1053 +#: lib/action.php:1052 msgid "Pagination" msgstr "" -#: lib/action.php:1062 +#: lib/action.php:1061 msgid "After" msgstr "" -#: lib/action.php:1070 +#: lib/action.php:1069 #, fuzzy msgid "Before" msgstr "之å‰çš„內容»" -#: lib/action.php:1119 +#: lib/action.php:1117 msgid "There was a problem with your session token." msgstr "" @@ -3619,13 +3667,46 @@ msgstr "無法從 %s 建立OpenID" msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:613 +#: lib/command.php:618 +#, fuzzy +msgid "You are not subscribed to anyone." +msgstr "æ¤å¸³è™Ÿå·²è¨»å†Š" + +#: lib/command.php:620 +#, fuzzy +msgid "You are subscribed to these people: " +msgstr "æ¤å¸³è™Ÿå·²è¨»å†Š" + +#: lib/command.php:637 +#, fuzzy +msgid "No one is subscribed to you." +msgstr "ç„¡æ¤è¨‚é–±" + +#: lib/command.php:639 +#, fuzzy +msgid "These people are subscribed to you: " +msgstr "æ¤å¸³è™Ÿå·²è¨»å†Š" + +#: lib/command.php:656 +#, fuzzy +msgid "You are not a member of any groups." +msgstr "無法連çµåˆ°ä¼ºæœå™¨:%s" + +#: lib/command.php:658 +#, fuzzy +msgid "You are a member of these groups: " +msgstr "無法連çµåˆ°ä¼ºæœå™¨:%s" + +#: lib/command.php:670 msgid "" "Commands:\n" "on - turn on notifications\n" "off - turn off notifications\n" "help - show this help\n" "follow <nickname> - subscribe to user\n" +"groups - lists the groups you have joined\n" +"subscriptions - list the people you follow\n" +"subscribers - list the people that follow you\n" "leave <nickname> - unsubscribe from user\n" "d <nickname> <text> - direct message to user\n" "get <nickname> - get last notice from user\n" @@ -3655,20 +3736,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:191 +#: lib/common.php:192 #, fuzzy msgid "No configuration file found. " msgstr "無確èªç¢¼" -#: lib/common.php:192 +#: lib/common.php:193 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:193 +#: lib/common.php:194 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:194 +#: lib/common.php:195 msgid "Go to the installer." msgstr "" @@ -3937,9 +4018,9 @@ msgid "Unknown file type" msgstr "" #: lib/jabber.php:192 -#, fuzzy, php-format -msgid "notice id: %s" -msgstr "新訊æ¯" +#, php-format +msgid "[%s]" +msgstr "" #: lib/joinform.php:114 #, fuzzy @@ -4456,8 +4537,9 @@ msgid "Could not subscribe other to you." msgstr "" #: lib/subs.php:124 -msgid "Not subscribed!." -msgstr "" +#, fuzzy +msgid "Not subscribed!" +msgstr "æ¤å¸³è™Ÿå·²è¨»å†Š" #: lib/subs.php:136 msgid "Couldn't delete subscription." @@ -4505,47 +4587,47 @@ msgstr "" msgid "Message" msgstr "" -#: lib/util.php:818 +#: lib/util.php:821 msgid "a few seconds ago" msgstr "" -#: lib/util.php:820 +#: lib/util.php:823 msgid "about a minute ago" msgstr "" -#: lib/util.php:822 +#: lib/util.php:825 #, php-format msgid "about %d minutes ago" msgstr "" -#: lib/util.php:824 +#: lib/util.php:827 msgid "about an hour ago" msgstr "" -#: lib/util.php:826 +#: lib/util.php:829 #, php-format msgid "about %d hours ago" msgstr "" -#: lib/util.php:828 +#: lib/util.php:831 msgid "about a day ago" msgstr "" -#: lib/util.php:830 +#: lib/util.php:833 #, php-format msgid "about %d days ago" msgstr "" -#: lib/util.php:832 +#: lib/util.php:835 msgid "about a month ago" msgstr "" -#: lib/util.php:834 +#: lib/util.php:837 #, php-format msgid "about %d months ago" msgstr "" -#: lib/util.php:836 +#: lib/util.php:839 msgid "about a year ago" msgstr "" diff --git a/plugins/Auth/AuthPlugin.php b/plugins/Auth/AuthPlugin.php deleted file mode 100644 index cb52730f6..000000000 --- a/plugins/Auth/AuthPlugin.php +++ /dev/null @@ -1,172 +0,0 @@ -<?php -/** - * StatusNet, the distributed open-source microblogging tool - * - * Superclass for plugins that do authentication and/or authorization - * - * PHP version 5 - * - * LICENCE: This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - * @category Plugin - * @package StatusNet - * @author Craig Andrews <candrews@integralblue.com> - * @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); -} - -/** - * Superclass for plugins that do authentication - * - * @category Plugin - * @package StatusNet - * @author Craig Andrews <candrews@integralblue.com> - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 - * @link http://status.net/ - */ - -abstract class AuthPlugin extends Plugin -{ - //is this plugin authoritative for authentication? - public $authn_authoritative = false; - - //should accounts be automatically created after a successful login attempt? - public $autoregistration = false; - - //can the user change their email address - public $email_changeable=true; - - //can the user change their email address - public $password_changeable=true; - - //------------Auth plugin should implement some (or all) of these methods------------\\ - /** - * Check if a nickname/password combination is valid - * @param nickname - * @param password - * @return boolean true if the credentials are valid, false if they are invalid. - */ - function checkPassword($nickname, $password) - { - return false; - } - - /** - * Automatically register a user when they attempt to login with valid credentials. - * User::register($data) is a very useful method for this implementation - * @param nickname - * @return boolean true if the user was created, false if autoregistration is not allowed, null if this plugin is not responsible for this nickname - */ - function autoRegister($nickname) - { - return null; - } - - /** - * Change a user's password - * The old password has been verified to be valid by this plugin before this call is made - * @param nickname - * @param oldpassword - * @param newpassword - * @return boolean true if the password was changed, false if password changing failed for some reason, null if this plugin is not responsible for this nickname - */ - function changePassword($nickname,$oldpassword,$newpassword) - { - return null; - } - - /** - * Can a user change this field in his own profile? - * @param nickname - * @param field - * @return boolean true if the field can be changed, false if not allowed to change it, null if this plugin is not responsible for this nickname - */ - function canUserChangeField($nickname, $field) - { - return null; - } - - //------------Below are the methods that connect StatusNet to the implementing Auth plugin------------\\ - function __construct() - { - parent::__construct(); - } - - function StartCheckPassword($nickname, $password, &$authenticatedUser){ - if($this->password_changeable){ - $authenticated = $this->checkPassword($nickname, $password); - if($authenticated){ - $authenticatedUser = User::staticGet('nickname', $nickname); - if(!$authenticatedUser && $this->autoregistration){ - if($this->autoregister($nickname)){ - $authenticatedUser = User::staticGet('nickname', $nickname); - } - } - return false; - }else{ - if($this->authn_authoritative){ - return false; - } - } - //we're not authoritative, so let other handlers try - }else{ - if($this->authn_authoritative){ - //since we're authoritative, no other plugin could do this - throw new Exception(_('Password changing is not allowed')); - } - } - } - - function onStartChangePassword($nickname,$oldpassword,$newpassword) - { - if($this->password_changeable){ - $authenticated = $this->checkPassword($nickname, $oldpassword); - if($authenticated){ - $result = $this->changePassword($nickname,$oldpassword,$newpassword); - if($result){ - //stop handling of other handlers, because what was requested was done - return false; - }else{ - throw new Exception(_('Password changing failed')); - } - }else{ - if($this->authn_authoritative){ - //since we're authoritative, no other plugin could do this - throw new Exception(_('Password changing failed')); - }else{ - //let another handler try - return null; - } - } - }else{ - if($this->authn_authoritative){ - //since we're authoritative, no other plugin could do this - throw new Exception(_('Password changing is not allowed')); - } - } - } - - function onStartAccountSettingsPasswordMenuItem($widget) - { - if($this->authn_authoritative && !$this->password_changeable){ - //since we're authoritative, no other plugin could change passwords, so do render the menu item - return false; - } - } -} - diff --git a/plugins/Authentication/AuthenticationPlugin.php b/plugins/Authentication/AuthenticationPlugin.php new file mode 100644 index 000000000..1b9084187 --- /dev/null +++ b/plugins/Authentication/AuthenticationPlugin.php @@ -0,0 +1,217 @@ +<?php +/** + * StatusNet, the distributed open-source microblogging tool + * + * Superclass for plugins that do authentication and/or authorization + * + * PHP version 5 + * + * LICENCE: This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + * @category Plugin + * @package StatusNet + * @author Craig Andrews <candrews@integralblue.com> + * @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); +} + +/** + * Superclass for plugins that do authentication + * + * @category Plugin + * @package StatusNet + * @author Craig Andrews <candrews@integralblue.com> + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +abstract class AuthenticationPlugin extends Plugin +{ + //is this plugin authoritative for authentication? + public $authoritative = false; + + //should accounts be automatically created after a successful login attempt? + public $autoregistration = false; + + //can the user change their email address + public $password_changeable=true; + + //unique name for this authentication provider + public $provider_name; + + //------------Auth plugin should implement some (or all) of these methods------------\\ + /** + * Check if a nickname/password combination is valid + * @param username + * @param password + * @return boolean true if the credentials are valid, false if they are invalid. + */ + function checkPassword($username, $password) + { + return false; + } + + /** + * Automatically register a user when they attempt to login with valid credentials. + * User::register($data) is a very useful method for this implementation + * @param username + * @return mixed instance of User, or false (if user couldn't be created) + */ + function autoRegister($username) + { + $registration_data = array(); + $registration_data['nickname'] = $username ; + return User::register($registration_data); + } + + /** + * Change a user's password + * The old password has been verified to be valid by this plugin before this call is made + * @param username + * @param oldpassword + * @param newpassword + * @return boolean true if the password was changed, false if password changing failed for some reason + */ + function changePassword($username,$oldpassword,$newpassword) + { + return false; + } + + //------------Below are the methods that connect StatusNet to the implementing Auth plugin------------\\ + function onInitializePlugin(){ + if(!isset($this->provider_name)){ + throw new Exception("must specify a provider_name for this authentication provider"); + } + } + + function onStartCheckPassword($nickname, $password, &$authenticatedUser){ + //map the nickname to a username + $user_username = new User_username(); + $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); + if($authenticated){ + $authenticatedUser = User::staticGet('id', $user_username->user_id); + return false; + } + }else{ + $user = User::staticGet('nickname', $nickname); + if($user){ + //make sure a different provider isn't handling this nickname + $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 + $authenticated = $this->checkPassword($nickname, $password); + if($authenticated){ + $authenticatedUser = User::staticGet('nickname', $nickname); + User_username::register($authenticatedUser,$nickname,$this->provider_name); + return false; + } + } + }else{ + if($this->autoregistration){ + $authenticated = $this->checkPassword($nickname, $password); + if($authenticated){ + $user = $this->autoregister($nickname); + if($user){ + $authenticatedUser = $user; + User_username::register($authenticatedUser,$nickname,$this->provider_name); + return false; + } + } + } + } + } + if($this->authoritative){ + return false; + }else{ + //we're not authoritative, so let other handlers try + return; + } + } + + function onStartChangePassword($user,$oldpassword,$newpassword) + { + if($this->password_changeable){ + $user_username = new User_username(); + $user_username->user_id=$user->id; + $user_username->provider_name=$this->provider_name; + if($user_username->find() && $user_username->fetch()){ + $authenticated = $this->checkPassword($user_username->username, $oldpassword); + if($authenticated){ + $result = $this->changePassword($user_username->username,$oldpassword,$newpassword); + if($result){ + //stop handling of other handlers, because what was requested was done + return false; + }else{ + throw new Exception(_('Password changing failed')); + } + }else{ + if($this->authoritative){ + //since we're authoritative, no other plugin could do this + throw new Exception(_('Password changing failed')); + }else{ + //let another handler try + return null; + } + } + } + }else{ + if($this->authoritative){ + //since we're authoritative, no other plugin could do this + throw new Exception(_('Password changing is not allowed')); + } + } + } + + function onStartAccountSettingsPasswordMenuItem($widget) + { + if($this->authoritative && !$this->password_changeable){ + //since we're authoritative, no other plugin could change passwords, so do not render the menu item + return false; + } + } + + function onAutoload($cls) + { + switch ($cls) + { + case 'User_username': + require_once(INSTALLDIR.'/plugins/Authentication/User_username.php'); + return false; + default: + return true; + } + } + + function onCheckSchema() { + $schema = Schema::get(); + $schema->ensureDataObject('User_username'); + return true; + } + + function onUserDeleteRelated($user, &$tables) + { + $tables[] = 'User_username'; + return true; + } +} + diff --git a/plugins/Authentication/User_username.php b/plugins/Authentication/User_username.php new file mode 100644 index 000000000..6826f2681 --- /dev/null +++ b/plugins/Authentication/User_username.php @@ -0,0 +1,64 @@ +<?php +/** + * Table Definition for user_username + */ +require_once INSTALLDIR.'/classes/Plugin_DataObject.php'; + +class User_username extends Plugin_DataObject +{ + ###START_AUTOCODE + /* the code below is auto generated do not remove the above tag */ + + public $__table = 'user_username'; // table name + public $user_id; // int(4) not_null + public $provider_name; // varchar(255) primary_key not_null + public $username; // varchar(255) primary_key not_null + public $created; // datetime() not_null + public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP + + /* Static get */ + function staticGet($k,$v=null) + { return Memcached_DataObject::staticGet('User_username',$k,$v); } + + /* the code above is auto generated do not remove the tag below */ + ###END_AUTOCODE + + /** + * Register a user with a username on a given provider + * @param User User object + * @param string username on the given provider + * @param provider_name string name of the provider + * @return mixed User_username instance if the registration succeeded, false if it did not + */ + static function register($user, $username, $provider_name) + { + $user_username = new User_username(); + $user_username->user_id = $user->id; + $user_username->provider_name = $provider_name; + $user_username->username = $username; + $user_username->created = DB_DataObject_Cast::dateTime(); + if($user_username->insert()){ + return $user_username; + }else{ + return false; + } + } + + /** + * Get the TableDef object that represents the table backing this class + * @return TableDef TableDef instance + */ + function tableDef() + { + return new TableDef($this->__table, + array(new ColumnDef('provider_name', 'varchar', + '255', false, 'PRI'), + new ColumnDef('username', 'varchar', + '255', false, 'PRI'), + new ColumnDef('user_id', 'integer', + null, false), + new ColumnDef('created', 'datetime', + null, false), + new ColumnDef('modified', 'timestamp'))); + } +} diff --git a/plugins/BitlyUrl/BitlyUrlPlugin.php b/plugins/BitlyUrl/BitlyUrlPlugin.php index 478ef99d2..65d0f70e6 100644 --- a/plugins/BitlyUrl/BitlyUrlPlugin.php +++ b/plugins/BitlyUrl/BitlyUrlPlugin.php @@ -31,31 +31,24 @@ if (!defined('STATUSNET')) { exit(1); } -class BitlyUrlPlugin extends Plugin +require_once INSTALLDIR.'/plugins/UrlShortener/UrlShortenerPlugin.php'; + +class BitlyUrlPlugin extends UrlShortenerPlugin { - function __construct() - { - parent::__construct(); - } + public $serviceUrl; function onInitializePlugin(){ - $this->registerUrlShortener( - 'bit.ly', - array(), - array('BitlyUrl',array('http://bit.ly/api?method=shorten&long_url=')) - ); + parent::onInitializePlugin(); + if(!isset($this->serviceUrl)){ + throw new Exception("must specify a serviceUrl"); + } } -} -class BitlyUrl extends ShortUrlApi -{ - protected function shorten_imp($url) { + protected function shorten($url) { $response = $this->http_get($url); - if(!$response){ - return $url; - }else{ - return current(json_decode($response)->results)->hashUrl; - } + if(!$response) return; + return current(json_decode($response)->results)->hashUrl; } } + diff --git a/plugins/EmailAuthentication/EmailAuthenticationPlugin.php b/plugins/EmailAuthentication/EmailAuthenticationPlugin.php new file mode 100644 index 000000000..25e537735 --- /dev/null +++ b/plugins/EmailAuthentication/EmailAuthenticationPlugin.php @@ -0,0 +1,54 @@ +<?php +/** + * StatusNet, the distributed open-source microblogging tool + * + * Plugin that uses the email address as a username, and checks the password as normal + * + * PHP version 5 + * + * LICENCE: This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + * @category Plugin + * @package StatusNet + * @author Craig Andrews <candrews@integralblue.com> + * @copyright 2009 Craig Andrews http://candrews.integralblue.com + * @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); +} + +class EmailAuthenticationPlugin extends Plugin +{ + //---interface implementation---// + + function onStartCheckPassword($nickname, $password, &$authenticatedUser) + { + if(strpos($nickname, '@')) + { + $user = User::staticGet('email',$nickname); + if($user && isset($user->email)) + { + if(common_check_user($user->nickname,$password)) + { + $authenticatedUser = $user; + return false; + } + } + } + } +} + diff --git a/plugins/EmailAuthentication/README b/plugins/EmailAuthentication/README new file mode 100644 index 000000000..320815689 --- /dev/null +++ b/plugins/EmailAuthentication/README @@ -0,0 +1,7 @@ +The Email Authentication plugin allows users to login using their email address. + +The provided email address is used to lookup the user's nickname, then that nickname and the provided password is checked. + +Installation +============ +add "addPlugin('emailAuthentication');" to the bottom of your config.php diff --git a/plugins/Facebook/facebookaction.php b/plugins/Facebook/facebookaction.php index a10fdf90d..c852bbf5e 100644 --- a/plugins/Facebook/facebookaction.php +++ b/plugins/Facebook/facebookaction.php @@ -382,8 +382,7 @@ class FacebookAction extends Action { // Does a little before-after block for next/prev page if ($have_before || $have_after) { - $this->elementStart('div', array('class' => 'pagination')); - $this->elementStart('dl', null); + $this->elementStart('dl', 'pagination'); $this->element('dt', null, _('Pagination')); $this->elementStart('dd', null); $this->elementStart('ul', array('class' => 'nav')); @@ -408,7 +407,6 @@ class FacebookAction extends Action $this->elementEnd('ul'); $this->elementEnd('dd'); $this->elementEnd('dl'); - $this->elementEnd('div'); } } diff --git a/plugins/Facebook/facebookhome.php b/plugins/Facebook/facebookhome.php index 91c0cc6b8..ea141c2c2 100644 --- a/plugins/Facebook/facebookhome.php +++ b/plugins/Facebook/facebookhome.php @@ -244,8 +244,7 @@ class FacebookhomeAction extends FacebookAction // XXX: Fix so this uses common_local_url() if possible. if ($have_before || $have_after) { - $this->elementStart('div', array('class' => 'pagination')); - $this->elementStart('dl', null); + $this->elementStart('dl', 'pagination'); $this->element('dt', null, _('Pagination')); $this->elementStart('dd', null); $this->elementStart('ul', array('class' => 'nav')); @@ -270,7 +269,6 @@ class FacebookhomeAction extends FacebookAction $this->elementEnd('ul'); $this->elementEnd('dd'); $this->elementEnd('dl'); - $this->elementEnd('div'); } } diff --git a/plugins/InfiniteScroll/infinitescroll.js b/plugins/InfiniteScroll/infinitescroll.js index ae4d53d09..0dafef6d5 100644 --- a/plugins/InfiniteScroll/infinitescroll.js +++ b/plugins/InfiniteScroll/infinitescroll.js @@ -2,14 +2,20 @@ jQuery(document).ready(function($){ $('notices_primary').infinitescroll({ debug: true, infiniteScroll : false, - nextSelector : "li.nav_next a", + nextSelector : 'body#public li.nav_next a,'+ + 'body#all li.nav_next a,'+ + 'body#showstream li.nav_next a,'+ + 'body#replies li.nav_next a,'+ + 'body#showfavorites li.nav_next a,'+ + 'body#showgroup li.nav_next a,'+ + 'body#favorited li.nav_next a', loadingImg : $('address .url')[0].href+'plugins/InfiniteScroll/ajax-loader.gif', text : "<em>Loading the next set of posts...</em>", donetext : "<em>Congratulations, you\'ve reached the end of the Internet.</em>", - navSelector : "div.pagination", + navSelector : ".pagination", contentSelector : "#notices_primary ol.notices", itemSelector : "#notices_primary ol.notices li" },function(){ - NoticeAttachments(); + SN.Init.Notices(); }); }); diff --git a/plugins/Ldap/LdapPlugin.php b/plugins/LdapAuthentication/LdapAuthenticationPlugin.php index 88ca92b37..865154730 100644 --- a/plugins/Ldap/LdapPlugin.php +++ b/plugins/LdapAuthentication/LdapAuthenticationPlugin.php @@ -31,10 +31,10 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } -require_once INSTALLDIR.'/plugins/Auth/AuthPlugin.php'; +require_once INSTALLDIR.'/plugins/Authentication/AuthenticationPlugin.php'; require_once 'Net/LDAP2.php'; -class LdapPlugin extends AuthPlugin +class LdapAuthenticationPlugin extends AuthenticationPlugin { public $host=null; public $port=null; @@ -48,20 +48,31 @@ class LdapPlugin extends AuthPlugin public $scope=null; public $attributes=array(); - function __construct() - { - parent::__construct(); + function onInitializePlugin(){ + parent::onInitializePlugin(); + if(!isset($this->host)){ + throw new Exception("must specify a host"); + } + if(!isset($this->basedn)){ + throw new Exception("must specify a basedn"); + } + if(!isset($this->attributes['nickname'])){ + throw new Exception("must specify a nickname attribute"); + } + if(!isset($this->attributes['username'])){ + throw new Exception("must specify a username attribute"); + } } //---interface implementation---// - function checkPassword($nickname, $password) + function checkPassword($username, $password) { $ldap = $this->ldap_get_connection(); if(!$ldap){ return false; } - $entry = $this->ldap_get_user($nickname); + $entry = $this->ldap_get_user($username); if(!$entry){ return false; }else{ @@ -76,59 +87,33 @@ class LdapPlugin extends AuthPlugin } } - function autoRegister($nickname) + function autoRegister($username) { - $attributes=array(); - $config_attributes = array('nickname','email','fullname','homepage','location'); - foreach($config_attributes as $config_attribute){ - $value = common_config('ldap', $config_attribute.'_attribute'); - if($value!==false){ - array_push($attributes,$value); - } - } - $entry = $this->ldap_get_user($nickname,$attributes); + $entry = $this->ldap_get_user($username,$this->attributes); if($entry){ $registration_data = array(); - foreach($config_attributes as $config_attribute){ - $value = common_config('ldap', $config_attribute.'_attribute'); - if($value!==false){ - if($config_attribute=='email'){ - $registration_data[$config_attribute]=common_canonical_email($entry->getValue($value,'single')); - }else if($config_attribute=='nickname'){ - $registration_data[$config_attribute]=common_canonical_nickname($entry->getValue($value,'single')); - }else{ - $registration_data[$config_attribute]=$entry->getValue($value,'single'); - } - } + foreach($this->attributes as $sn_attribute=>$ldap_attribute){ + $registration_data[$sn_attribute]=$entry->getValue($ldap_attribute,'single'); + } + if(isset($registration_data['email']) && !empty($registration_data['email'])){ + $registration_data['email_confirmed']=true; } //set the database saved password to a random string. $registration_data['password']=common_good_rand(16); - $user = User::register($registration_data); - return true; + return User::register($registration_data); }else{ //user isn't in ldap, so we cannot register him - return null; + return false; } } - function changePassword($nickname,$oldpassword,$newpassword) + function changePassword($username,$oldpassword,$newpassword) { //TODO implement this throw new Exception(_('Sorry, changing LDAP passwords is not supported at this time')); return false; } - - function canUserChangeField($nickname, $field) - { - switch($field) - { - case 'password': - case 'nickname': - case 'email': - return false; - } - } //---utility functions---// function ldap_get_config(){ @@ -170,7 +155,7 @@ class LdapPlugin extends AuthPlugin */ function ldap_get_user($username,$attributes=array()){ $ldap = $this->ldap_get_connection(); - $filter = Net_LDAP2_Filter::create(common_config('ldap','nickname_attribute'), 'equals', $username); + $filter = Net_LDAP2_Filter::create($this->attributes['username'], 'equals', $username); $options = array( 'scope' => 'sub', 'attributes' => $attributes diff --git a/plugins/Ldap/README b/plugins/LdapAuthentication/README index 063286cef..b10a1eb93 100644 --- a/plugins/Ldap/README +++ b/plugins/LdapAuthentication/README @@ -1,12 +1,13 @@ -The LDAP plugin allows for StatusNet to handle authentication, authorization, and user information through LDAP. +The LDAP Authentication plugin allows for StatusNet to handle authentication through LDAP. Installation ============ -add "addPlugin('ldap', array('setting'=>'value', 'setting2'=>'value2', ...);" to the bottom of your config.php +add "addPlugin('ldapAuthentication', array('setting'=>'value', 'setting2'=>'value2', ...);" to the bottom of your config.php Settings ======== -authn_authoritative (false): Set to true if LDAP's responses are authoritative (meaning if LDAP fails, do check the any other plugins or the internal password database). +provider_name*: a unique name for this authentication provider. +authoritative (false): Set to true if LDAP's responses are authoritative (meaning if LDAP fails, do check any other plugins or the internal password database). autoregistration (false): Set to true if users should be automatically created when they attempt to login. email_changeable (true): Are users allowed to change their email address? (true or false) password_changeable (true): Are users allowed to change their passwords? (true or false) @@ -23,6 +24,7 @@ filter: Default search filter. See http://pear.php.net/manual/en/package.network scope: Default search scope. See http://pear.php.net/manual/en/package.networking.net-ldap2.connecting.php attributes: an array with the key being the StatusNet user attribute name, and the value the LDAP attribute name + username* nickname* email fullname @@ -36,8 +38,9 @@ Example ======= Here's an example of an LDAP plugin configuration that connects to Microsoft Active Directory. -addPlugin('ldap', array( - 'authn_authoritative'=>true, +addPlugin('ldapAuthentication', array( + 'provider_name'=>'Example', + 'authoritative'=>true, 'autoregistration'=>true, 'binddn'=>'username', 'bindpw'=>'password', diff --git a/plugins/LilUrl/LilUrlPlugin.php b/plugins/LilUrl/LilUrlPlugin.php index 852253b02..e906751e8 100644 --- a/plugins/LilUrl/LilUrlPlugin.php +++ b/plugins/LilUrl/LilUrlPlugin.php @@ -31,37 +31,31 @@ if (!defined('STATUSNET')) { exit(1); } -require_once(INSTALLDIR.'/lib/Shorturl_api.php'); +require_once INSTALLDIR.'/plugins/UrlShortener/UrlShortenerPlugin.php'; -class LilUrlPlugin extends Plugin +class LilUrlPlugin extends UrlShortenerPlugin { - function __construct() - { - parent::__construct(); - } + public $serviceUrl; function onInitializePlugin(){ - $this->registerUrlShortener( - 'ur1.ca', - array('freeService'=>true), - array('LilUrl',array('http://ur1.ca/')) - ); + parent::onInitializePlugin(); + if(!isset($this->serviceUrl)){ + throw new Exception("must specify a serviceUrl"); + } } -} -class LilUrl extends ShortUrlApi -{ - protected function shorten_imp($url) { - $data['longurl'] = $url; - $response = $this->http_post($data); - if (!$response) return $url; - $y = @simplexml_load_string($response); - if (!isset($y->body)) return $url; + protected function shorten($url) { + $data = array('longurl' => $url); + + $responseBody = $this->http_post($this->serviceUrl,$data); + + if (!$responseBody) return; + $y = @simplexml_load_string($responseBody); + if (!isset($y->body)) return; $x = $y->body->p[0]->a->attributes(); if (isset($x['href'])) { - common_log(LOG_INFO, __CLASS__ . ": shortened $url to $x[href]"); return $x['href']; } - return $url; } } + diff --git a/plugins/OpenID/OpenIDPlugin.php b/plugins/OpenID/OpenIDPlugin.php index e4aed2ddb..6dd8a3f5a 100644 --- a/plugins/OpenID/OpenIDPlugin.php +++ b/plugins/OpenID/OpenIDPlugin.php @@ -156,6 +156,9 @@ class OpenIDPlugin extends Plugin case 'User_openid': require_once(INSTALLDIR.'/plugins/OpenID/User_openid.php'); return false; + case 'User_openid_trustroot': + require_once(INSTALLDIR.'/plugins/OpenID/User_openid_trustroot.php'); + return false; default: return true; } @@ -278,30 +281,15 @@ class OpenIDPlugin extends Plugin function onCheckSchema() { $schema = Schema::get(); - $schema->ensureTable('user_openid', - array(new ColumnDef('canonical', 'varchar', - '255', false, 'PRI'), - new ColumnDef('display', 'varchar', - '255', false), - new ColumnDef('user_id', 'integer', - null, false, 'MUL'), - new ColumnDef('created', 'datetime', - null, false), - new ColumnDef('modified', 'timestamp'))); - $schema->ensureTable('user_openid_trustroot', - array(new ColumnDef('trustroot', 'varchar', - '255', false, 'PRI'), - new ColumnDef('user_id', 'integer', - null, false, 'PRI'), - new ColumnDef('created', 'datetime', - null, false), - new ColumnDef('modified', 'timestamp'))); + $schema->ensureDataObject('User_openid'); + $schema->ensureDataObject('User_openid_trustroot'); return true; } function onUserDeleteRelated($user, &$tables) { $tables[] = 'User_openid'; + $tables[] = 'User_openid_trustroot'; return true; } } diff --git a/plugins/OpenID/User_openid.php b/plugins/OpenID/User_openid.php index 338e0f6e9..c3624118e 100644 --- a/plugins/OpenID/User_openid.php +++ b/plugins/OpenID/User_openid.php @@ -2,9 +2,9 @@ /** * Table Definition for user_openid */ -require_once INSTALLDIR.'/classes/Memcached_DataObject.php'; +require_once INSTALLDIR.'/classes/Plugin_DataObject.php'; -class User_openid extends Memcached_DataObject +class User_openid extends Plugin_DataObject { ###START_AUTOCODE /* the code below is auto generated do not remove the above tag */ @@ -33,4 +33,22 @@ class User_openid extends Memcached_DataObject return ($cnt > 0); } + + /** + * Get the TableDef object that represents the table backing this class + * @return TableDef TableDef instance + */ + function tableDef() + { + return new TableDef($this->__table, + array(new ColumnDef('canonical', 'varchar', + '255', false, 'PRI'), + new ColumnDef('display', 'varchar', + '255', false), + new ColumnDef('user_id', 'integer', + null, false, 'MUL'), + new ColumnDef('created', 'datetime', + null, false), + new ColumnDef('modified', 'timestamp'))); + } } diff --git a/plugins/OpenID/User_openid_trustroot.php b/plugins/OpenID/User_openid_trustroot.php index 4654b72df..b208dddfd 100644 --- a/plugins/OpenID/User_openid_trustroot.php +++ b/plugins/OpenID/User_openid_trustroot.php @@ -2,9 +2,9 @@ /** * Table Definition for user_openid_trustroot */ -require_once INSTALLDIR.'/classes/Memcached_DataObject.php'; +require_once INSTALLDIR.'/classes/Plugin_DataObject.php'; -class User_openid_trustroot extends Memcached_DataObject +class User_openid_trustroot extends Plugin_DataObject { ###START_AUTOCODE /* the code below is auto generated do not remove the above tag */ @@ -26,4 +26,20 @@ class User_openid_trustroot extends Memcached_DataObject { return Memcached_DataObject::pkeyGet('User_openid_trustroot', $kv); } + + /** + * Get the TableDef object that represents the table backing this class + * @return TableDef TableDef instance + */ + function tableDef() + { + return new TableDef($this->__table, + array(new ColumnDef('trustroot', 'varchar', + '255', false, 'PRI'), + new ColumnDef('user_id', 'integer', + null, false, 'PRI'), + new ColumnDef('created', 'datetime', + null, false), + new ColumnDef('modified', 'timestamp'))); + } } diff --git a/plugins/OpenID/openid.php b/plugins/OpenID/openid.php index ff7a93899..dd628e773 100644 --- a/plugins/OpenID/openid.php +++ b/plugins/OpenID/openid.php @@ -280,6 +280,11 @@ class AutosubmitAction extends Action function showContent() { $this->raw($this->form_html); + } + + function showScripts() + { + parent::showScripts(); $this->element('script', null, '$(document).ready(function() { ' . ' $(\'#'. $this->form_id .'\').submit(); '. diff --git a/plugins/PtitUrl/PtitUrlPlugin.php b/plugins/PtitUrl/PtitUrlPlugin.php index f00d3e2f2..ef453e96d 100644 --- a/plugins/PtitUrl/PtitUrlPlugin.php +++ b/plugins/PtitUrl/PtitUrlPlugin.php @@ -30,33 +30,28 @@ if (!defined('STATUSNET')) { exit(1); } +require_once INSTALLDIR.'/plugins/UrlShortener/UrlShortenerPlugin.php'; -class PtitUrlPlugin extends Plugin +class PtitUrlPlugin extends UrlShortenerPlugin { - function __construct() - { - parent::__construct(); - } + public $serviceUrl; function onInitializePlugin(){ - $this->registerUrlShortener( - 'ptiturl.com', - array(), - array('PtitUrl',array('http://ptiturl.com/?creer=oui&action=Reduire&url=')) - ); + parent::onInitializePlugin(); + if(!isset($this->serviceUrl)){ + throw new Exception("must specify a serviceUrl"); + } } -} -class PtitUrl extends ShortUrlApi -{ - protected function shorten_imp($url) { - $response = $this->http_get($url); - if (!$response) return $url; + protected function shorten($url) + { + $response = $this->http_get(sprintf($this->serviceUrl,urlencode($url))); + if (!$response) return; $response = $this->tidy($response); $y = @simplexml_load_string($response); - if (!isset($y->body)) return $url; + if (!isset($y->body)) return; $xml = $y->body->center->table->tr->td->pre->a->attributes(); if (isset($xml['href'])) return $xml['href']; - return $url; } } + diff --git a/plugins/Realtime/realtimeupdate.js b/plugins/Realtime/realtimeupdate.js index ca6ea891a..9b9991b9e 100644 --- a/plugins/Realtime/realtimeupdate.js +++ b/plugins/Realtime/realtimeupdate.js @@ -45,15 +45,9 @@ RealtimeUpdate = { DT = document.title; $(window).blur(function() { - $('#notices_primary .notice').css({ - 'border-top-color':$('#notices_primary .notice:last').css('border-top-color'), - 'border-top-style':'dotted' - }); + $('#notices_primary .notice').removeClass('mark-top'); - $('#notices_primary .notice:first').css({ - 'border-top-color':'#AAAAAA', - 'border-top-style':'solid' - }); + $('#notices_primary .notice:first').addClass('mark-top'); RealtimeUpdate._updatecounter = 0; document.title = DT; @@ -163,12 +157,14 @@ RealtimeUpdate = { addPopup: function(url, timeline, iconurl) { - $('#notices_primary').css({'position':'relative'}); - $('#notices_primary').prepend('<button id="realtime_timeline" title="Pop up in a window">Pop up</button>'); + var NP = $('#notices_primary'); + NP.css({'position':'relative'}); + NP.prepend('<button id="realtime_timeline" title="Pop up in a window">Pop up</button>'); - $('#realtime_timeline').css({ + var RT = $('#realtime_timeline'); + RT.css({ 'margin':'0 0 11px 0', - 'background':'transparent url('+ iconurl + ') no-repeat 0% 30%', + 'background':'transparent url('+ iconurl + ') no-repeat 0 30%', 'padding':'0 0 0 20px', 'display':'block', 'position':'absolute', @@ -176,15 +172,16 @@ RealtimeUpdate = { 'right':'0', 'border':'none', 'cursor':'pointer', - 'color':$("a").css("color"), + 'color':$('a').css('color'), 'font-weight':'bold', 'font-size':'1em' }); + $('#showstream #notices_primary').css({'margin-top':'18px'}); - $('#realtime_timeline').click(function() { + RT.click(function() { window.open(url, timeline, - 'toolbar=no,resizable=yes,scrollbars=yes,status=yes'); + 'toolbar=no,resizable=yes,scrollbars=yes,status=yes,width=500,height=550'); return false; }); @@ -192,7 +189,6 @@ RealtimeUpdate = { initPopupWindow: function() { - window.resizeTo(500, 550); $('address').hide(); $('#content').css({'width':'93.5%'}); diff --git a/plugins/recaptcha/LICENSE b/plugins/Recaptcha/LICENSE index b612f71f0..b612f71f0 100644 --- a/plugins/recaptcha/LICENSE +++ b/plugins/Recaptcha/LICENSE diff --git a/plugins/Recaptcha/README b/plugins/Recaptcha/README new file mode 100644 index 000000000..49c4b9c27 --- /dev/null +++ b/plugins/Recaptcha/README @@ -0,0 +1,28 @@ +StatusNet reCAPTCHA plugin 0.3 11/16/09 +======================================= +Adds a captcha to your registration page to reduce automated spam bots registering. + +Use: +1. Get an API key from http://recaptcha.net + +2. In config.php add: +addPlugin('recaptcha', array('private_key' => 'YourKeyHere', + 'public_key' => 'ReplaceWithYourKey')); +or +addPlugin('recaptcha', array('private_key' => 'YourKeyHere', + 'public_key' => 'ReplaceWithYourKey', + 'display_errors' => true)); +Changelog +========= +0.1 initial release +0.2 Work around for webkit browsers +0.3 Moved to new plugin arch for SN + **YOU WILL NEED TO CHANGE YOUR CONFIG.PHP!** + +reCAPTCHA Lib README +==================== + +The reCAPTCHA PHP Lirary helps you use the reCAPTCHA API. Documentation +for this library can be found at + + http://recaptcha.net/plugins/php diff --git a/plugins/recaptcha/recaptcha.php b/plugins/Recaptcha/RecaptchaPlugin.php index 94cf0ccd1..1a51b16be 100644 --- a/plugins/recaptcha/recaptcha.php +++ b/plugins/Recaptcha/RecaptchaPlugin.php @@ -33,7 +33,9 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { define('RECAPTCHA', '0.2'); -class recaptcha extends Plugin +require_once(INSTALLDIR.'/plugins/Recaptcha/recaptchalib.php'); + +class RecaptchaPlugin extends Plugin { var $private_key; var $public_key; @@ -41,13 +43,13 @@ class recaptcha extends Plugin var $failed; var $ssl; - function __construct($public_key, $private_key, $display_errors=false) - { - parent::__construct(); - require_once(INSTALLDIR.'/plugins/recaptcha/recaptchalib.php'); - $this->public_key = $public_key; - $this->private_key = $private_key; - $this->display_errors = $display_errors; + function onInitializePlugin(){ + if(!isset($this->private_key)){ + common_log(LOG_ERR, "Recaptcha: Must specify private_key in config.php"); + } + if(!isset($this->public_key)){ + common_log(LOG_ERR, "Recaptcha: Must specify public_key in config.php"); + } } function checkssl(){ diff --git a/plugins/recaptcha/recaptchalib.php b/plugins/Recaptcha/recaptchalib.php index 897c50981..897c50981 100644 --- a/plugins/recaptcha/recaptchalib.php +++ b/plugins/Recaptcha/recaptchalib.php diff --git a/plugins/ReverseUsernameAuthentication/README b/plugins/ReverseUsernameAuthentication/README new file mode 100644 index 000000000..e9160ed9b --- /dev/null +++ b/plugins/ReverseUsernameAuthentication/README @@ -0,0 +1,26 @@ +The Reverse Username Authentication plugin allows for StatusNet to handle authentication by checking if the provided password is the same as the reverse of the username. + +THIS PLUGIN IS FOR TESTING PURPOSES ONLY + +Installation +============ +add "addPlugin('reverseUsernameAuthentication', array('setting'=>'value', 'setting2'=>'value2', ...);" to the bottom of your config.php + +Settings +======== +provider_name*: a unique name for this authentication provider. +password_changeable*: must be set to false. This plugin does not support changing passwords. +authoritative (false): Set to true if this plugin's responses are authoritative (meaning if this fails, do check any other plugins or the internal password database). +autoregistration (false): Set to true if users should be automatically created when they attempt to login. + +* required +default values are in (parenthesis) + +Example +======= +addPlugin('reverseUsernameAuthentication', array( + 'provider_name'=>'Example', + 'password_changeable'=>false, + 'authoritative'=>true, + 'autoregistration'=>true +)); diff --git a/plugins/ReverseUsernameAuthentication/ReverseUsernameAuthenticationPlugin.php b/plugins/ReverseUsernameAuthentication/ReverseUsernameAuthenticationPlugin.php new file mode 100644 index 000000000..d48283b2e --- /dev/null +++ b/plugins/ReverseUsernameAuthentication/ReverseUsernameAuthenticationPlugin.php @@ -0,0 +1,58 @@ +<?php +/** + * StatusNet, the distributed open-source microblogging tool + * + * Plugin that checks if the password is the reverse of username + * + * PHP version 5 + * + * LICENCE: This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + * @category Plugin + * @package StatusNet + * @author Craig Andrews <candrews@integralblue.com> + * @copyright 2009 Craig Andrews http://candrews.integralblue.com + * @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.'/plugins/Authentication/AuthenticationPlugin.php'; + +class ReverseUsernameAuthenticationPlugin extends AuthenticationPlugin +{ + //---interface implementation---// + + function onInitializePlugin(){ + parent::onInitializePlugin(); + if(!isset($this->password_changeable) && $this->password_changeable){ + throw new Exception("password_changeable cannot be set to true. This plugin does not support changing passwords."); + } + } + + function checkPassword($username, $password) + { + return $username == strrev($password); + } + + function autoRegister($username) + { + $registration_data = array(); + $registration_data['nickname'] = $username ; + return User::register($registration_data); + } +} diff --git a/plugins/SimpleUrl/SimpleUrlPlugin.php b/plugins/SimpleUrl/SimpleUrlPlugin.php index d59d63e47..45b745b07 100644 --- a/plugins/SimpleUrl/SimpleUrlPlugin.php +++ b/plugins/SimpleUrl/SimpleUrlPlugin.php @@ -31,40 +31,21 @@ if (!defined('STATUSNET')) { exit(1); } -class SimpleUrlPlugin extends Plugin +require_once INSTALLDIR.'/plugins/UrlShortener/UrlShortenerPlugin.php'; + +class SimpleUrlPlugin extends UrlShortenerPlugin { - function __construct() - { - parent::__construct(); - } + public $serviceUrl; function onInitializePlugin(){ - $this->registerUrlShortener( - 'is.gd', - array(), - array('SimpleUrl',array('http://is.gd/api.php?longurl=')) - ); - $this->registerUrlShortener( - 'snipr.com', - array(), - array('SimpleUrl',array('http://snipr.com/site/snip?r=simple&link=')) - ); - $this->registerUrlShortener( - 'metamark.net', - array(), - array('SimpleUrl',array('http://metamark.net/api/rest/simple?long_url=')) - ); - $this->registerUrlShortener( - 'tinyurl.com', - array(), - array('SimpleUrl',array('http://tinyurl.com/api-create.php?url=')) - ); + parent::onInitializePlugin(); + if(!isset($this->serviceUrl)){ + throw new Exception("must specify a serviceUrl"); + } } -} -class SimpleUrl extends ShortUrlApi -{ - protected function shorten_imp($url) { - return $this->http_get($url); + protected function shorten($url) { + return $this->http_get(sprintf($this->serviceUrl,urlencode($url))); } } + diff --git a/plugins/TightUrl/TightUrlPlugin.php b/plugins/TightUrl/TightUrlPlugin.php index 48efb355f..56414c8c8 100644 --- a/plugins/TightUrl/TightUrlPlugin.php +++ b/plugins/TightUrl/TightUrlPlugin.php @@ -31,32 +31,27 @@ if (!defined('STATUSNET')) { exit(1); } -class TightUrlPlugin extends Plugin +require_once INSTALLDIR.'/plugins/UrlShortener/UrlShortenerPlugin.php'; + +class TightUrlPlugin extends UrlShortenerPlugin { - function __construct() - { - parent::__construct(); - } + public $serviceUrl; function onInitializePlugin(){ - $this->registerUrlShortener( - '2tu.us', - array('freeService'=>true), - array('TightUrl',array('http://2tu.us/?save=y&url=')) - ); + parent::onInitializePlugin(); + if(!isset($this->serviceUrl)){ + throw new Exception("must specify a serviceUrl"); + } } -} -class TightUrl extends ShortUrlApi -{ - protected function shorten_imp($url) { - $response = $this->http_get($url); - if (!$response) return $url; + protected function shorten($url) + { + $response = $this->http_get(sprintf($this->serviceUrl,urlencode($url))); + if (!$response) return; $response = $this->tidy($response); $y = @simplexml_load_string($response); - if (!isset($y->body)) return $url; + if (!isset($y->body)) return; $xml = $y->body->p[0]->code[0]->a->attributes(); if (isset($xml['href'])) return $xml['href']; - return $url; } } diff --git a/plugins/UrlShortener/UrlShortenerPlugin.php b/plugins/UrlShortener/UrlShortenerPlugin.php new file mode 100644 index 000000000..37206aa89 --- /dev/null +++ b/plugins/UrlShortener/UrlShortenerPlugin.php @@ -0,0 +1,103 @@ +<?php +/** + * StatusNet, the distributed open-source microblogging tool + * + * Superclass for plugins that do URL shortening + * + * PHP version 5 + * + * LICENCE: This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + * @category Plugin + * @package StatusNet + * @author Craig Andrews <candrews@integralblue.com> + * @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); +} + +/** + * Superclass for plugins that do URL shortening + * + * @category Plugin + * @package StatusNet + * @author Craig Andrews <candrews@integralblue.com> + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +abstract class UrlShortenerPlugin extends Plugin +{ + public $shortenerName; + public $freeService=false; + //------------Url Shortener plugin should implement some (or all) of these methods------------\\ + + /** + * Short a URL + * @param url + * @return string shortened version of the url, or null if URL shortening failed + */ + protected abstract function shorten($url); + + //------------These methods may help you implement your plugin------------\\ + protected function http_get($url) + { + $request = HTTPClient::start(); + $response = $request->get($url); + return $response->getBody(); + } + + protected function http_post($url,$data) + { + $request = HTTPClient::start(); + $response = $request->post($url, null, $data); + return $response->getBody(); + } + + protected function tidy($response) { + $response = str_replace(' ', ' ', $response); + $config = array('output-xhtml' => true); + $tidy = new tidy; + $tidy->parseString($response, $config, 'utf8'); + $tidy->cleanRepair(); + return (string)$tidy; + } + //------------Below are the methods that connect StatusNet to the implementing Url Shortener plugin------------\\ + + function onInitializePlugin(){ + if(!isset($this->shortenerName)){ + throw new Exception("must specify a shortenerName"); + } + } + + function onGetUrlShorteners(&$shorteners) + { + $shorteners[$this->shortenerName]=array('freeService'=>$this->freeService); + } + + function onStartShortenUrl($url,$shortenerName,&$shortenedUrl) + { + if($shortenerName == $this->shortenerName && strlen($url) >= common_config('site', 'shorturllength')){ + $result = $this->shorten($url); + if(isset($result) && $result != null && $result !== false){ + $shortenedUrl=$result; + common_log(LOG_INFO, __CLASS__ . ": $this->shortenerName shortened $url to $shortenedUrl"); + return false; + } + } + } +} diff --git a/plugins/UserFlag/UserFlagPlugin.php b/plugins/UserFlag/UserFlagPlugin.php index fe4a74869..4d8671c72 100644 --- a/plugins/UserFlag/UserFlagPlugin.php +++ b/plugins/UserFlag/UserFlagPlugin.php @@ -48,16 +48,7 @@ class UserFlagPlugin extends Plugin $schema = Schema::get(); // For storing user-submitted flags on profiles - - $schema->ensureTable('user_flag_profile', - array(new ColumnDef('profile_id', 'integer', null, - false, 'PRI'), - new ColumnDef('user_id', 'integer', null, - false, 'PRI'), - new ColumnDef('created', 'datetime', null, - false, 'MUL'), - new ColumnDef('cleared', 'datetime', null, - true, 'MUL'))); + $schema->ensureDataObject('User_flag_profile'); return true; } @@ -122,7 +113,11 @@ class UserFlagPlugin extends Plugin if (!empty($user)) { - $form = new FlagProfileForm($item->action, $item->profile); + list($action, $args) = $item->action->returnToArgs(); + + $args['action'] = $action; + + $form = new FlagProfileForm($item->action, $item->profile, $args); $form->show(); } @@ -140,4 +135,12 @@ class UserFlagPlugin extends Plugin return true; } + + function onEndShowScripts($action) + { + $action->elementStart('script', array('type' => 'text/javascript')); + $action->raw('/*<![CDATA[*/ SN.U.FormXHR($(".form_entity_flag")); /*]]>*/'); + $action->elementEnd('script'); + return true; + } } diff --git a/plugins/UserFlag/User_flag_profile.php b/plugins/UserFlag/User_flag_profile.php index 30bd4ae68..2fb27912d 100644 --- a/plugins/UserFlag/User_flag_profile.php +++ b/plugins/UserFlag/User_flag_profile.php @@ -21,9 +21,9 @@ if (!defined('STATUSNET')) { exit(1); } -require_once INSTALLDIR . '/classes/Memcached_DataObject.php'; +require_once INSTALLDIR.'/classes/Plugin_DataObject.php'; -class User_flag_profile extends Memcached_DataObject +class User_flag_profile extends Plugin_DataObject { ###START_AUTOCODE /* the code below is auto generated do not remove the above tag */ @@ -65,4 +65,21 @@ class User_flag_profile extends Memcached_DataObject return !empty($ufp); } + + /** + * Get the TableDef object that represents the table backing this class + * @return TableDef TableDef instance + */ + function tableDef() + { + return new TableDef($this->__table, + array(new ColumnDef('profile_id', 'integer', null, + false, 'PRI'), + new ColumnDef('user_id', 'integer', null, + false, 'PRI'), + new ColumnDef('created', 'datetime', null, + false, 'MUL'), + new ColumnDef('cleared', 'datetime', null, + true, 'MUL'))); + } } diff --git a/plugins/UserFlag/adminprofileflag.php b/plugins/UserFlag/adminprofileflag.php index b264beecb..1ac76b506 100644 --- a/plugins/UserFlag/adminprofileflag.php +++ b/plugins/UserFlag/adminprofileflag.php @@ -53,6 +53,8 @@ class AdminprofileflagAction extends Action function prepare($args) { + parent::prepare($args); + return true; } @@ -83,6 +85,117 @@ class AdminprofileflagAction extends Action function showContent() { + $profile = $this->getProfiles(); + + $pl = new FlaggedProfileList($profile, $this); + + $pl->show(); + } + + function getProfiles() + { + $ufp = new User_flag_profile(); + + $ufp->selectAdd(); + $ufp->selectAdd('profile_id'); + $ufp->selectAdd('count(*) as flag_count'); + + $ufp->whereAdd('cleared is NULL'); + + $ufp->groupBy('profile_id'); + $ufp->orderBy('flag_count DESC'); + + $profiles = array(); + + if ($ufp->find()) { + while ($ufp->fetch()) { + $profile = Profile::staticGet('id', $ufp->profile_id); + if (!empty($profile)) { + $profiles[] = $profile; + } + } + } + + $ufp->free(); + + return new ArrayWrapper($profiles); + } +} + +class FlaggedProfileList extends ProfileList { + + function newListItem($profile) + { + return new FlaggedProfileListItem($this->profile, $this->action); } } +class FlaggedProfileListItem extends ProfileListItem +{ + var $user = null; + var $r2args = null; + + function showActions() + { + $this->user = common_current_user(); + + list($action, $this->r2args) = $this->out->returnToArgs(); + + $this->r2args['action'] = $action; + + $this->startActions(); + if (Event::handle('StartProfileListItemActionElements', array($this))) { + $this->showSandboxButton(); + $this->showSilenceButton(); + $this->showDeleteButton(); + $this->showClearButton(); + Event::handle('EndProfileListItemActionElements', array($this)); + } + $this->endActions(); + } + + function showSandboxButton() + { + if ($this->user->hasRight(Right::SANDBOXUSER)) { + $this->out->elementStart('li', 'entity_sandbox'); + if ($this->profile->isSandboxed()) { + $usf = new UnSandboxForm($this->out, $this->profile, $this->r2args); + $usf->show(); + } else { + $sf = new SandboxForm($this->out, $this->profile, $this->r2args); + $sf->show(); + } + $this->out->elementEnd('li'); + } + } + + function showSilenceButton() + { + if ($this->user->hasRight(Right::SILENCEUSER)) { + $this->out->elementStart('li', 'entity_silence'); + if ($this->profile->isSilenced()) { + $usf = new UnSilenceForm($this->out, $this->profile, $this->r2args); + $usf->show(); + } else { + $sf = new SilenceForm($this->out, $this->profile, $this->r2args); + $sf->show(); + } + $this->out->elementEnd('li'); + } + } + + function showDeleteButton() + { + + if ($this->user->hasRight(Right::DELETEUSER)) { + $this->out->elementStart('li', 'entity_delete'); + $df = new DeleteUserForm($this->out, $this->profile, $this->r2args); + $df->show(); + $this->out->elementEnd('li'); + } + } + + function showClearButton() + { + } +} diff --git a/plugins/UserFlag/flagprofile.php b/plugins/UserFlag/flagprofile.php index c72b74c6a..8ff2f1f72 100644 --- a/plugins/UserFlag/flagprofile.php +++ b/plugins/UserFlag/flagprofile.php @@ -41,11 +41,8 @@ if (!defined('STATUSNET')) { * @link http://status.net/ */ -class FlagprofileAction extends Action +class FlagprofileAction extends ProfileFormAction { - var $profile = null; - var $flag = null; - /** * Take arguments for running * @@ -56,34 +53,14 @@ class FlagprofileAction extends Action function prepare($args) { - parent::prepare($args); - - if ($_SERVER['REQUEST_METHOD'] != 'POST') { - throw new ClientException(_('Action only accepts POST')); - } - - if (!common_logged_in()) { - $this->clientError(_('Not logged in.')); - return false; - } - - $id = $this->trimmed('flagprofileto'); - - if (!$id) { - $this->clientError(_('No profile specified.')); - return false; - } - - $this->profile = Profile::staticGet('id', $id); - - if (empty($this->profile)) { - $this->clientError(_('No profile with that ID.')); + if (!parent::prepare($args)) { return false; } $user = common_current_user(); assert(!empty($user)); // checked above + assert(!empty($this->profile)); // checked above if (User_flag_profile::exists($this->profile->id, $user->id)) @@ -96,32 +73,12 @@ class FlagprofileAction extends Action } /** - * Handle request - * - * @param array $args $_REQUEST args; handled in prepare() + * Handle POST * * @return void */ - function handle($args) - { - parent::handle($args); - - $this->flagProfile(); - $this->returnTo(); - } - - function title() { - return _('Flag profile'); - } - - /** - * save the profile flag - * - * @return void - */ - - function flagProfile() + function handlePost() { $user = common_current_user(); @@ -135,25 +92,24 @@ class FlagprofileAction extends Action $ufp->created = common_sql_now(); if (!$ufp->insert()) { - throw new ServerException(sprintf(_("Couldn't flag profile '%s' with flag '%s'."), - $this->profile->nickname, $this->flag)); + throw new ServerException(sprintf(_("Couldn't flag profile '%s' for review."), + $this->profile->nickname)); } $ufp->free(); } - function returnTo() - { - // Now, gotta figure where we go back to - foreach ($this->args as $k => $v) { - if ($k == 'returnto-action') { - $action = $v; - } elseif (substr($k, 0, 9) == 'returnto-') { - $args[substr($k, 9)] = $v; - } - } - - common_redirect(common_local_url($action, $args), 303); + function ajaxResults() { + header('Content-Type: text/xml;charset=utf-8'); + $this->xw->startDocument('1.0', 'UTF-8'); + $this->elementStart('html'); + $this->elementStart('head'); + $this->element('title', null, _('Flagged for review')); + $this->elementEnd('head'); + $this->elementStart('body'); + $this->element('p', 'flagged', _('Flagged')); + $this->elementEnd('body'); + $this->elementEnd('html'); } } diff --git a/plugins/UserFlag/flagprofileform.php b/plugins/UserFlag/flagprofileform.php index 0811dbb9d..262dad4a7 100644 --- a/plugins/UserFlag/flagprofileform.php +++ b/plugins/UserFlag/flagprofileform.php @@ -45,108 +45,38 @@ require_once INSTALLDIR.'/lib/form.php'; * @link http://status.net/ */ -class FlagProfileForm extends Form +class FlagProfileForm extends ProfileActionForm { /** - * Profile of profile to flag - */ - - var $profile = null; - - /** - * Return-to args - */ - - var $args = null; - - /** - * Constructor - * - * @param HTMLOutputter $out output channel - * @param Profile $profile profile of user to flag - * @param array $args return-to args - */ - - function __construct($out=null, $profile=null, $args=null) - { - parent::__construct($out); - - $this->profile = $profile; - $this->args = $args; - } - - /** - * ID of the form - * - * @return int ID of the form - */ - - function id() - { - return 'flagprofile-' . $this->profile->id; - } - - /** - * class of the form + * Action this form provides * - * @return string class of the form + * @return string Name of the action, lowercased. */ - function formClass() + function target() { - return 'form_profile_flag'; + return 'flagprofile'; } /** - * Action of the form + * Title of the form * - * @return string URL of the action + * @return string Title of the form, internationalized */ - function action() - { - return common_local_url('flagprofile'); - } - - /** - * Legend of the Form - * - * @return void - */ - function formLegend() + function title() { - $this->out->element('legend', null, _('Flag profile for review')); - } - - /** - * Data elements of the form - * - * @return void - */ - - function formData() - { - // TODO: let the user choose a flag - - $this->out->hidden('flagprofileto-' . $this->profile->id, - $this->profile->id, - 'flagprofileto'); - - if ($this->args) { - foreach ($this->args as $k => $v) { - $this->out->hidden('returnto-' . $k, $v); - } - } + return _('Flag'); } /** - * Action elements + * Description of the form * - * @return void + * @return string description of the form, internationalized */ - function formActions() + function description() { - $this->out->submit('submit', _('Flag'), 'submit', null, _('Flag profile for review')); + return _('Flag profile for review'); } } diff --git a/plugins/recaptcha/README b/plugins/recaptcha/README deleted file mode 100644 index b996f96cc..000000000 --- a/plugins/recaptcha/README +++ /dev/null @@ -1,23 +0,0 @@ -StatusNet reCAPTCHA plugin 0.2 8/3/09 -==================================== -Adds a captcha to your registration page to reduce automated spam bots registering. - -Use: -1. Get an API key from http://recaptcha.net - -2. In config.php add: -include_once('plugins/recaptcha/recaptcha.php'); -$captcha = new recaptcha(publickey, privatekey, showErrors); - -Changelog -========= -0.1 initial release -0.2 Work around for webkit browsers - -reCAPTCHA README -================ - -The reCAPTCHA PHP Lirary helps you use the reCAPTCHA API. Documentation -for this library can be found at - - http://recaptcha.net/plugins/php diff --git a/scripts/deleteuser.php b/scripts/deleteuser.php index 52389123c..52389123c 100644..100755 --- a/scripts/deleteuser.php +++ b/scripts/deleteuser.php diff --git a/scripts/xmppconfirmhandler.php b/scripts/xmppconfirmhandler.php index c7ed15e49..2e3974136 100755 --- a/scripts/xmppconfirmhandler.php +++ b/scripts/xmppconfirmhandler.php @@ -34,8 +34,6 @@ require_once INSTALLDIR.'/scripts/commandline.inc'; require_once INSTALLDIR . '/lib/jabber.php'; require_once INSTALLDIR . '/lib/xmppqueuehandler.php'; -define('CLAIM_TIMEOUT', 1200); - class XmppConfirmHandler extends XmppQueueHandler { var $_id = 'confirm'; diff --git a/scripts/xmppdaemon.php b/scripts/xmppdaemon.php index b2efc07c3..e52e2a6af 100755 --- a/scripts/xmppdaemon.php +++ b/scripts/xmppdaemon.php @@ -187,7 +187,7 @@ class XMPPDaemon extends Daemon return; } if ($this->handle_command($user, $pl['body'])) { - $this->log(LOG_INFO, "Command messag by $from handled."); + $this->log(LOG_INFO, "Command message by $from handled."); return; } else if ($this->is_autoreply($pl['body'])) { $this->log(LOG_INFO, 'Ignoring auto reply from ' . $from); diff --git a/theme/base/css/display.css b/theme/base/css/display.css index cdc17d67f..a6a93c405 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -93,14 +93,17 @@ border-radius:4px; -webkit-border-radius:4px; margin-bottom:18px; } + +.xoxo li { +list-style-type:none; +} + form label.submit { display:none; } - .form_settings { clear:both; } - .form_settings fieldset { margin-bottom:29px; } @@ -839,6 +842,10 @@ margin-left:2%; width:98%; float:left; } +.mark-top { +border-top-width:1px; +border-top-style:solid; +} /* NOTICES */ #notices_primary { diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 4e3bc5980..94bef339f 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -178,6 +178,11 @@ background-color:rgba(255, 255, 255, 0.7); #site_nav_local_views .current a { text-shadow: rgba(194,194,194,0.5) 1px 1px 1px; } +.processing { +background-image:url(../../base/images/icons/icon_processing.gif); +background-repeat:no-repeat; +background-position:47% 47%; +} .error { background-color:#F7E8E8; @@ -330,3 +335,17 @@ background-position:10% -187px; .pagination .nav_next a { background-position:105% -252px; } +.pagination .nav .processing { +background-image:url(../../base/images/icons/icon_processing.gif); +box-shadow:none; +-moz-box-shadow:none; +-webkit-box-shadow:none; +outline:none; +} +.pagination .nav_next a.processing { +background-position:90% 47%; +} +.pagination .nav_prev a.processing { +background-position:10% 47%; +} + |