diff options
| author | Brenda Wallace <shiny@cpan.org> | 2010-03-10 20:47:49 +1300 |
|---|---|---|
| committer | Brenda Wallace <shiny@cpan.org> | 2010-03-10 20:47:49 +1300 |
| commit | 47034553fea0ad760596eae416a675b93dd9380c (patch) | |
| tree | c6750d642cfd5d71b331e4ed7bce29247f1277d6 | |
| parent | c89ed16d24d56879bf40a70d500509d1d42a4532 (diff) | |
| parent | 9653cb9f0a590417245063f905a2089f03b9e7b2 (diff) | |
Merge commit 'mainline/0.9.x' into 0.9.x
65 files changed, 2542 insertions, 1691 deletions
diff --git a/actions/otp.php b/actions/otp.php index acf84aee8..1e06603d4 100644 --- a/actions/otp.php +++ b/actions/otp.php @@ -126,6 +126,8 @@ class OtpAction extends Action $this->lt->delete(); $this->lt = null; + common_real_login(true); + if ($this->rememberme) { common_rememberme($this->user); } diff --git a/classes/User_username.php b/classes/User_username.php index 853fd5cb8..8d99cddd3 100644 --- a/classes/User_username.php +++ b/classes/User_username.php @@ -55,7 +55,7 @@ class User_username extends Memcached_DataObject // now define the keys. function keys() { - return array('provider_name', 'username'); + return array('provider_name' => 'K', 'username' => 'K'); } } diff --git a/config.php.sample b/config.php.sample index a4580dabb..20de7ffed 100644 --- a/config.php.sample +++ b/config.php.sample @@ -124,6 +124,8 @@ $config['sphinx']['port'] = 3312; // Email info, used for all outbound email // $config['mail']['notifyfrom'] = 'microblog@example.net'; +// Domain for generating no-reply and incoming email addresses, if enabled. +// Defaults to site server name. // $config['mail']['domain'] = 'microblog.example.net'; // See http://pear.php.net/manual/en/package.mail.mail.factory.php for options // $config['mail']['backend'] = 'smtp'; @@ -131,8 +133,6 @@ $config['sphinx']['port'] = 3312; // 'host' => 'localhost', // 'port' => 25, // ); -// For incoming email, if enabled. Defaults to site server name. -// $config['mail']['domain'] = 'incoming.example.net'; // exponential decay factor for tags, default 10 days // raise this if traffic is slow, lower it if it's fast diff --git a/install.php b/install.php index 8c9b6138b..9a7e27fa2 100644 --- a/install.php +++ b/install.php @@ -301,6 +301,19 @@ function checkPrereqs() $pass = false; } + // Look for known library bugs + $str = "abcdefghijklmnopqrstuvwxyz"; + $replaced = preg_replace('/[\p{Cc}\p{Cs}]/u', '*', $str); + if ($str != $replaced) { + printf('<p class="error">PHP is linked to a version of the PCRE library ' . + 'that does not support Unicode properties. ' . + 'If you are running Red Hat Enterprise Linux / ' . + 'CentOS 5.4 or earlier, see <a href="' . + 'http://status.net/wiki/Red_Hat_Enterprise_Linux#PCRE_library' . + '">our documentation page</a> on fixing this.</p>'); + $pass = false; + } + $reqs = array('gd', 'curl', 'xmlwriter', 'mbstring', 'xml', 'dom', 'simplexml'); @@ -470,6 +483,7 @@ function showForm() $dbRadios .= "<input type=\"radio\" name=\"dbtype\" id=\"dbtype-$type\" value=\"$type\" $checked/> $info[name]<br />\n"; } } + echo<<<E_O_T </ul> </dd> @@ -546,6 +560,11 @@ function showForm() <input id="admin_email" name="admin_email" value="{$post->value('admin_email')}" /> <p class="form_guide">Optional email address for the initial StatusNet user (administrator)</p> </li> + <li> + <label for="admin_updates">Subscribe to announcements</label> + <input type="checkbox" id="admin_updates" name="admin_updates" value="true" checked="checked" /> + <p class="form_guide">Release and security feed from <a href="http://update.status.net/">update@status.net</a> (recommended)</p> + </li> </ul> </fieldset> <input type="submit" name="submit" class="submit" value="Submit" /> @@ -570,10 +589,11 @@ function handlePost() $sitename = $_POST['sitename']; $fancy = !empty($_POST['fancy']); - $adminNick = $_POST['admin_nickname']; + $adminNick = strtolower($_POST['admin_nickname']); $adminPass = $_POST['admin_password']; $adminPass2 = $_POST['admin_password2']; $adminEmail = $_POST['admin_email']; + $adminUpdates = $_POST['admin_updates']; $server = $_SERVER['HTTP_HOST']; $path = substr(dirname($_SERVER['PHP_SELF']), 1); @@ -610,6 +630,19 @@ STR; updateStatus("No initial StatusNet user nickname specified.", true); $fail = true; } + if ($adminNick && !preg_match('/^[0-9a-z]{1,64}$/', $adminNick)) { + updateStatus('The user nickname "' . htmlspecialchars($adminNick) . + '" is invalid; should be plain letters and numbers no longer than 64 characters.', true); + $fail = true; + } + // @fixme hardcoded list; should use User::allowed_nickname() + // if/when it's safe to have loaded the infrastructure here + $blacklist = array('main', 'admin', 'twitter', 'settings', 'rsd.xml', 'favorited', 'featured', 'favoritedrss', 'featuredrss', 'rss', 'getfile', 'api', 'groups', 'group', 'peopletag', 'tag', 'user', 'message', 'conversation', 'bookmarklet', 'notice', 'attachment', 'search', 'index.php', 'doc', 'opensearch', 'robots.txt', 'xd_receiver.html', 'facebook'); + if (in_array($adminNick, $blacklist)) { + updateStatus('The user nickname "' . htmlspecialchars($adminNick) . + '" is reserved.', true); + $fail = true; + } if (empty($adminPass)) { updateStatus("No initial StatusNet user password specified.", true); @@ -644,7 +677,7 @@ STR; } // Okay, cross fingers and try to register an initial user - if (registerInitialUser($adminNick, $adminPass, $adminEmail)) { + if (registerInitialUser($adminNick, $adminPass, $adminEmail, $adminUpdates)) { updateStatus( "An initial user with the administrator role has been created." ); @@ -841,7 +874,7 @@ function runDbScript($filename, $conn, $type = 'mysqli') return true; } -function registerInitialUser($nickname, $password, $email) +function registerInitialUser($nickname, $password, $email, $adminUpdates) { define('STATUSNET', true); define('LACONICA', true); // compatibility @@ -869,7 +902,7 @@ function registerInitialUser($nickname, $password, $email) // Attempt to do a remote subscribe to update@status.net // Will fail if instance is on a private network. - if (class_exists('Ostatus_profile')) { + if (class_exists('Ostatus_profile') && $adminUpdates) { try { $oprofile = Ostatus_profile::ensureProfile('http://update.status.net/'); Subscription::start($user->getProfile(), $oprofile->localProfile()); diff --git a/lib/apiauth.php b/lib/apiauth.php index 5090871cf..f63c84d8f 100644 --- a/lib/apiauth.php +++ b/lib/apiauth.php @@ -235,7 +235,11 @@ class ApiAuthAction extends ApiAction { $this->basicAuthProcessHeader(); - $realm = common_config('site', 'name') . ' API'; + $realm = common_config('api', 'realm'); + + if (empty($realm)) { + $realm = common_config('site', 'name') . ' API'; + } if (!isset($this->auth_user_nickname) && $required) { header('WWW-Authenticate: Basic realm="' . $realm . '"'); diff --git a/lib/channel.php b/lib/channel.php index 3cd168786..689bca0be 100644 --- a/lib/channel.php +++ b/lib/channel.php @@ -47,6 +47,25 @@ class Channel } } +class CLIChannel extends Channel +{ + function source() + { + return 'cli'; + } + + function output($user, $text) + { + $site = common_config('site', 'name'); + print "[{$user->nickname}@{$site}] $text\n"; + } + + function error($user, $text) + { + $this->output($user, $text); + } +} + class XMPPChannel extends Channel { diff --git a/lib/command.php b/lib/command.php index db8e80030..0b3b3c95a 100644 --- a/lib/command.php +++ b/lib/command.php @@ -1,7 +1,7 @@ <?php /* * StatusNet - the distributed open-source microblogging tool - * Copyright (C) 2008, 2009, StatusNet, Inc. + * Copyright (C) 2008, 2009, 2010 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 @@ -31,15 +31,147 @@ class Command $this->user = $user; } - function execute($channel) + /** + * Execute the command and send success or error results + * back via the given communications channel. + * + * @param Channel + */ + public function execute($channel) + { + try { + $this->handle($channel); + } catch (CommandException $e) { + $channel->error($this->user, $e->getMessage()); + } catch (Exception $e) { + common_log(LOG_ERR, "Error handling " . get_class($this) . ": " . $e->getMessage()); + $channel->error($this->user, $e->getMessage()); + } + } + + + /** + * Override this with the meat! + * + * An error to send back to the user may be sent by throwing + * a CommandException with a formatted message. + * + * @param Channel + * @throws CommandException + */ + function handle($channel) { return false; } + + /** + * Look up a notice from an argument, by poster's name to get last post + * or notice_id prefixed with #. + * + * @return Notice + * @throws CommandException + */ + function getNotice($arg) + { + $notice = null; + if (Event::handle('StartCommandGetNotice', array($this, $arg, &$notice))) { + if(substr($this->other,0,1)=='#'){ + // A specific notice_id #123 + + $notice = Notice::staticGet(substr($arg,1)); + if (!$notice) { + throw new CommandException(_('Notice with that id does not exist')); + } + } + + if (Validate::uri($this->other)) { + // A specific notice by URI lookup + $notice = Notice::staticGet('uri', $arg); + } + + if (!$notice) { + // Local or remote profile name to get their last notice. + // May throw an exception and report 'no such user' + $recipient = $this->getProfile($arg); + + $notice = $recipient->getCurrentNotice(); + if (!$notice) { + throw new CommandException(_('User has no last notice')); + } + } + } + Event::handle('EndCommandGetNotice', array($this, $arg, &$notice)); + if (!$notice) { + throw new CommandException(_('Notice with that id does not exist')); + } + return $notice; + } + + /** + * Look up a local or remote profile by nickname. + * + * @return Profile + * @throws CommandException + */ + function getProfile($arg) + { + $profile = null; + if (Event::handle('StartCommandGetProfile', array($this, $arg, &$profile))) { + $profile = + common_relative_profile($this->user, common_canonical_nickname($arg)); + } + Event::handle('EndCommandGetProfile', array($this, $arg, &$profile)); + if (!$profile) { + throw new CommandException(sprintf(_('Could not find a user with nickname %s'), $arg)); + } + return $profile; + } + + /** + * Get a local user by name + * @return User + * @throws CommandException + */ + function getUser($arg) + { + $user = null; + if (Event::handle('StartCommandGetUser', array($this, $arg, &$user))) { + $user = User::staticGet('nickname', $arg); + } + Event::handle('EndCommandGetUser', array($this, $arg, &$user)); + if (!$user){ + throw new CommandException(sprintf(_('Could not find a local user with nickname %s'), + $arg)); + } + return $user; + } + + /** + * Get a local or remote group by name. + * @return User_group + * @throws CommandException + */ + function getGroup($arg) + { + $group = null; + if (Event::handle('StartCommandGetGroup', array($this, $arg, &$group))) { + $group = User_group::getForNickname($arg, $this->user->getProfile()); + } + Event::handle('EndCommandGetGroup', array($this, $arg, &$group)); + if (!$group) { + throw new CommandException(_('No such group.')); + } + return $group; + } +} + +class CommandException extends Exception +{ } class UnimplementedCommand extends Command { - function execute($channel) + function handle($channel) { $channel->error($this->user, _("Sorry, this command is not yet implemented.")); } @@ -81,24 +213,20 @@ class NudgeCommand extends Command parent::__construct($user); $this->other = $other; } - function execute($channel) + + function handle($channel) { - $recipient = User::staticGet('nickname', $this->other); - if(! $recipient){ - $channel->error($this->user, sprintf(_('Could not find a user with nickname %s'), - $this->other)); - }else{ - if ($recipient->id == $this->user->id) { - $channel->error($this->user, _('It does not make a lot of sense to nudge yourself!')); - }else{ - if ($recipient->email && $recipient->emailnotifynudge) { - mail_notify_nudge($this->user, $recipient); - } - // XXX: notify by IM - // XXX: notify by SMS - $channel->output($this->user, sprintf(_('Nudge sent to %s'), - $recipient->nickname)); + $recipient = $this->getUser($this->other); + if ($recipient->id == $this->user->id) { + throw new CommandException(_('It does not make a lot of sense to nudge yourself!')); + } else { + if ($recipient->email && $recipient->emailnotifynudge) { + mail_notify_nudge($this->user, $recipient); } + // XXX: notify by IM + // XXX: notify by SMS + $channel->output($this->user, sprintf(_('Nudge sent to %s'), + $recipient->nickname)); } } } @@ -115,7 +243,7 @@ class InviteCommand extends UnimplementedCommand class StatsCommand extends Command { - function execute($channel) + function handle($channel) { $profile = $this->user->getProfile(); @@ -142,34 +270,9 @@ class FavCommand extends Command $this->other = $other; } - function execute($channel) + function handle($channel) { - if(substr($this->other,0,1)=='#'){ - //favoriting a specific notice_id - - $notice = Notice::staticGet(substr($this->other,1)); - if (!$notice) { - $channel->error($this->user, _('Notice with that id does not exist')); - return; - } - $recipient = $notice->getProfile(); - }else{ - //favoriting a given user's last notice - - $recipient = - common_relative_profile($this->user, common_canonical_nickname($this->other)); - - if (!$recipient) { - $channel->error($this->user, _('No such user.')); - return; - } - $notice = $recipient->getCurrentNotice(); - if (!$notice) { - $channel->error($this->user, _('User has no last notice')); - return; - } - } - + $notice = $this->getNotice($this->other); $fave = Fave::addNew($this->user, $notice); if (!$fave) { @@ -177,7 +280,10 @@ class FavCommand extends Command return; } - $other = User::staticGet('id', $recipient->id); + // @fixme favorite notification should be triggered + // at a lower level + + $other = User::staticGet('id', $notice->profile_id); if ($other && $other->id != $user->id) { if ($other->email && $other->emailnotifyfav) { @@ -191,6 +297,7 @@ class FavCommand extends Command } } + class JoinCommand extends Command { var $other = null; @@ -201,17 +308,10 @@ class JoinCommand extends Command $this->other = $other; } - function execute($channel) + function handle($channel) { - - $nickname = common_canonical_nickname($this->other); - $group = User_group::staticGet('nickname', $nickname); - $cur = $this->user; - - if (!$group) { - $channel->error($cur, _('No such group.')); - return; - } + $group = $this->getGroup($this->other); + $cur = $this->user; if ($cur->isMember($group)) { $channel->error($cur, _('You are already a member of that group')); @@ -249,12 +349,10 @@ class DropCommand extends Command $this->other = $other; } - function execute($channel) + function handle($channel) { - - $nickname = common_canonical_nickname($this->other); - $group = User_group::staticGet('nickname', $nickname); - $cur = $this->user; + $group = $this->getGroup($this->other); + $cur = $this->user; if (!$group) { $channel->error($cur, _('No such group.')); @@ -293,15 +391,9 @@ class WhoisCommand extends Command $this->other = $other; } - function execute($channel) + function handle($channel) { - $recipient = - common_relative_profile($this->user, common_canonical_nickname($this->other)); - - if (!$recipient) { - $channel->error($this->user, _('No such user.')); - return; - } + $recipient = $this->getProfile($this->other); $whois = sprintf(_("%1\$s (%2\$s)"), $recipient->nickname, $recipient->profileurl); @@ -332,9 +424,18 @@ class MessageCommand extends Command $this->text = $text; } - function execute($channel) + function handle($channel) { - $other = User::staticGet('nickname', common_canonical_nickname($this->other)); + try { + $other = $this->getUser($this->other); + } catch (CommandException $e) { + try { + $profile = $this->getProfile($this->other); + } catch (CommandException $f) { + throw $e; + } + throw new CommandException(sprintf(_('%s is a remote profile; you can only send direct messages to users on the same server.'), $this->other)); + } $len = mb_strlen($this->text); @@ -380,33 +481,9 @@ class RepeatCommand extends Command $this->other = $other; } - function execute($channel) + function handle($channel) { - if(substr($this->other,0,1)=='#'){ - //repeating a specific notice_id - - $notice = Notice::staticGet(substr($this->other,1)); - if (!$notice) { - $channel->error($this->user, _('Notice with that id does not exist')); - return; - } - $recipient = $notice->getProfile(); - }else{ - //repeating a given user's last notice - - $recipient = - common_relative_profile($this->user, common_canonical_nickname($this->other)); - - if (!$recipient) { - $channel->error($this->user, _('No such user.')); - return; - } - $notice = $recipient->getCurrentNotice(); - if (!$notice) { - $channel->error($this->user, _('User has no last notice')); - return; - } - } + $notice = $this->getNotice($this->other); if($this->user->id == $notice->profile_id) { @@ -414,7 +491,7 @@ class RepeatCommand extends Command return; } - if ($recipient->hasRepeated($notice->id)) { + if ($this->user->getProfile()->hasRepeated($notice->id)) { $channel->error($this->user, _('Already repeated that notice')); return; } @@ -441,33 +518,10 @@ class ReplyCommand extends Command $this->text = $text; } - function execute($channel) + function handle($channel) { - if(substr($this->other,0,1)=='#'){ - //replying to a specific notice_id - - $notice = Notice::staticGet(substr($this->other,1)); - if (!$notice) { - $channel->error($this->user, _('Notice with that id does not exist')); - return; - } - $recipient = $notice->getProfile(); - }else{ - //replying to a given user's last notice - - $recipient = - common_relative_profile($this->user, common_canonical_nickname($this->other)); - - if (!$recipient) { - $channel->error($this->user, _('No such user.')); - return; - } - $notice = $recipient->getCurrentNotice(); - if (!$notice) { - $channel->error($this->user, _('User has no last notice')); - return; - } - } + $notice = $this->getNotice($this->other); + $recipient = $notice->getProfile(); $len = mb_strlen($this->text); @@ -507,17 +561,10 @@ class GetCommand extends Command $this->other = $other; } - function execute($channel) + function handle($channel) { - $target_nickname = common_canonical_nickname($this->other); - - $target = - common_relative_profile($this->user, $target_nickname); + $target = $this->getProfile($this->other); - if (!$target) { - $channel->error($this->user, _('No such user.')); - return; - } $notice = $target->getCurrentNotice(); if (!$notice) { $channel->error($this->user, _('User has no last notice')); @@ -525,7 +572,7 @@ class GetCommand extends Command } $notice_content = $notice->content; - $channel->output($this->user, $target_nickname . ": " . $notice_content); + $channel->output($this->user, $target->nickname . ": " . $notice_content); } } @@ -540,7 +587,7 @@ class SubCommand extends Command $this->other = $other; } - function execute($channel) + function handle($channel) { if (!$this->other) { @@ -548,16 +595,16 @@ class SubCommand extends Command return; } - $otherUser = User::staticGet('nickname', $this->other); + $target = $this->getProfile($this->other); - if (empty($otherUser)) { - $channel->error($this->user, _('No such user')); - return; + $remote = Remote_profile::staticGet('id', $target->id); + if ($remote) { + throw new CommandException(_("Can't subscribe to OMB profiles by command.")); } try { Subscription::start($this->user->getProfile(), - $otherUser->getProfile()); + $target); $channel->output($this->user, sprintf(_('Subscribed to %s'), $this->other)); } catch (Exception $e) { $channel->error($this->user, $e->getMessage()); @@ -576,22 +623,18 @@ class UnsubCommand extends Command $this->other = $other; } - function execute($channel) + function handle($channel) { if(!$this->other) { $channel->error($this->user, _('Specify the name of the user to unsubscribe from')); return; } - $otherUser = User::staticGet('nickname', $this->other); - - if (empty($otherUser)) { - $channel->error($this->user, _('No such user')); - } + $target = $this->getProfile($this->other); try { Subscription::cancel($this->user->getProfile(), - $otherUser->getProfile()); + $target); $channel->output($this->user, sprintf(_('Unsubscribed from %s'), $this->other)); } catch (Exception $e) { $channel->error($this->user, $e->getMessage()); @@ -607,7 +650,7 @@ class OffCommand extends Command parent::__construct($user); $this->other = $other; } - function execute($channel) + function handle($channel) { if ($other) { $channel->error($this->user, _("Command not yet implemented.")); @@ -630,7 +673,7 @@ class OnCommand extends Command $this->other = $other; } - function execute($channel) + function handle($channel) { if ($other) { $channel->error($this->user, _("Command not yet implemented.")); @@ -646,7 +689,7 @@ class OnCommand extends Command class LoginCommand extends Command { - function execute($channel) + function handle($channel) { $disabled = common_config('logincommand','disabled'); $disabled = isset($disabled) && $disabled; @@ -698,7 +741,7 @@ class LoseCommand extends Command class SubscriptionsCommand extends Command { - function execute($channel) + function handle($channel) { $profile = $this->user->getSubscriptions(0); $nicknames=array(); @@ -720,7 +763,7 @@ class SubscriptionsCommand extends Command class SubscribersCommand extends Command { - function execute($channel) + function handle($channel) { $profile = $this->user->getSubscribers(); $nicknames=array(); @@ -742,7 +785,7 @@ class SubscribersCommand extends Command class GroupsCommand extends Command { - function execute($channel) + function handle($channel) { $group = $this->user->getGroups(); $groups=array(); @@ -763,7 +806,7 @@ class GroupsCommand extends Command class HelpCommand extends Command { - function execute($channel) + function handle($channel) { $channel->output($this->user, _("Commands:\n". diff --git a/lib/default.php b/lib/default.php index f22d8b24a..10f3f1a97 100644 --- a/lib/default.php +++ b/lib/default.php @@ -294,4 +294,6 @@ $default = array('crawldelay' => 0, 'disallow' => array('main', 'settings', 'admin', 'search', 'message') ), + 'api' => + array('realm' => null), ); diff --git a/lib/jabber.php b/lib/jabber.php index e1bf06ba6..db4e2e9a7 100644 --- a/lib/jabber.php +++ b/lib/jabber.php @@ -88,22 +88,30 @@ class Sharing_XMPP extends XMPPHP_XMPP /** * Build an XMPP proxy connection that'll save outgoing messages * to the 'xmppout' queue to be picked up by xmppdaemon later. + * + * If queueing is disabled, we'll grab a live connection. + * + * @return XMPPHP */ function jabber_proxy() { - $proxy = new Queued_XMPP(common_config('xmpp', 'host') ? - common_config('xmpp', 'host') : - common_config('xmpp', 'server'), - common_config('xmpp', 'port'), - common_config('xmpp', 'user'), - common_config('xmpp', 'password'), - common_config('xmpp', 'resource') . 'daemon', - common_config('xmpp', 'server'), - common_config('xmpp', 'debug') ? - true : false, - common_config('xmpp', 'debug') ? - XMPPHP_Log::LEVEL_VERBOSE : null); - return $proxy; + if (common_config('queue', 'enabled')) { + $proxy = new Queued_XMPP(common_config('xmpp', 'host') ? + common_config('xmpp', 'host') : + common_config('xmpp', 'server'), + common_config('xmpp', 'port'), + common_config('xmpp', 'user'), + common_config('xmpp', 'password'), + common_config('xmpp', 'resource') . 'daemon', + common_config('xmpp', 'server'), + common_config('xmpp', 'debug') ? + true : false, + common_config('xmpp', 'debug') ? + XMPPHP_Log::LEVEL_VERBOSE : null); + return $proxy; + } else { + return jabber_connect(); + } } /** diff --git a/lib/queued_xmpp.php b/lib/queued_xmpp.php index fdd074db2..f6bccfd5b 100644 --- a/lib/queued_xmpp.php +++ b/lib/queued_xmpp.php @@ -49,10 +49,20 @@ class Queued_XMPP extends XMPPHP_XMPP */ public function __construct($host, $port, $user, $password, $resource, $server = null, $printlog = false, $loglevel = null) { - parent::__construct($host, $port, $user, $password, $resource, $server, $printlog, $loglevel); - // Normally the fulljid isn't filled out until resource binding time; - // we need to save it here since we're not talking to a real server. - $this->fulljid = "{$this->basejid}/{$this->resource}"; + parent::__construct($host, $port, $user, $password, $resource, $server, $printlog, $loglevel); + + // We use $host to connect, but $server to build JIDs if specified. + // This seems to fix an upstream bug where $host was used to build + // $this->basejid, never seen since it isn't actually used in the base + // classes. + if (!$server) { + $server = $this->host; + } + $this->basejid = $this->user . '@' . $server; + + // Normally the fulljid is filled out by the server at resource binding + // time, but we need to do it since we're not talking to a real server. + $this->fulljid = "{$this->basejid}/{$this->resource}"; } /** diff --git a/lib/statusnet.php b/lib/statusnet.php index eba9ab9b8..ef3adebf9 100644 --- a/lib/statusnet.php +++ b/lib/statusnet.php @@ -342,7 +342,11 @@ class StatusNet if (array_key_exists('memcached', $config)) { if ($config['memcached']['enabled']) { - addPlugin('Memcache', array('servers' => $config['memcached']['server'])); + if(class_exists('Memcached')) { + addPlugin('Memcached', array('servers' => $config['memcached']['server'])); + } else { + addPlugin('Memcache', array('servers' => $config['memcached']['server'])); + } } if (!empty($config['memcached']['base'])) { diff --git a/lib/util.php b/lib/util.php index da2799d4f..c5dacb699 100644 --- a/lib/util.php +++ b/lib/util.php @@ -1462,7 +1462,15 @@ function common_copy_args($from) $to = array(); $strip = get_magic_quotes_gpc(); foreach ($from as $k => $v) { - $to[$k] = ($strip) ? stripslashes($v) : $v; + if($strip) { + if(is_array($v)) { + $to[$k] = common_copy_args($v); + } else { + $to[$k] = stripslashes($v); + } + } else { + $to[$k] = $v; + } } return $to; } diff --git a/lib/xmppmanager.php b/lib/xmppmanager.php index f37635855..cca54db08 100644 --- a/lib/xmppmanager.php +++ b/lib/xmppmanager.php @@ -36,6 +36,7 @@ class XmppManager extends IoManager protected $site = null; protected $pingid = 0; protected $lastping = null; + protected $conn = null; static protected $singletons = array(); diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po index 9f7bd5cbb..56029bc82 100644 --- a/locale/ar/LC_MESSAGES/statusnet.po +++ b/locale/ar/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-04 18:55+0000\n" -"PO-Revision-Date: 2010-03-05 22:34:53+0000\n" +"POT-Creation-Date: 2010-03-06 23:49+0000\n" +"PO-Revision-Date: 2010-03-06 23:49:16+0000\n" "Language-Team: Arabic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63298); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ar\n" "X-Message-Group: out-statusnet\n" @@ -102,7 +102,7 @@ msgstr "لا صفحة كهذه" #: actions/otp.php:76 actions/remotesubscribe.php:145 #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 +#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:302 #: lib/command.php:355 lib/command.php:401 lib/command.php:462 #: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82 @@ -549,7 +549,7 @@ msgstr "" #: actions/apioauthauthorize.php:276 msgid "Allow or deny access" -msgstr "" +msgstr "اسمح أو امنع الوصول" #: actions/apioauthauthorize.php:292 #, php-format @@ -681,7 +681,7 @@ msgstr "تكرارات %s" msgid "Notices tagged with %s" msgstr "الإشعارات الموسومة ب%s" -#: actions/apitimelinetag.php:104 actions/tagrss.php:64 +#: actions/apitimelinetag.php:104 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "" @@ -721,7 +721,7 @@ msgstr "بإمكانك رفع أفتارك الشخصي. أقصى حجم للم #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 #: actions/remotesubscribe.php:191 actions/userauthorization.php:72 -#: actions/userrss.php:103 +#: actions/userrss.php:106 msgid "User without matching profile" msgstr "" @@ -1691,7 +1691,7 @@ msgstr "" msgid "Make this user an admin" msgstr "اجعل هذا المستخدم إداريًا" -#: actions/grouprss.php:138 actions/userrss.php:90 +#: actions/grouprss.php:138 actions/userrss.php:93 #: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67 #, php-format msgid "%s timeline" @@ -2353,7 +2353,7 @@ msgstr "كلمة السر القديمة" #: actions/passwordsettings.php:108 actions/recoverpassword.php:235 msgid "New password" -msgstr "كلمة سر جديدة" +msgstr "كلمة السر الجديدة" #: actions/passwordsettings.php:109 msgid "6 or more characters" @@ -4229,7 +4229,7 @@ msgstr "%s ليس عضوًا في أي مجموعة." msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" -#: actions/userrss.php:92 lib/atomgroupnoticefeed.php:66 +#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66 #: lib/atomusernoticefeed.php:72 #, php-format msgid "Updates from %1$s on %2$s!" @@ -4486,10 +4486,9 @@ msgstr "الصفحة الشخصية" #. TRANS: Tooltip for main menu option "Account" #: lib/action.php:435 -#, fuzzy msgctxt "TOOLTIP" msgid "Change your email, avatar, password, profile" -msgstr "غير كلمة سرّك" +msgstr "غير بريدك الإلكتروني وكلمة سرّك وأفتارك وملفك الشخصي" #. TRANS: Tooltip for main menu option "Services" #: lib/action.php:440 @@ -4977,12 +4976,12 @@ msgstr "%s ترك المجموعة %s" msgid "Fullname: %s" msgstr "الاسم الكامل: %s" -#: lib/command.php:312 lib/mail.php:254 +#: lib/command.php:312 lib/mail.php:258 #, php-format msgid "Location: %s" msgstr "الموقع: %s" -#: lib/command.php:315 lib/mail.php:256 +#: lib/command.php:315 lib/mail.php:260 #, php-format msgid "Homepage: %s" msgstr "الصفحة الرئيسية: %s" @@ -5042,9 +5041,8 @@ msgid "Specify the name of the user to subscribe to" msgstr "" #: lib/command.php:554 lib/command.php:589 -#, fuzzy msgid "No such user" -msgstr "لا مستخدم كهذا." +msgstr "لا مستخدم كهذا" #: lib/command.php:561 #, php-format @@ -5427,11 +5425,11 @@ msgstr "لُج باسم مستخدم وكلمة سر" msgid "Sign up for a new account" msgstr "سجّل حسابًا جديدًا" -#: lib/mail.php:172 +#: lib/mail.php:173 msgid "Email address confirmation" msgstr "تأكيد عنوان البريد الإلكتروني" -#: lib/mail.php:174 +#: lib/mail.php:175 #, php-format msgid "" "Hey, %s.\n" @@ -5447,13 +5445,25 @@ msgid "" "Thanks for your time, \n" "%s\n" msgstr "" +"مرحبًا، %s.\n" +"\n" +"لقد أدخل أحدهم قبل لحظات عنوان البريد الإلكتروني هذا على %s.\n" +"\n" +"إذا كنت هو، وإذا كنت تريد تأكيد هذه المدخلة، فاستخدم المسار أدناه:\n" +"\n" +" %s\n" +"\n" +"إذا كان الأمر خلاف ذلك، فتجاهل هذه الرسالة.\n" +"\n" +"شكرًا على الوقت الذي أمضيته، \n" +"%s\n" -#: lib/mail.php:236 +#: lib/mail.php:240 #, php-format msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s يستمع الآن إلى إشعاراتك على %2$s." -#: lib/mail.php:241 +#: lib/mail.php:245 #, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -5478,17 +5488,17 @@ msgstr "" "----\n" "غيّر خيارات البريد الإلكتروني والإشعار في %8$s\n" -#: lib/mail.php:258 +#: lib/mail.php:262 #, php-format msgid "Bio: %s" msgstr "السيرة: %s" -#: lib/mail.php:286 +#: lib/mail.php:290 #, php-format msgid "New email address for posting to %s" msgstr "عنوان بريد إلكتروني جديد للإرسال إلى %s" -#: lib/mail.php:289 +#: lib/mail.php:293 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5501,21 +5511,21 @@ msgid "" "%4$s" msgstr "" -#: lib/mail.php:413 +#: lib/mail.php:417 #, php-format msgid "%s status" msgstr "حالة %s" -#: lib/mail.php:439 +#: lib/mail.php:443 msgid "SMS confirmation" msgstr "تأكيد الرسالة القصيرة" -#: lib/mail.php:463 +#: lib/mail.php:467 #, php-format msgid "You've been nudged by %s" msgstr "لقد نبهك %s" -#: lib/mail.php:467 +#: lib/mail.php:471 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -5531,12 +5541,12 @@ msgid "" "%4$s\n" msgstr "" -#: lib/mail.php:510 +#: lib/mail.php:517 #, php-format msgid "New private message from %s" msgstr "رسالة خاصة جديدة من %s" -#: lib/mail.php:514 +#: lib/mail.php:521 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -5555,12 +5565,12 @@ msgid "" "%5$s\n" msgstr "" -#: lib/mail.php:559 +#: lib/mail.php:568 #, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "لقد أضاف %s (@%s) إشعارك إلى مفضلاته" -#: lib/mail.php:561 +#: lib/mail.php:570 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -5581,12 +5591,12 @@ msgid "" "%6$s\n" msgstr "" -#: lib/mail.php:624 +#: lib/mail.php:635 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "لقد أرسل %s (@%s) إشعارًا إليك" -#: lib/mail.php:626 +#: lib/mail.php:637 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" diff --git a/locale/arz/LC_MESSAGES/statusnet.po b/locale/arz/LC_MESSAGES/statusnet.po index 3654f6326..aaf1d89bd 100644 --- a/locale/arz/LC_MESSAGES/statusnet.po +++ b/locale/arz/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-04 18:55+0000\n" -"PO-Revision-Date: 2010-03-05 22:34:56+0000\n" +"POT-Creation-Date: 2010-03-06 23:49+0000\n" +"PO-Revision-Date: 2010-03-06 23:49:19+0000\n" "Language-Team: Egyptian Spoken Arabic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63298); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: arz\n" "X-Message-Group: out-statusnet\n" @@ -108,7 +108,7 @@ msgstr "لا صفحه كهذه" #: actions/otp.php:76 actions/remotesubscribe.php:145 #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 +#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:302 #: lib/command.php:355 lib/command.php:401 lib/command.php:462 #: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82 @@ -687,7 +687,7 @@ msgstr "تكرارات %s" msgid "Notices tagged with %s" msgstr "الإشعارات الموسومه ب%s" -#: actions/apitimelinetag.php:104 actions/tagrss.php:64 +#: actions/apitimelinetag.php:104 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "" @@ -727,7 +727,7 @@ msgstr "" #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 #: actions/remotesubscribe.php:191 actions/userauthorization.php:72 -#: actions/userrss.php:103 +#: actions/userrss.php:106 msgid "User without matching profile" msgstr "" @@ -1703,7 +1703,7 @@ msgstr "" msgid "Make this user an admin" msgstr "اجعل هذا المستخدم إداريًا" -#: actions/grouprss.php:138 actions/userrss.php:90 +#: actions/grouprss.php:138 actions/userrss.php:93 #: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67 #, php-format msgid "%s timeline" @@ -4234,7 +4234,7 @@ msgstr "" msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" -#: actions/userrss.php:92 lib/atomgroupnoticefeed.php:66 +#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66 #: lib/atomusernoticefeed.php:72 #, php-format msgid "Updates from %1$s on %2$s!" @@ -5002,12 +5002,12 @@ msgstr "%s ساب الجروپ %s" msgid "Fullname: %s" msgstr "الاسم الكامل: %s" -#: lib/command.php:312 lib/mail.php:254 +#: lib/command.php:312 lib/mail.php:258 #, php-format msgid "Location: %s" msgstr "الموقع: %s" -#: lib/command.php:315 lib/mail.php:256 +#: lib/command.php:315 lib/mail.php:260 #, php-format msgid "Homepage: %s" msgstr "الصفحه الرئيسية: %s" @@ -5452,11 +5452,11 @@ msgstr "" msgid "Sign up for a new account" msgstr "" -#: lib/mail.php:172 +#: lib/mail.php:173 msgid "Email address confirmation" msgstr "تأكيد عنوان البريد الإلكتروني" -#: lib/mail.php:174 +#: lib/mail.php:175 #, php-format msgid "" "Hey, %s.\n" @@ -5473,12 +5473,12 @@ msgid "" "%s\n" msgstr "" -#: lib/mail.php:236 +#: lib/mail.php:240 #, php-format msgid "%1$s is now listening to your notices on %2$s." msgstr "" -#: lib/mail.php:241 +#: lib/mail.php:245 #, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -5493,17 +5493,17 @@ msgid "" "Change your email address or notification options at %8$s\n" msgstr "" -#: lib/mail.php:258 +#: lib/mail.php:262 #, php-format msgid "Bio: %s" msgstr "عن نفسك: %s" -#: lib/mail.php:286 +#: lib/mail.php:290 #, php-format msgid "New email address for posting to %s" msgstr "" -#: lib/mail.php:289 +#: lib/mail.php:293 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5516,21 +5516,21 @@ msgid "" "%4$s" msgstr "" -#: lib/mail.php:413 +#: lib/mail.php:417 #, php-format msgid "%s status" msgstr "حاله %s" -#: lib/mail.php:439 +#: lib/mail.php:443 msgid "SMS confirmation" msgstr "" -#: lib/mail.php:463 +#: lib/mail.php:467 #, php-format msgid "You've been nudged by %s" msgstr "" -#: lib/mail.php:467 +#: lib/mail.php:471 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -5546,12 +5546,12 @@ msgid "" "%4$s\n" msgstr "" -#: lib/mail.php:510 +#: lib/mail.php:517 #, php-format msgid "New private message from %s" msgstr "رساله خاصه جديده من %s" -#: lib/mail.php:514 +#: lib/mail.php:521 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -5570,12 +5570,12 @@ msgid "" "%5$s\n" msgstr "" -#: lib/mail.php:559 +#: lib/mail.php:568 #, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "" -#: lib/mail.php:561 +#: lib/mail.php:570 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -5596,12 +5596,12 @@ msgid "" "%6$s\n" msgstr "" -#: lib/mail.php:624 +#: lib/mail.php:635 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "" -#: lib/mail.php:626 +#: lib/mail.php:637 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po index 71b22dd4f..3a6b5b047 100644 --- a/locale/bg/LC_MESSAGES/statusnet.po +++ b/locale/bg/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-04 18:55+0000\n" -"PO-Revision-Date: 2010-03-05 22:34:58+0000\n" +"POT-Creation-Date: 2010-03-06 23:49+0000\n" +"PO-Revision-Date: 2010-03-06 23:49:22+0000\n" "Language-Team: Bulgarian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63298); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: bg\n" "X-Message-Group: out-statusnet\n" @@ -103,7 +103,7 @@ msgstr "Няма такака страница." #: actions/otp.php:76 actions/remotesubscribe.php:145 #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 +#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:302 #: lib/command.php:355 lib/command.php:401 lib/command.php:462 #: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82 @@ -694,7 +694,7 @@ msgstr "Повторения на %s" msgid "Notices tagged with %s" msgstr "Бележки с етикет %s" -#: actions/apitimelinetag.php:104 actions/tagrss.php:64 +#: actions/apitimelinetag.php:104 actions/tagrss.php:65 #, fuzzy, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Бележки от %1$s в %2$s." @@ -736,7 +736,7 @@ msgstr "" #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 #: actions/remotesubscribe.php:191 actions/userauthorization.php:72 -#: actions/userrss.php:103 +#: actions/userrss.php:106 msgid "User without matching profile" msgstr "Потребител без съответстващ профил" @@ -1753,7 +1753,7 @@ msgstr "" msgid "Make this user an admin" msgstr "" -#: actions/grouprss.php:138 actions/userrss.php:90 +#: actions/grouprss.php:138 actions/userrss.php:93 #: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67 #, php-format msgid "%s timeline" @@ -4414,7 +4414,7 @@ msgstr "%s не членува в никоя група." msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" -#: actions/userrss.php:92 lib/atomgroupnoticefeed.php:66 +#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66 #: lib/atomusernoticefeed.php:72 #, php-format msgid "Updates from %1$s on %2$s!" @@ -5211,12 +5211,12 @@ msgstr "%s напусна групата %s" msgid "Fullname: %s" msgstr "Пълно име: %s" -#: lib/command.php:312 lib/mail.php:254 +#: lib/command.php:312 lib/mail.php:258 #, php-format msgid "Location: %s" msgstr "Местоположение: %s" -#: lib/command.php:315 lib/mail.php:256 +#: lib/command.php:315 lib/mail.php:260 #, php-format msgid "Homepage: %s" msgstr "Домашна страница: %s" @@ -5657,11 +5657,11 @@ msgstr "Вход с име и парола" msgid "Sign up for a new account" msgstr "Създаване на нова сметка" -#: lib/mail.php:172 +#: lib/mail.php:173 msgid "Email address confirmation" msgstr "Потвърждаване адреса на е-поща" -#: lib/mail.php:174 +#: lib/mail.php:175 #, php-format msgid "" "Hey, %s.\n" @@ -5678,12 +5678,12 @@ msgid "" "%s\n" msgstr "" -#: lib/mail.php:236 +#: lib/mail.php:240 #, php-format msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s вече получава бележките ви в %2$s." -#: lib/mail.php:241 +#: lib/mail.php:245 #, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -5708,17 +5708,17 @@ msgstr "" "----\n" "Може да смените адреса и настройките за уведомяване по е-поща на %8$s\n" -#: lib/mail.php:258 +#: lib/mail.php:262 #, php-format msgid "Bio: %s" msgstr "Биография: %s" -#: lib/mail.php:286 +#: lib/mail.php:290 #, php-format msgid "New email address for posting to %s" msgstr "Нов адрес на е-поща за публикщуване в %s" -#: lib/mail.php:289 +#: lib/mail.php:293 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5731,21 +5731,21 @@ msgid "" "%4$s" msgstr "" -#: lib/mail.php:413 +#: lib/mail.php:417 #, php-format msgid "%s status" msgstr "Състояние на %s" -#: lib/mail.php:439 +#: lib/mail.php:443 msgid "SMS confirmation" msgstr "Потвърждение за SMS" -#: lib/mail.php:463 +#: lib/mail.php:467 #, php-format msgid "You've been nudged by %s" msgstr "Побутнати сте от %s" -#: lib/mail.php:467 +#: lib/mail.php:471 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -5761,12 +5761,12 @@ msgid "" "%4$s\n" msgstr "" -#: lib/mail.php:510 +#: lib/mail.php:517 #, php-format msgid "New private message from %s" msgstr "Ново лично съобщение от %s" -#: lib/mail.php:514 +#: lib/mail.php:521 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -5785,12 +5785,12 @@ msgid "" "%5$s\n" msgstr "" -#: lib/mail.php:559 +#: lib/mail.php:568 #, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%s (@%s) отбеляза бележката ви като любима" -#: lib/mail.php:561 +#: lib/mail.php:570 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -5811,12 +5811,12 @@ msgid "" "%6$s\n" msgstr "" -#: lib/mail.php:624 +#: lib/mail.php:635 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "" -#: lib/mail.php:626 +#: lib/mail.php:637 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" diff --git a/locale/br/LC_MESSAGES/statusnet.po b/locale/br/LC_MESSAGES/statusnet.po index 53e971a31..2197b9e74 100644 --- a/locale/br/LC_MESSAGES/statusnet.po +++ b/locale/br/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-04 19:12+0000\n" -"PO-Revision-Date: 2010-03-04 19:12:57+0000\n" +"POT-Creation-Date: 2010-03-06 23:49+0000\n" +"PO-Revision-Date: 2010-03-06 23:49:25+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63249); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: br\n" "X-Message-Group: out-statusnet\n" @@ -101,7 +101,7 @@ msgstr "N'eus ket eus ar bajenn-se" #: actions/otp.php:76 actions/remotesubscribe.php:145 #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 +#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:302 #: lib/command.php:355 lib/command.php:401 lib/command.php:462 #: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82 @@ -680,7 +680,7 @@ msgstr "Adkemeret eus %s" msgid "Notices tagged with %s" msgstr "Alioù merket gant %s" -#: actions/apitimelinetag.php:104 actions/tagrss.php:64 +#: actions/apitimelinetag.php:104 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "" @@ -720,7 +720,7 @@ msgstr "" #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 #: actions/remotesubscribe.php:191 actions/userauthorization.php:72 -#: actions/userrss.php:103 +#: actions/userrss.php:106 msgid "User without matching profile" msgstr "Implijer hep profil klotaus" @@ -1533,23 +1533,20 @@ msgid "Cannot read file." msgstr "Diposupl eo lenn ar restr." #: actions/grantrole.php:62 actions/revokerole.php:62 -#, fuzzy msgid "Invalid role." -msgstr "Fichenn direizh." +msgstr "Roll direizh." #: actions/grantrole.php:66 actions/revokerole.php:66 msgid "This role is reserved and cannot be set." msgstr "" #: actions/grantrole.php:75 -#, fuzzy msgid "You cannot grant user roles on this site." -msgstr "Ne c'helloc'h ket kas kemennadennoù d'an implijer-mañ." +msgstr "Ne c'helloc'h ket reiñ rolloù d'an implijerien eus al lec'hienn-mañ." #: actions/grantrole.php:82 -#, fuzzy msgid "User already has this role." -msgstr "An implijer-mañ n'eus profil ebet dezhañ." +msgstr "An implijer-mañ en deus dija ar roll-mañ." #: actions/groupblock.php:71 actions/groupunblock.php:71 #: actions/makeadmin.php:71 actions/subedit.php:46 @@ -1691,7 +1688,7 @@ msgstr "Lakaat ur merour" msgid "Make this user an admin" msgstr "Lakaat an implijer-mañ da verour" -#: actions/grouprss.php:138 actions/userrss.php:90 +#: actions/grouprss.php:138 actions/userrss.php:93 #: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67 #, php-format msgid "%s timeline" @@ -2384,7 +2381,7 @@ msgstr "Kemmañ" #: actions/passwordsettings.php:154 actions/register.php:230 msgid "Password must be 6 or more characters." -msgstr "" +msgstr "Rankout a ra ar ger-tremen bezañ gant 6 arouezenn d'an nebeutañ." #: actions/passwordsettings.php:157 actions/register.php:233 msgid "Passwords don't match." @@ -2489,7 +2486,7 @@ msgstr "Hentad an tem" #: actions/pathsadminpanel.php:272 msgid "Theme directory" -msgstr "" +msgstr "Doser an temoù" #: actions/pathsadminpanel.php:279 msgid "Avatars" @@ -2600,7 +2597,7 @@ msgstr "" #: actions/profilesettings.php:99 msgid "Profile information" -msgstr "" +msgstr "Titouroù ar profil" #: actions/profilesettings.php:108 lib/groupeditform.php:154 msgid "1-64 lowercase letters or numbers, no punctuation or spaces" @@ -2684,7 +2681,7 @@ msgstr "" #: actions/profilesettings.php:228 actions/register.php:223 #, php-format msgid "Bio is too long (max %d chars)." -msgstr "" +msgstr "Re hir eo ar bio (%d arouezenn d'ar muiañ)." #: actions/profilesettings.php:235 actions/siteadminpanel.php:151 msgid "Timezone not selected." @@ -2692,7 +2689,7 @@ msgstr "N'eo bet dibabet gwerzhid-eur ebet." #: actions/profilesettings.php:241 msgid "Language is too long (max 50 chars)." -msgstr "" +msgstr "Re hir eo ar yezh (255 arouezenn d'ar muiañ)." #: actions/profilesettings.php:253 actions/tagother.php:178 #, php-format @@ -4217,7 +4214,7 @@ msgstr "" msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" -#: actions/userrss.php:92 lib/atomgroupnoticefeed.php:66 +#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66 #: lib/atomusernoticefeed.php:72 #, php-format msgid "Updates from %1$s on %2$s!" @@ -4480,9 +4477,8 @@ msgid "Connect to services" msgstr "" #: lib/action.php:443 -#, fuzzy msgid "Connect" -msgstr "Endalc'h" +msgstr "Kevreañ" #. TRANS: Tooltip for menu option "Admin" #: lib/action.php:446 @@ -4951,12 +4947,12 @@ msgstr "%s {{Gender:.|en|he}} deus kuitaet ar strollad %s" msgid "Fullname: %s" msgstr "Anv klok : %s" -#: lib/command.php:312 lib/mail.php:254 +#: lib/command.php:312 lib/mail.php:258 #, php-format msgid "Location: %s" msgstr "" -#: lib/command.php:315 lib/mail.php:256 +#: lib/command.php:315 lib/mail.php:260 #, php-format msgid "Homepage: %s" msgstr "" @@ -5391,11 +5387,11 @@ msgstr "" msgid "Sign up for a new account" msgstr "" -#: lib/mail.php:172 +#: lib/mail.php:173 msgid "Email address confirmation" msgstr "" -#: lib/mail.php:174 +#: lib/mail.php:175 #, php-format msgid "" "Hey, %s.\n" @@ -5412,12 +5408,12 @@ msgid "" "%s\n" msgstr "" -#: lib/mail.php:236 +#: lib/mail.php:240 #, php-format msgid "%1$s is now listening to your notices on %2$s." msgstr "" -#: lib/mail.php:241 +#: lib/mail.php:245 #, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -5432,17 +5428,17 @@ msgid "" "Change your email address or notification options at %8$s\n" msgstr "" -#: lib/mail.php:258 +#: lib/mail.php:262 #, php-format msgid "Bio: %s" msgstr "" -#: lib/mail.php:286 +#: lib/mail.php:290 #, php-format msgid "New email address for posting to %s" msgstr "" -#: lib/mail.php:289 +#: lib/mail.php:293 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5455,21 +5451,21 @@ msgid "" "%4$s" msgstr "" -#: lib/mail.php:413 +#: lib/mail.php:417 #, php-format msgid "%s status" msgstr "Statud %s" -#: lib/mail.php:439 +#: lib/mail.php:443 msgid "SMS confirmation" msgstr "" -#: lib/mail.php:463 +#: lib/mail.php:467 #, php-format msgid "You've been nudged by %s" msgstr "" -#: lib/mail.php:467 +#: lib/mail.php:471 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -5485,12 +5481,12 @@ msgid "" "%4$s\n" msgstr "" -#: lib/mail.php:510 +#: lib/mail.php:517 #, php-format msgid "New private message from %s" msgstr "Kemenadenn personel nevez a-berzh %s" -#: lib/mail.php:514 +#: lib/mail.php:521 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -5509,12 +5505,12 @@ msgid "" "%5$s\n" msgstr "" -#: lib/mail.php:559 +#: lib/mail.php:568 #, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "" -#: lib/mail.php:561 +#: lib/mail.php:570 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -5535,12 +5531,12 @@ msgid "" "%6$s\n" msgstr "" -#: lib/mail.php:624 +#: lib/mail.php:635 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "" -#: lib/mail.php:626 +#: lib/mail.php:637 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po index 8a91dad60..bd7c5cd5a 100644 --- a/locale/ca/LC_MESSAGES/statusnet.po +++ b/locale/ca/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-04 18:55+0000\n" -"PO-Revision-Date: 2010-03-05 22:35:02+0000\n" +"POT-Creation-Date: 2010-03-06 23:49+0000\n" +"PO-Revision-Date: 2010-03-06 23:49:29+0000\n" "Language-Team: Catalan\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63298); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ca\n" "X-Message-Group: out-statusnet\n" @@ -109,7 +109,7 @@ msgstr "No existeix la pàgina." #: actions/otp.php:76 actions/remotesubscribe.php:145 #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 +#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:302 #: lib/command.php:355 lib/command.php:401 lib/command.php:462 #: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82 @@ -713,7 +713,7 @@ msgstr "Repeticions de %s" msgid "Notices tagged with %s" msgstr "Aviso etiquetats amb %s" -#: actions/apitimelinetag.php:104 actions/tagrss.php:64 +#: actions/apitimelinetag.php:104 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Actualitzacions etiquetades amb %1$s el %2$s!" @@ -754,7 +754,7 @@ msgstr "" #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 #: actions/remotesubscribe.php:191 actions/userauthorization.php:72 -#: actions/userrss.php:103 +#: actions/userrss.php:106 msgid "User without matching profile" msgstr "Usuari sense perfil coincident" @@ -1772,7 +1772,7 @@ msgstr "Fes-lo administrador" msgid "Make this user an admin" msgstr "Fes l'usuari administrador" -#: actions/grouprss.php:138 actions/userrss.php:90 +#: actions/grouprss.php:138 actions/userrss.php:93 #: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67 #, php-format msgid "%s timeline" @@ -4478,7 +4478,7 @@ msgstr "%s no és membre de cap grup." msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" -#: actions/userrss.php:92 lib/atomgroupnoticefeed.php:66 +#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66 #: lib/atomusernoticefeed.php:72 #, php-format msgid "Updates from %1$s on %2$s!" @@ -5268,12 +5268,12 @@ msgstr "%s ha abandonat el grup %s" msgid "Fullname: %s" msgstr "Nom complet: %s" -#: lib/command.php:312 lib/mail.php:254 +#: lib/command.php:312 lib/mail.php:258 #, php-format msgid "Location: %s" msgstr "Localització: %s" -#: lib/command.php:315 lib/mail.php:256 +#: lib/command.php:315 lib/mail.php:260 #, php-format msgid "Homepage: %s" msgstr "Pàgina web: %s" @@ -5713,11 +5713,11 @@ msgstr "Accedir amb el nom d'usuari i contrasenya" msgid "Sign up for a new account" msgstr "Crear nou compte" -#: lib/mail.php:172 +#: lib/mail.php:173 msgid "Email address confirmation" msgstr "Confirmació de l'adreça de correu electrònic" -#: lib/mail.php:174 +#: lib/mail.php:175 #, php-format msgid "" "Hey, %s.\n" @@ -5734,12 +5734,12 @@ msgid "" "%s\n" msgstr "" -#: lib/mail.php:236 +#: lib/mail.php:240 #, php-format msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s ara està escoltant els teus avisos a %2$s." -#: lib/mail.php:241 +#: lib/mail.php:245 #, fuzzy, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -5760,19 +5760,19 @@ msgstr "" "Atentament,\n" "%4$s.\n" -#: lib/mail.php:258 +#: lib/mail.php:262 #, fuzzy, php-format msgid "Bio: %s" msgstr "" "Biografia: %s\n" "\n" -#: lib/mail.php:286 +#: lib/mail.php:290 #, php-format msgid "New email address for posting to %s" msgstr "Nou correu electrònic per publicar a %s" -#: lib/mail.php:289 +#: lib/mail.php:293 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5793,21 +5793,21 @@ msgstr "" "Sincerament teus,\n" "%4$s" -#: lib/mail.php:413 +#: lib/mail.php:417 #, php-format msgid "%s status" msgstr "%s estat" -#: lib/mail.php:439 +#: lib/mail.php:443 msgid "SMS confirmation" msgstr "Confirmació SMS" -#: lib/mail.php:463 +#: lib/mail.php:467 #, php-format msgid "You've been nudged by %s" msgstr "Has estat reclamat per %s" -#: lib/mail.php:467 +#: lib/mail.php:471 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -5823,12 +5823,12 @@ msgid "" "%4$s\n" msgstr "" -#: lib/mail.php:510 +#: lib/mail.php:517 #, php-format msgid "New private message from %s" msgstr "Nou missatge privat de %s" -#: lib/mail.php:514 +#: lib/mail.php:521 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -5847,12 +5847,12 @@ msgid "" "%5$s\n" msgstr "" -#: lib/mail.php:559 +#: lib/mail.php:568 #, fuzzy, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%s ha afegit la teva nota com a favorita" -#: lib/mail.php:561 +#: lib/mail.php:570 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -5873,12 +5873,12 @@ msgid "" "%6$s\n" msgstr "" -#: lib/mail.php:624 +#: lib/mail.php:635 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "" -#: lib/mail.php:626 +#: lib/mail.php:637 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po index 8a8ccf6e6..a48ec5885 100644 --- a/locale/cs/LC_MESSAGES/statusnet.po +++ b/locale/cs/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-04 18:55+0000\n" -"PO-Revision-Date: 2010-03-05 22:35:06+0000\n" +"POT-Creation-Date: 2010-03-06 23:49+0000\n" +"PO-Revision-Date: 2010-03-06 23:49:32+0000\n" "Language-Team: Czech\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63298); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: cs\n" "X-Message-Group: out-statusnet\n" @@ -109,7 +109,7 @@ msgstr "Žádné takové oznámení." #: actions/otp.php:76 actions/remotesubscribe.php:145 #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 +#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:302 #: lib/command.php:355 lib/command.php:401 lib/command.php:462 #: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82 @@ -709,7 +709,7 @@ msgstr "Odpovědi na %s" msgid "Notices tagged with %s" msgstr "" -#: actions/apitimelinetag.php:104 actions/tagrss.php:64 +#: actions/apitimelinetag.php:104 actions/tagrss.php:65 #, fuzzy, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Mikroblog od %s" @@ -751,7 +751,7 @@ msgstr "" #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 #: actions/remotesubscribe.php:191 actions/userauthorization.php:72 -#: actions/userrss.php:103 +#: actions/userrss.php:106 msgid "User without matching profile" msgstr "" @@ -1779,7 +1779,7 @@ msgstr "" msgid "Make this user an admin" msgstr "" -#: actions/grouprss.php:138 actions/userrss.php:90 +#: actions/grouprss.php:138 actions/userrss.php:93 #: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67 #, php-format msgid "%s timeline" @@ -4422,7 +4422,7 @@ msgstr "Neodeslal jste nám profil" msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" -#: actions/userrss.php:92 lib/atomgroupnoticefeed.php:66 +#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66 #: lib/atomusernoticefeed.php:72 #, php-format msgid "Updates from %1$s on %2$s!" @@ -5214,12 +5214,12 @@ msgstr "%1 statusů na %2" msgid "Fullname: %s" msgstr "Celé jméno" -#: lib/command.php:312 lib/mail.php:254 +#: lib/command.php:312 lib/mail.php:258 #, php-format msgid "Location: %s" msgstr "" -#: lib/command.php:315 lib/mail.php:256 +#: lib/command.php:315 lib/mail.php:260 #, php-format msgid "Homepage: %s" msgstr "" @@ -5675,11 +5675,11 @@ msgstr "Neplatné jméno nebo heslo" msgid "Sign up for a new account" msgstr "Vytvořit nový účet" -#: lib/mail.php:172 +#: lib/mail.php:173 msgid "Email address confirmation" msgstr "Potvrzení emailové adresy" -#: lib/mail.php:174 +#: lib/mail.php:175 #, php-format msgid "" "Hey, %s.\n" @@ -5696,12 +5696,12 @@ msgid "" "%s\n" msgstr "" -#: lib/mail.php:236 +#: lib/mail.php:240 #, php-format msgid "%1$s is now listening to your notices on %2$s." msgstr "%1 od teď naslouchá tvým sdělením v %2" -#: lib/mail.php:241 +#: lib/mail.php:245 #, fuzzy, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -5722,17 +5722,17 @@ msgstr "" "S úctou váš,\n" "%4$s.\n" -#: lib/mail.php:258 +#: lib/mail.php:262 #, fuzzy, php-format msgid "Bio: %s" msgstr "O mě" -#: lib/mail.php:286 +#: lib/mail.php:290 #, php-format msgid "New email address for posting to %s" msgstr "" -#: lib/mail.php:289 +#: lib/mail.php:293 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5745,21 +5745,21 @@ msgid "" "%4$s" msgstr "" -#: lib/mail.php:413 +#: lib/mail.php:417 #, php-format msgid "%s status" msgstr "" -#: lib/mail.php:439 +#: lib/mail.php:443 msgid "SMS confirmation" msgstr "" -#: lib/mail.php:463 +#: lib/mail.php:467 #, php-format msgid "You've been nudged by %s" msgstr "" -#: lib/mail.php:467 +#: lib/mail.php:471 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -5775,12 +5775,12 @@ msgid "" "%4$s\n" msgstr "" -#: lib/mail.php:510 +#: lib/mail.php:517 #, php-format msgid "New private message from %s" msgstr "" -#: lib/mail.php:514 +#: lib/mail.php:521 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -5799,12 +5799,12 @@ msgid "" "%5$s\n" msgstr "" -#: lib/mail.php:559 +#: lib/mail.php:568 #, fuzzy, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%1 od teď naslouchá tvým sdělením v %2" -#: lib/mail.php:561 +#: lib/mail.php:570 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -5825,12 +5825,12 @@ msgid "" "%6$s\n" msgstr "" -#: lib/mail.php:624 +#: lib/mail.php:635 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "" -#: lib/mail.php:626 +#: lib/mail.php:637 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po index 5007074b7..4bad95b9e 100644 --- a/locale/de/LC_MESSAGES/statusnet.po +++ b/locale/de/LC_MESSAGES/statusnet.po @@ -15,12 +15,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-04 18:55+0000\n" -"PO-Revision-Date: 2010-03-05 22:35:09+0000\n" +"POT-Creation-Date: 2010-03-06 23:49+0000\n" +"PO-Revision-Date: 2010-03-08 21:10:39+0000\n" "Language-Team: German\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63298); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63415); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: de\n" "X-Message-Group: out-statusnet\n" @@ -108,7 +108,7 @@ msgstr "Seite nicht vorhanden" #: actions/otp.php:76 actions/remotesubscribe.php:145 #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 +#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:302 #: lib/command.php:355 lib/command.php:401 lib/command.php:462 #: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82 @@ -273,6 +273,8 @@ msgid "" "The server was unable to handle that much POST data (%s bytes) due to its " "current configuration." msgstr "" +"Der Server kann so große POST Abfragen (%s bytes) aufgrund der Konfiguration " +"nicht verarbeiten." #: actions/apiaccountupdateprofilebackgroundimage.php:136 #: actions/apiaccountupdateprofilebackgroundimage.php:146 @@ -505,7 +507,7 @@ msgstr "Gruppen von %s" #: actions/apioauthauthorize.php:101 msgid "No oauth_token parameter provided." -msgstr "" +msgstr "Kein oauth_token Parameter angegeben." #: actions/apioauthauthorize.php:106 #, fuzzy @@ -540,9 +542,8 @@ msgid "Database error deleting OAuth application user." msgstr "Fehler bei den Nutzereinstellungen." #: actions/apioauthauthorize.php:185 -#, fuzzy msgid "Database error inserting OAuth application user." -msgstr "Datenbankfehler beim Einfügen des Hashtags: %s" +msgstr "Datenbankfehler beim Einfügen des OAuth Programm Benutzers." #: actions/apioauthauthorize.php:214 #, php-format @@ -550,11 +551,13 @@ msgid "" "The request token %s has been authorized. Please exchange it for an access " "token." msgstr "" +"Die Anfrage %s wurde nicht autorisiert. Bitte gegen einen Zugriffstoken " +"austauschen." #: actions/apioauthauthorize.php:227 #, php-format msgid "The request token %s has been denied and revoked." -msgstr "" +msgstr "Die Anfrage %s wurde gesperrt und widerrufen." #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281 #: actions/designadminpanel.php:103 actions/editapplication.php:139 @@ -567,7 +570,7 @@ msgstr "Unerwartete Formulareingabe." #: actions/apioauthauthorize.php:259 msgid "An application would like to connect to your account" -msgstr "" +msgstr "Ein Programm will eine Verbindung zu deinem Konto aufbauen" #: actions/apioauthauthorize.php:276 msgid "Allow or deny access" @@ -662,14 +665,14 @@ msgid "Unsupported format." msgstr "Bildformat wird nicht unterstützt." #: actions/apitimelinefavorites.php:108 -#, fuzzy, php-format +#, php-format msgid "%1$s / Favorites from %2$s" -msgstr "%s / Favoriten von %s" +msgstr "%1$s / Favoriten von %2$s" #: actions/apitimelinefavorites.php:117 -#, fuzzy, php-format +#, php-format msgid "%1$s updates favorited by %2$s / %2$s." -msgstr "%s Aktualisierung in den Favoriten von %s / %s." +msgstr "%1$s Aktualisierung in den Favoriten von %2$s / %2$s." #: actions/apitimelinementions.php:117 #, php-format @@ -692,21 +695,21 @@ msgid "%s updates from everyone!" msgstr "%s Nachrichten von allen!" #: actions/apitimelineretweetedtome.php:111 -#, fuzzy, php-format +#, php-format msgid "Repeated to %s" msgstr "Antworten an %s" #: actions/apitimelineretweetsofme.php:114 -#, fuzzy, php-format +#, php-format msgid "Repeats of %s" -msgstr "Antworten an %s" +msgstr "Antworten von %s" #: actions/apitimelinetag.php:102 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "Nachrichten, die mit %s getagt sind" -#: actions/apitimelinetag.php:104 actions/tagrss.php:64 +#: actions/apitimelinetag.php:104 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Aktualisierungen mit %1$s getagt auf %2$s!" @@ -747,7 +750,7 @@ msgstr "" #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 #: actions/remotesubscribe.php:191 actions/userauthorization.php:72 -#: actions/userrss.php:103 +#: actions/userrss.php:106 msgid "User without matching profile" msgstr "Benutzer ohne passendes Profil" @@ -862,9 +865,9 @@ msgid "%s blocked profiles" msgstr "%s blockierte Benutzerprofile" #: actions/blockedfromgroup.php:100 -#, fuzzy, php-format +#, php-format msgid "%1$s blocked profiles, page %2$d" -msgstr "%s blockierte Benutzerprofile, Seite %d" +msgstr "%1$s blockierte Benutzerprofile, Seite %2$d" #: actions/blockedfromgroup.php:115 msgid "A list of the users blocked from joining this group." @@ -921,7 +924,6 @@ msgid "Couldn't delete email confirmation." msgstr "Konnte E-Mail-Bestätigung nicht löschen." #: actions/confirmaddress.php:144 -#, fuzzy msgid "Confirm address" msgstr "Adresse bestätigen" @@ -940,14 +942,12 @@ msgid "Notices" msgstr "Nachrichten" #: actions/deleteapplication.php:63 -#, fuzzy msgid "You must be logged in to delete an application." -msgstr "Du musst angemeldet sein, um eine Gruppe zu bearbeiten." +msgstr "Du musst angemeldet sein, um dieses Programm zu entfernen." #: actions/deleteapplication.php:71 -#, fuzzy msgid "Application not found." -msgstr "Nachricht hat kein Profil" +msgstr "Programm nicht gefunden." #: actions/deleteapplication.php:78 actions/editapplication.php:77 #: actions/showapplication.php:94 @@ -970,11 +970,12 @@ msgid "" "about the application from the database, including all existing user " "connections." msgstr "" +"Bist du sicher, dass du dieses Programm löschen willst? Es werden alle Daten " +"aus der Datenbank entfernt, auch alle bestehenden Benutzer-Verbindungen." #: actions/deleteapplication.php:156 -#, fuzzy msgid "Do not delete this application" -msgstr "Diese Nachricht nicht löschen" +msgstr "Dieses Programm nicht löschen" #: actions/deleteapplication.php:160 msgid "Delete this application" @@ -1239,9 +1240,8 @@ msgid "Callback URL is not valid." msgstr "Antwort URL ist nicht gültig" #: actions/editapplication.php:258 -#, fuzzy msgid "Could not update application." -msgstr "Konnte Gruppe nicht aktualisieren." +msgstr "Konnte Programm nicht aktualisieren." #: actions/editgroup.php:56 #, php-format @@ -1254,7 +1254,6 @@ msgstr "Du musst angemeldet sein, um eine Gruppe zu erstellen." #: actions/editgroup.php:107 actions/editgroup.php:172 #: actions/groupdesignsettings.php:107 actions/grouplogo.php:109 -#, fuzzy msgid "You must be an admin to edit the group." msgstr "Du musst ein Administrator sein, um die Gruppe zu bearbeiten" @@ -1488,12 +1487,16 @@ msgstr "Die momentan beliebtesten Nachrichten auf dieser Seite." #: actions/favorited.php:150 msgid "Favorite notices appear on this page but no one has favorited one yet." msgstr "" +"Favorisierte Mitteilungen werden auf dieser Seite angezeigt; es wurden aber " +"noch keine Favoriten markiert." #: 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 "" +"Sei der erste der eine Nachricht favorisiert indem du auf die entsprechenden " +"Schaltfläche neben der Nachricht klickst." #: actions/favorited.php:156 #, php-format @@ -1501,6 +1504,8 @@ msgid "" "Why not [register an account](%%action.register%%) and be the first to add a " "notice to your favorites!" msgstr "" +"Warum [registrierst Du nicht einen Account](%%%%action.register%%%%) und " +"bist der erste der eine Nachricht favorisiert!" #: actions/favoritesrss.php:111 actions/showfavorites.php:77 #: lib/personalgroupnav.php:115 @@ -1524,9 +1529,9 @@ msgid "Featured users, page %d" msgstr "Top-Benutzer, Seite %d" #: actions/featured.php:99 -#, fuzzy, php-format +#, php-format msgid "A selection of some great users on %s" -msgstr "Eine Auswahl der tollen Benutzer auf %s" +msgstr "Eine Auswahl toller Benutzer auf %s" #: actions/file.php:34 msgid "No notice ID." @@ -1641,6 +1646,10 @@ msgid "" "will be removed from the group, unable to post, and unable to subscribe to " "the group in the future." msgstr "" +"Bist du sicher, dass du den Benutzer \"%1$s\" in der Gruppe \"%2$s\" " +"blockieren willst? Er wird aus der Gruppe gelöscht, kann keine Beiträge mehr " +"abschicken und wird auch in Zukunft dieser Gruppe nicht mehr beitreten " +"können." #: actions/groupblock.php:178 msgid "Do not block this user from this group" @@ -1696,7 +1705,6 @@ msgstr "" "s." #: actions/grouplogo.php:181 -#, fuzzy msgid "User without matching profile." msgstr "Benutzer ohne passendes Profil" @@ -1718,9 +1726,9 @@ msgid "%s group members" msgstr "%s Gruppen-Mitglieder" #: actions/groupmembers.php:103 -#, fuzzy, php-format +#, php-format msgid "%1$s group members, page %2$d" -msgstr "%s Gruppen-Mitglieder, Seite %d" +msgstr "%1$s Gruppen-Mitglieder, Seite %2$d" #: actions/groupmembers.php:118 msgid "A list of the users in this group." @@ -1746,7 +1754,7 @@ msgstr "Zum Admin ernennen" msgid "Make this user an admin" msgstr "Diesen Benutzer zu einem Admin ernennen" -#: actions/grouprss.php:138 actions/userrss.php:90 +#: actions/grouprss.php:138 actions/userrss.php:93 #: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67 #, php-format msgid "%s timeline" @@ -1867,7 +1875,6 @@ msgstr "" "Freundesliste hinzugefügt?)" #: actions/imsettings.php:124 -#, fuzzy msgid "IM address" msgstr "IM-Adresse" @@ -2172,9 +2179,9 @@ msgid "Only an admin can make another user an admin." msgstr "Nur Administratoren können andere Nutzer zu Administratoren ernennen." #: actions/makeadmin.php:96 -#, fuzzy, php-format +#, php-format msgid "%1$s is already an admin for group \"%2$s\"." -msgstr "%s ist bereits ein Administrator der Gruppe „%s“." +msgstr "%1$s ist bereits Administrator der Gruppe \"%2$s\"." #: actions/makeadmin.php:133 #, fuzzy, php-format @@ -2182,37 +2189,33 @@ msgid "Can't get membership record for %1$s in group %2$s." msgstr "Konnte Benutzer %s aus der Gruppe %s nicht entfernen" #: actions/makeadmin.php:146 -#, fuzzy, php-format +#, php-format msgid "Can't make %1$s an admin for group %2$s." -msgstr "Konnte %s nicht zum Administrator der Gruppe %s machen" +msgstr "Konnte %1$s nicht zum Administrator der Gruppe %2$s machen" #: actions/microsummary.php:69 msgid "No current status" msgstr "Kein aktueller Status" #: actions/newapplication.php:52 -#, fuzzy msgid "New Application" -msgstr "Unbekannte Nachricht." +msgstr "Neues Programm" #: actions/newapplication.php:64 -#, fuzzy msgid "You must be logged in to register an application." -msgstr "Du musst angemeldet sein, um eine Gruppe zu erstellen." +msgstr "Du musst angemeldet sein, um ein Programm zu registrieren." #: actions/newapplication.php:143 -#, fuzzy msgid "Use this form to register a new application." -msgstr "Benutzer dieses Formular, um eine neue Gruppe zu erstellen." +msgstr "Benutzer dieses Formular, um eine neues Programm zu erstellen." #: actions/newapplication.php:176 msgid "Source URL is required." msgstr "Quell-URL ist erforderlich." #: actions/newapplication.php:258 actions/newapplication.php:267 -#, fuzzy msgid "Could not create application." -msgstr "Konnte keinen Favoriten erstellen." +msgstr "Konnte das Programm nicht erstellen." #: actions/newgroup.php:53 msgid "New group" @@ -2250,7 +2253,7 @@ msgid "Message sent" msgstr "Nachricht gesendet" #: actions/newmessage.php:185 -#, fuzzy, php-format +#, php-format msgid "Direct message to %s sent." msgstr "Direkte Nachricht an %s abgeschickt" @@ -2281,9 +2284,9 @@ msgid "Text search" msgstr "Volltextsuche" #: actions/noticesearch.php:91 -#, fuzzy, php-format +#, php-format msgid "Search results for \"%1$s\" on %2$s" -msgstr "Suchergebnisse für „%s“ auf %s" +msgstr "Suchergebnisse für \"%1$s\" auf %2$s" #: actions/noticesearch.php:121 #, php-format @@ -2300,6 +2303,9 @@ msgid "" "Why not [register an account](%%%%action.register%%%%) and be the first to " "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" msgstr "" +"Warum [registrierst Du nicht einen Account](%%%%action.register%%%%) und " +"bist der erste der [auf diese Nachricht antwortet](%%%%action.newnotice%%%%?" +"status_textarea=%s)!" #: actions/noticesearchrss.php:96 #, php-format @@ -2350,6 +2356,8 @@ msgstr "Verbundene Programme" #: actions/oauthconnectionssettings.php:83 msgid "You have allowed the following applications to access you account." msgstr "" +"Du hast das folgende Programm die Erlaubnis erteilt sich mit deinem Profil " +"zu verbinden." #: actions/oauthconnectionssettings.php:175 msgid "You are not a user of that application." @@ -2363,10 +2371,12 @@ msgstr "Kann Zugang dieses Programm nicht entfernen: " #, php-format msgid "You have not authorized any applications to use your account." msgstr "" +"Du hast noch kein Programm die Erlaubnis gegeben dein Profil zu benutzen." #: actions/oauthconnectionssettings.php:211 msgid "Developers can edit the registration settings for their applications " msgstr "" +"Entwickler können die Registrierungseinstellungen ihrer Programme ändern " #: actions/oembed.php:79 actions/shownotice.php:100 msgid "Notice has no profile" @@ -2435,9 +2445,8 @@ msgid "No user ID specified." msgstr "Keine Benutzer ID angegeben" #: actions/otp.php:83 -#, fuzzy msgid "No login token specified." -msgstr "Kein Profil angegeben." +msgstr "Kein Zugangstoken angegeben." #: actions/otp.php:90 #, fuzzy @@ -2450,9 +2459,8 @@ msgid "Invalid login token specified." msgstr "Token ungültig oder abgelaufen." #: actions/otp.php:104 -#, fuzzy msgid "Login token expired." -msgstr "An Seite anmelden" +msgstr "Zugangstoken ist abgelaufen." #: actions/outbox.php:58 #, php-format @@ -2537,7 +2545,7 @@ msgstr "Pfad" #: actions/pathsadminpanel.php:70 msgid "Path and server settings for this StatusNet site." -msgstr "" +msgstr "Pfad- und Serverangaben für diese StatusNet Seite." #: actions/pathsadminpanel.php:157 #, php-format @@ -2557,7 +2565,7 @@ msgstr "Hintergrund Verzeichnis ist nicht beschreibbar: %s" #: actions/pathsadminpanel.php:177 #, php-format msgid "Locales directory not readable: %s" -msgstr "" +msgstr "Sprachverzeichnis nicht lesbar: %s" #: actions/pathsadminpanel.php:183 msgid "Invalid SSL server. The maximum length is 255 characters." @@ -2585,11 +2593,11 @@ msgstr "Seitenpfad" #: actions/pathsadminpanel.php:246 msgid "Path to locales" -msgstr "" +msgstr "Sprachverzeichnis" #: actions/pathsadminpanel.php:246 msgid "Directory path to locales" -msgstr "" +msgstr "Pfad zu den Sprachen" #: actions/pathsadminpanel.php:250 msgid "Fancy URLs" @@ -2915,6 +2923,11 @@ msgid "" "tool. [Join now](%%action.register%%) to share notices about yourself with " "friends, family, and colleagues! ([Read more](%%doc.help%%))" msgstr "" +"Das ist %%site.name%%, ein [Mikroblogging](http://de.wikipedia.org/wiki/" +"Mikroblogging) Dienst auf Basis der freien Software [StatusNet](http://" +"status.net/). [Melde dich jetzt an](%%action.register%%) und tausche " +"Nachrichten mit deinen Freunden, Familie oder Kollegen aus! ([Mehr " +"Informationen](%%doc.help%%))" #: actions/public.php:247 #, php-format @@ -2953,6 +2966,8 @@ msgid "" "Why not [register an account](%%action.register%%) and be the first to post " "one!" msgstr "" +"Warum [registrierst Du nicht einen Account](%%%%action.register%%%%) und " +"bist der erste der eine Nachricht abschickt!" #: actions/publictagcloud.php:134 msgid "Tag cloud" @@ -2991,10 +3006,12 @@ 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 "" +"Wenn du dein Passwort vergessen hast kannst du dir ein neues an deine " +"hinterlegte Email schicken lassen." #: actions/recoverpassword.php:158 msgid "You have been identified. Enter a new password below. " -msgstr "" +msgstr "Du wurdest identifiziert. Gib ein neues Passwort ein. " #: actions/recoverpassword.php:188 msgid "Password recovery" @@ -3118,6 +3135,8 @@ msgid "" "With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " msgstr "" +"Hier kannst du einen neuen Zugang einrichten. Danach kannst du Nachrichten " +"und Links an deine Freunde und Kollegen schicken. " #: actions/register.php:425 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." @@ -3222,7 +3241,6 @@ msgid "Remote subscribe" msgstr "Entferntes Abonnement" #: actions/remotesubscribe.php:124 -#, fuzzy msgid "Subscribe to a remote user" msgstr "Abonniere diesen Benutzer" @@ -3315,12 +3333,12 @@ msgid "Replies feed for %s (Atom)" msgstr "Feed der Nachrichten von %s (Atom)" #: actions/replies.php:199 -#, fuzzy, php-format +#, php-format msgid "" "This is the timeline showing replies to %1$s but %2$s hasn't received a " "notice to his attention yet." msgstr "" -"Dies ist die Zeitleiste für %s und Freunde aber bisher hat niemand etwas " +"Dies ist die Zeitleiste für %1$s und Freunde aber bisher hat niemand etwas " "gepostet." #: actions/replies.php:204 @@ -3346,14 +3364,12 @@ msgid "Replies to %1$s on %2$s!" msgstr "Antworten an %1$s auf %2$s!" #: actions/revokerole.php:75 -#, fuzzy msgid "You cannot revoke user roles on this site." -msgstr "Du kannst Nutzer dieser Seite nicht ruhig stellen." +msgstr "Du kannst die Rollen von Nutzern dieser Seite nicht widerrufen." #: actions/revokerole.php:82 -#, fuzzy msgid "User doesn't have this role." -msgstr "Benutzer ohne passendes Profil" +msgstr "Benutzer verfügt nicht über diese Rolle." #: actions/rsd.php:146 actions/version.php:157 msgid "StatusNet" @@ -3365,9 +3381,8 @@ msgid "You cannot sandbox users on this site." msgstr "Du kannst diesem Benutzer keine Nachricht schicken." #: actions/sandbox.php:72 -#, fuzzy msgid "User is already sandboxed." -msgstr "Dieser Benutzer hat dich blockiert." +msgstr "Benutzer ist schon blockiert." #. TRANS: Menu item for site administration #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 @@ -3376,9 +3391,8 @@ msgid "Sessions" msgstr "Sitzung" #: actions/sessionsadminpanel.php:65 -#, fuzzy msgid "Session settings for this StatusNet site." -msgstr "Design-Einstellungen für diese StatusNet-Website." +msgstr "Sitzungs-Einstellungen für diese StatusNet-Website." #: actions/sessionsadminpanel.php:175 msgid "Handle sessions" @@ -3386,15 +3400,15 @@ msgstr "Sitzung verwalten" #: actions/sessionsadminpanel.php:177 msgid "Whether to handle sessions ourselves." -msgstr "" +msgstr "Sitzungsverwaltung selber übernehmen." #: actions/sessionsadminpanel.php:181 msgid "Session debugging" -msgstr "" +msgstr "Sitzung untersuchen" #: actions/sessionsadminpanel.php:183 msgid "Turn on debugging output for sessions." -msgstr "" +msgstr "Fehleruntersuchung für Sitzungen aktivieren" #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292 #: actions/useradminpanel.php:294 @@ -3402,9 +3416,8 @@ msgid "Save site settings" msgstr "Site-Einstellungen speichern" #: actions/showapplication.php:82 -#, fuzzy msgid "You must be logged in to view an application." -msgstr "Du musst angemeldet sein, um aus einer Gruppe auszutreten." +msgstr "Du musst angemeldet sein, um aus dieses Programm zu betrachten." #: actions/showapplication.php:157 #, fuzzy @@ -3421,9 +3434,8 @@ msgid "Name" msgstr "Name" #: actions/showapplication.php:178 lib/applicationeditform.php:222 -#, fuzzy msgid "Organization" -msgstr "Seitenerstellung" +msgstr "Organisation" #: actions/showapplication.php:187 actions/version.php:198 #: lib/applicationeditform.php:209 lib/groupeditform.php:172 @@ -3438,19 +3450,19 @@ msgstr "Statistiken" #: actions/showapplication.php:203 #, php-format msgid "Created by %1$s - %2$s access by default - %3$d users" -msgstr "" +msgstr "Erstellt von %1$s - %2$s Standard Zugang - %3$d Benutzer" #: actions/showapplication.php:213 msgid "Application actions" -msgstr "" +msgstr "Programmaktionen" #: actions/showapplication.php:236 msgid "Reset key & secret" -msgstr "" +msgstr "Schlüssel zurücksetzen" #: actions/showapplication.php:261 msgid "Application info" -msgstr "" +msgstr "Programminformation" #: actions/showapplication.php:263 msgid "Consumer key" @@ -3462,32 +3474,32 @@ msgstr "" #: actions/showapplication.php:273 msgid "Request token URL" -msgstr "" +msgstr "Anfrage-Token Adresse" #: actions/showapplication.php:278 msgid "Access token URL" -msgstr "" +msgstr "Zugriffs-Token Adresse" #: actions/showapplication.php:283 -#, fuzzy msgid "Authorize URL" -msgstr "Autor" +msgstr "Autorisationadresse" #: actions/showapplication.php:288 msgid "" "Note: We support HMAC-SHA1 signatures. We do not support the plaintext " "signature method." msgstr "" +"Hinweis: Wir unterstützen HMAC-SHA1 Signaturen. Wir unterstützen keine " +"Klartext Signaturen." #: actions/showapplication.php:309 -#, fuzzy msgid "Are you sure you want to reset your consumer key and secret?" -msgstr "Bist du sicher, dass du diese Nachricht löschen möchtest?" +msgstr "Bist du sicher, dass du den Schlüssel zurücksetzen willst?" #: actions/showfavorites.php:79 -#, fuzzy, php-format +#, php-format msgid "%1$s's favorite notices, page %2$d" -msgstr "%ss favorisierte Nachrichten" +msgstr "%1$ss favorisierte Nachrichten, Seite %2$d" #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." @@ -3539,9 +3551,9 @@ msgid "%s group" msgstr "%s Gruppe" #: actions/showgroup.php:84 -#, fuzzy, php-format +#, php-format msgid "%1$s group, page %2$d" -msgstr "%s Gruppen-Mitglieder, Seite %d" +msgstr "%1$s Gruppe, Seite %d" #: actions/showgroup.php:226 msgid "Group profile" @@ -3559,7 +3571,7 @@ msgstr "Nachricht" #: actions/showgroup.php:292 lib/groupeditform.php:184 msgid "Aliases" -msgstr "" +msgstr "Pseudonyme" #: actions/showgroup.php:301 msgid "Group actions" @@ -3658,14 +3670,14 @@ msgid " tagged %s" msgstr "Nachrichten, die mit %s getagt sind" #: actions/showstream.php:79 -#, fuzzy, php-format +#, php-format msgid "%1$s, page %2$d" -msgstr "%s blockierte Benutzerprofile, Seite %d" +msgstr "%1$s, Seite %2$d" #: actions/showstream.php:122 -#, fuzzy, php-format +#, php-format msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" -msgstr "Nachrichtenfeed der Gruppe %s" +msgstr "Nachrichtenfeed für %1$s tagged %2$s (RSS 1.0)" #: actions/showstream.php:129 #, php-format @@ -3688,10 +3700,10 @@ msgid "FOAF for %s" msgstr "FOAF von %s" #: actions/showstream.php:200 -#, fuzzy, php-format +#, php-format msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet." msgstr "" -"Dies ist die Zeitleiste für %s und Freunde aber bisher hat niemand etwas " +"Dies ist die Zeitleiste für %1$s und Freunde aber bisher hat niemand etwas " "gepostet." #: actions/showstream.php:205 @@ -3699,16 +3711,17 @@ msgid "" "Seen anything interesting recently? You haven't posted any notices yet, now " "would be a good time to start :)" msgstr "" +"In letzter Zeit irgendwas interessantes erlebt? Du hast noch nichts " +"geschrieben, jetzt wäre doch ein guter Zeitpunkt los zu legen :)" #: actions/showstream.php:207 -#, fuzzy, php-format +#, php-format msgid "" "You can try to nudge %1$s or [post something to his or her attention](%%%%" "action.newnotice%%%%?status_textarea=%2$s)." msgstr "" -"Du kannst [%s in seinem Profil einen Stups geben](../%s) oder [ihm etwas " -"posten](%%%%action.newnotice%%%%?status_textarea=%s) um seine Aufmerksamkeit " -"zu erregen." +"Du kannst %1$s in seinem Profil einen Stups geben oder [ihm etwas posten](%%%" +"%action.newnotice%%%%?status_textarea=%s) um seine Aufmerksamkeit zu erregen." #: actions/showstream.php:243 #, php-format @@ -3744,7 +3757,6 @@ msgid "User is already silenced." msgstr "Nutzer ist bereits ruhig gestellt." #: actions/siteadminpanel.php:69 -#, fuzzy msgid "Basic settings for this StatusNet site" msgstr "Grundeinstellungen für diese StatusNet Seite." @@ -3767,7 +3779,7 @@ msgstr "Minimale Textlänge ist 140 Zeichen." #: actions/siteadminpanel.php:171 msgid "Dupe limit must 1 or more seconds." -msgstr "" +msgstr "Duplikatlimit muss mehr als 1 Sekunde sein" #: actions/siteadminpanel.php:221 msgid "General" @@ -3783,19 +3795,21 @@ msgstr "Der Name deiner Seite, sowas wie \"DeinUnternehmen Mircoblog\"" #: actions/siteadminpanel.php:229 msgid "Brought by" -msgstr "" +msgstr "Erstellt von" #: actions/siteadminpanel.php:230 msgid "Text used for credits link in footer of each page" msgstr "" +"Text der für den Credit-Link im Fußbereich auf jeder Seite benutzt wird" #: actions/siteadminpanel.php:234 msgid "Brought by URL" -msgstr "" +msgstr "Erstellt von Adresse" #: actions/siteadminpanel.php:235 msgid "URL used for credits link in footer of each page" msgstr "" +"Adresse die für den Credit-Link im Fußbereich auf jeder Seite benutzt wird" #: actions/siteadminpanel.php:239 msgid "Contact email address for your site" @@ -3869,9 +3883,8 @@ msgid "Site-wide notice text (255 chars max; HTML okay)" msgstr "Systembenachrichtigung (max. 255 Zeichen; HTML erlaubt)" #: actions/sitenoticeadminpanel.php:198 -#, fuzzy msgid "Save site notice" -msgstr "Seitennachricht" +msgstr "Systemnachricht speichern" #: actions/smssettings.php:58 msgid "SMS settings" @@ -4010,7 +4023,7 @@ msgstr "" #: actions/snapshotadminpanel.php:208 msgid "When to send statistical data to status.net servers" -msgstr "" +msgstr "Wann sollen Statistiken zum status.net Server geschickt werden" #: actions/snapshotadminpanel.php:217 msgid "Frequency" @@ -4162,9 +4175,8 @@ msgid "Notice feed for tag %s (Atom)" msgstr "Nachrichten Feed für Tag %s (Atom)" #: actions/tagother.php:39 -#, fuzzy msgid "No ID argument." -msgstr "Kein id Argument." +msgstr "Kein ID Argument." #: actions/tagother.php:65 #, php-format @@ -4222,9 +4234,8 @@ msgid "You haven't blocked that user." msgstr "Du hast diesen Benutzer nicht blockiert." #: actions/unsandbox.php:72 -#, fuzzy msgid "User is not sandboxed." -msgstr "Dieser Benutzer hat dich blockiert." +msgstr "Benutzer ist nicht blockiert." #: actions/unsilence.php:72 msgid "User is not silenced." @@ -4239,12 +4250,12 @@ msgid "Unsubscribed" msgstr "Abbestellt" #: actions/updateprofile.php:64 actions/userauthorization.php:337 -#, fuzzy, php-format +#, php-format msgid "" "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" -"Die Nachrichtenlizenz '%s' ist nicht kompatibel mit der Lizenz der Seite '%" -"s'." +"Die Benutzerlizenz ‘%1$s’ ist nicht kompatibel mit der Lizenz der Seite ‘%2" +"$s’." #. TRANS: User admin panel title #: actions/useradminpanel.php:59 @@ -4276,11 +4287,11 @@ msgstr "Profil" #: actions/useradminpanel.php:222 msgid "Bio Limit" -msgstr "" +msgstr "Bio Limit" #: actions/useradminpanel.php:223 msgid "Maximum length of a profile bio in characters." -msgstr "" +msgstr "Maximale Länge in Zeichen der Profil Bio." #: actions/useradminpanel.php:231 msgid "New users" @@ -4372,14 +4383,13 @@ msgid "Subscription rejected" msgstr "Abonnement abgelehnt" #: actions/userauthorization.php:268 -#, 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 "" "Das Abonnement wurde abgelehnt, aber es wurde keine Callback-URL " -"zurückgegeben. Lies nochmal die Anweisungen der Site, wie Abonnements " +"zurückgegeben. Lies nochmal die Anweisungen der Seite, wie Abonnements " "vollständig abgelehnt werden. Dein Abonnement-Token ist:" #: actions/userauthorization.php:303 @@ -4400,7 +4410,7 @@ msgstr "" #: actions/userauthorization.php:329 #, php-format msgid "Profile URL ‘%s’ is for a local user." -msgstr "" +msgstr "Profiladresse '%s' ist für einen lokalen Benutzer." #: actions/userauthorization.php:345 #, php-format @@ -4453,7 +4463,7 @@ msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" "Versuche [Gruppen zu finden](%%action.groupsearch%%) und diesen beizutreten." -#: actions/userrss.php:92 lib/atomgroupnoticefeed.php:66 +#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66 #: lib/atomusernoticefeed.php:72 #, php-format msgid "Updates from %1$s on %2$s!" @@ -4503,6 +4513,8 @@ msgid "" "You should have received a copy of the GNU Affero General Public License " "along with this program. If not, see %s." msgstr "" +"Du hast eine Kopie der GNU Affero General Public License zusammen mit diesem " +"Programm erhalten. Wenn nicht, siehe %s." #: actions/version.php:189 msgid "Plugins" @@ -4522,16 +4534,20 @@ msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" +"Keine Datei darf größer als %d Bytes sein und die Datei die du verschicken " +"wolltest ist %d Bytes groß. Bitte eine kleinere Datei hoch laden." #: classes/File.php:154 #, php-format msgid "A file this large would exceed your user quota of %d bytes." -msgstr "" +msgstr "Eine Datei dieser Größe überschreitet deine User Quota von %d Byte." #: classes/File.php:161 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" +"Eine Datei dieser Größe würde deine monatliche Quota von %d Byte " +"überschreiten." #: classes/Group_member.php:41 msgid "Group join failed." @@ -4587,7 +4603,6 @@ msgstr "" "ein paar Minuten ab." #: classes/Notice.php:256 -#, fuzzy msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4631,14 +4646,12 @@ msgid "Not subscribed!" msgstr "Nicht abonniert!" #: classes/Subscription.php:163 -#, fuzzy msgid "Couldn't delete self-subscription." msgstr "Konnte Abonnement nicht löschen." #: classes/Subscription.php:190 -#, fuzzy msgid "Couldn't delete subscription OMB token." -msgstr "Konnte Abonnement nicht löschen." +msgstr "Konnte OMB-Abonnement nicht löschen." #: classes/Subscription.php:201 lib/subs.php:69 msgid "Couldn't delete subscription." @@ -4727,10 +4740,9 @@ msgstr "Ändere deine E-Mail, Avatar, Passwort und Profil" #. TRANS: Tooltip for main menu option "Services" #: lib/action.php:440 -#, fuzzy msgctxt "TOOLTIP" msgid "Connect to services" -msgstr "Konnte nicht zum Server umleiten: %s" +msgstr "Zum Dienst verbinden" #: lib/action.php:443 msgid "Connect" @@ -4738,10 +4750,9 @@ msgstr "Verbinden" #. TRANS: Tooltip for menu option "Admin" #: lib/action.php:446 -#, fuzzy msgctxt "TOOLTIP" msgid "Change site configuration" -msgstr "Hauptnavigation" +msgstr "Seiteneinstellung ändern" #: lib/action.php:449 msgctxt "MENU" @@ -4862,9 +4873,8 @@ msgid "Contact" msgstr "Kontakt" #: lib/action.php:771 -#, fuzzy msgid "Badge" -msgstr "Stups" +msgstr "Plakette" #: lib/action.php:799 msgid "StatusNet software license" @@ -4908,6 +4918,8 @@ msgstr "" #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" +"Inhalt und Daten urheberrechtlich geschützt durch %1$s. Alle Rechte " +"vorbehalten." #: lib/action.php:834 msgid "Content and data copyright by contributors. All rights reserved." @@ -4939,7 +4951,7 @@ msgstr "" #: lib/activity.php:481 msgid "Can't handle embedded XML content yet." -msgstr "" +msgstr "Kann eingebundenen XML Inhalt nicht verarbeiten." #: lib/activity.php:485 msgid "Can't handle embedded Base64 content yet." @@ -4947,15 +4959,13 @@ msgstr "" #. TRANS: Client error message #: lib/adminpanelaction.php:98 -#, fuzzy msgid "You cannot make changes to this site." -msgstr "Du kannst diesem Benutzer keine Nachricht schicken." +msgstr "Du kannst keine Änderungen an dieser Seite vornehmen." #. TRANS: Client error message #: lib/adminpanelaction.php:110 -#, fuzzy msgid "Changes to that panel are not allowed." -msgstr "Registrierung nicht gestattet" +msgstr "Änderungen an dieser Seite sind nicht erlaubt." #. TRANS: Client error message #: lib/adminpanelaction.php:229 @@ -4985,9 +4995,8 @@ msgstr "Seite" #. TRANS: Menu item title/tooltip #: lib/adminpanelaction.php:356 -#, fuzzy msgid "Design configuration" -msgstr "SMS-Konfiguration" +msgstr "Motiv-Konfiguration" #. TRANS: Menu item for site administration #: lib/adminpanelaction.php:358 @@ -5007,15 +5016,13 @@ msgstr "Benutzer" #. TRANS: Menu item title/tooltip #: lib/adminpanelaction.php:372 -#, fuzzy msgid "Access configuration" -msgstr "SMS-Konfiguration" +msgstr "Zugangskonfiguration" #. TRANS: Menu item title/tooltip #: lib/adminpanelaction.php:380 -#, fuzzy msgid "Paths configuration" -msgstr "SMS-Konfiguration" +msgstr "Pfadkonfiguration" #. TRANS: Menu item title/tooltip #: lib/adminpanelaction.php:388 @@ -5024,9 +5031,8 @@ msgstr "Sitzungseinstellungen" #. TRANS: Menu item title/tooltip #: lib/adminpanelaction.php:396 -#, fuzzy msgid "Edit site notice" -msgstr "Seitennachricht" +msgstr "Seitennachricht bearbeiten" #. TRANS: Menu item title/tooltip #: lib/adminpanelaction.php:404 @@ -5052,33 +5058,29 @@ msgid "Icon for this application" msgstr "Programmsymbol" #: lib/applicationeditform.php:204 -#, fuzzy, php-format +#, php-format msgid "Describe your application in %d characters" -msgstr "Beschreibe die Gruppe oder das Thema in 140 Zeichen" +msgstr "Beschreibe dein Programm in %d Zeichen" #: lib/applicationeditform.php:207 -#, fuzzy msgid "Describe your application" -msgstr "Beschreibe die Gruppe oder das Thema in 140 Zeichen" +msgstr "Beschreibe dein Programm" #: lib/applicationeditform.php:216 -#, fuzzy msgid "Source URL" -msgstr "Quellcode" +msgstr "Quelladresse" #: lib/applicationeditform.php:218 -#, fuzzy msgid "URL of the homepage of this application" -msgstr "URL der Homepage oder Blogs der Gruppe oder des Themas" +msgstr "Adresse der Homepage dieses Programms" #: lib/applicationeditform.php:224 msgid "Organization responsible for this application" msgstr "" #: lib/applicationeditform.php:230 -#, fuzzy msgid "URL for the homepage of the organization" -msgstr "URL der Homepage oder Blogs der Gruppe oder des Themas" +msgstr "Homepage der Gruppe oder des Themas" #: lib/applicationeditform.php:236 msgid "URL to redirect to after authentication" @@ -5090,11 +5092,11 @@ msgstr "Browser" #: lib/applicationeditform.php:274 msgid "Desktop" -msgstr "" +msgstr "Arbeitsfläche" #: lib/applicationeditform.php:275 msgid "Type of application, browser or desktop" -msgstr "" +msgstr "Typ der Anwendung, Browser oder Arbeitsfläche" #: lib/applicationeditform.php:297 msgid "Read-only" @@ -5107,9 +5109,10 @@ msgstr "Lese/Schreibzugriff" #: lib/applicationeditform.php:316 msgid "Default access for this application: read-only, or read-write" msgstr "" +"Standardeinstellung dieses Programms: Schreibgeschützt oder Lese/" +"Schreibzugriff" #: lib/applicationlist.php:154 -#, fuzzy msgid "Revoke" msgstr "Entfernen" @@ -5138,9 +5141,8 @@ msgid "Password changing failed" msgstr "Passwort konnte nicht geändert werden" #: lib/authenticationplugin.php:235 -#, fuzzy msgid "Password changing is not allowed" -msgstr "Passwort geändert" +msgstr "Passwort kann nicht geändert werden" #: lib/channel.php:138 lib/channel.php:158 msgid "Command results" @@ -5165,12 +5167,12 @@ msgstr "Die bestätigte E-Mail-Adresse konnte nicht gespeichert werden." #: lib/command.php:92 msgid "It does not make a lot of sense to nudge yourself!" -msgstr "" +msgstr "Es macht keinen Sinn dich selbst anzustupsen!" #: lib/command.php:99 -#, fuzzy, php-format +#, php-format msgid "Nudge sent to %s" -msgstr "Stups abgeschickt" +msgstr "Stups an %s geschickt" #: lib/command.php:126 #, php-format @@ -5225,12 +5227,12 @@ msgstr "%s hat die Gruppe %s verlassen" msgid "Fullname: %s" msgstr "Vollständiger Name: %s" -#: lib/command.php:312 lib/mail.php:254 +#: lib/command.php:312 lib/mail.php:258 #, php-format msgid "Location: %s" msgstr "Standort: %s" -#: lib/command.php:315 lib/mail.php:256 +#: lib/command.php:315 lib/mail.php:260 #, php-format msgid "Homepage: %s" msgstr "Homepage: %s" @@ -5263,19 +5265,18 @@ msgid "Already repeated that notice" msgstr "Nachricht bereits wiederholt" #: lib/command.php:426 -#, fuzzy, php-format +#, php-format msgid "Notice from %s repeated" -msgstr "Nachricht hinzugefügt" +msgstr "Nachricht von %s wiederholt" #: lib/command.php:428 -#, fuzzy msgid "Error repeating notice." -msgstr "Problem beim Speichern der Nachricht." +msgstr "Fehler beim Wiederholen der Nachricht" #: lib/command.php:482 -#, fuzzy, php-format +#, php-format msgid "Notice too long - maximum is %d characters, you sent %d" -msgstr "Nachricht zu lange - maximal 140 Zeichen erlaubt, du hast %s gesendet" +msgstr "Nachricht zu lange - maximal %d Zeichen erlaubt, du hast %d gesendet" #: lib/command.php:491 #, php-format @@ -5330,12 +5331,12 @@ msgstr "Konnte Benachrichtigung nicht aktivieren." #: lib/command.php:654 msgid "Login command is disabled" -msgstr "" +msgstr "Anmeldung ist abgeschaltet" #: lib/command.php:665 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" -msgstr "" +msgstr "Der Link ist nur einmal benutzbar und für eine Dauer von 2 Minuten: %s" #: lib/command.php:692 #, php-format @@ -5343,9 +5344,8 @@ msgid "Unsubscribed %s" msgstr "%s nicht mehr abonniert" #: lib/command.php:709 -#, fuzzy msgid "You are not subscribed to anyone." -msgstr "Du hast dieses Profil nicht abonniert." +msgstr "Du hast niemanden abonniert." #: lib/command.php:711 msgid "You are subscribed to this person:" @@ -5425,12 +5425,11 @@ msgstr "Ich habe an folgenden Stellen nach Konfigurationsdateien gesucht: " #: lib/common.php:151 msgid "You may wish to run the installer to fix this." -msgstr "" +msgstr "Bitte die Installation erneut starten um das Problem zu beheben." #: lib/common.php:152 -#, fuzzy msgid "Go to the installer." -msgstr "Auf der Seite anmelden" +msgstr "Zur Installation gehen." #: lib/connectsettingsaction.php:110 msgid "IM" @@ -5445,13 +5444,12 @@ msgid "Updates by SMS" msgstr "Aktualisierungen via SMS" #: lib/connectsettingsaction.php:120 -#, fuzzy msgid "Connections" -msgstr "Verbinden" +msgstr "Verbindungen" #: lib/connectsettingsaction.php:121 msgid "Authorized connected applications" -msgstr "" +msgstr "Programme mit Zugriffserlaubnis" #: lib/dberroraction.php:60 msgid "Database error" @@ -5473,12 +5471,10 @@ msgid "Design defaults restored." msgstr "Standard Design wieder hergestellt." #: lib/disfavorform.php:114 lib/disfavorform.php:140 -#, fuzzy msgid "Disfavor this notice" msgstr "Aus Favoriten entfernen" #: lib/favorform.php:114 lib/favorform.php:140 -#, fuzzy msgid "Favor this notice" msgstr "Zu den Favoriten hinzufügen" @@ -5515,16 +5511,14 @@ msgid "All" msgstr "Alle" #: lib/galleryaction.php:139 -#, fuzzy msgid "Select tag to filter" -msgstr "Wähle einen Netzanbieter" +msgstr "Wähle ein Stichwort, um die Liste einzuschränken" #: lib/galleryaction.php:140 msgid "Tag" msgstr "Stichwort" #: lib/galleryaction.php:141 -#, fuzzy msgid "Choose a tag to narrow list" msgstr "Wähle ein Stichwort, um die Liste einzuschränken" @@ -5535,22 +5529,20 @@ msgstr "Los geht's" #: lib/grantroleform.php:91 #, php-format msgid "Grant this user the \"%s\" role" -msgstr "" +msgstr "Teile dem Benutzer die \"%s\" Rolle zu" #: lib/groupeditform.php:163 -#, fuzzy msgid "URL of the homepage or blog of the group or topic" -msgstr "URL der Homepage oder Blogs der Gruppe oder des Themas" +msgstr "Adresse der Homepage oder Blogs der Gruppe oder des Themas" #: lib/groupeditform.php:168 -#, fuzzy msgid "Describe the group or topic" -msgstr "Beschreibe die Gruppe oder das Thema in 140 Zeichen" +msgstr "Beschreibe die Gruppe oder das Thema" #: lib/groupeditform.php:170 -#, fuzzy, php-format +#, php-format msgid "Describe the group or topic in %d characters" -msgstr "Beschreibe die Gruppe oder das Thema in 140 Zeichen" +msgstr "Beschreibe die Gruppe oder das Thema in %d Zeichen" #: lib/groupeditform.php:179 msgid "" @@ -5675,11 +5667,11 @@ msgstr "Mit Nutzernamen und Passwort anmelden" msgid "Sign up for a new account" msgstr "Registriere ein neues Nutzerkonto" -#: lib/mail.php:172 +#: lib/mail.php:173 msgid "Email address confirmation" msgstr "Bestätigung der E-Mail-Adresse" -#: lib/mail.php:174 +#: lib/mail.php:175 #, php-format msgid "" "Hey, %s.\n" @@ -5709,12 +5701,12 @@ msgstr "" "Vielen Dank!\n" "%s\n" -#: lib/mail.php:236 +#: lib/mail.php:240 #, php-format msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s hat deine Nachrichten auf %2$s abonniert." -#: lib/mail.php:241 +#: lib/mail.php:245 #, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -5740,17 +5732,17 @@ msgstr "" "Du kannst Deine E-Mail-Adresse und die Benachrichtigungseinstellungen auf %8" "$s ändern.\n" -#: lib/mail.php:258 +#: lib/mail.php:262 #, php-format msgid "Bio: %s" msgstr "Biografie: %s" -#: lib/mail.php:286 +#: lib/mail.php:290 #, php-format msgid "New email address for posting to %s" msgstr "Neue E-Mail-Adresse um auf %s zu schreiben" -#: lib/mail.php:289 +#: lib/mail.php:293 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5771,21 +5763,21 @@ msgstr "" "Viele Grüße,\n" "%4$s" -#: lib/mail.php:413 +#: lib/mail.php:417 #, php-format msgid "%s status" msgstr "%s Status" -#: lib/mail.php:439 +#: lib/mail.php:443 msgid "SMS confirmation" msgstr "SMS-Konfiguration" -#: lib/mail.php:463 +#: lib/mail.php:467 #, php-format msgid "You've been nudged by %s" msgstr "Du wurdest von %s angestupst" -#: lib/mail.php:467 +#: lib/mail.php:471 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -5812,12 +5804,12 @@ msgstr "" "Mit freundlichen Grüßen,\n" "%4$s\n" -#: lib/mail.php:510 +#: lib/mail.php:517 #, php-format msgid "New private message from %s" msgstr "Neue private Nachricht von %s" -#: lib/mail.php:514 +#: lib/mail.php:521 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -5850,12 +5842,12 @@ msgstr "" "Mit freundlichen Grüßen,\n" "%5$s\n" -#: lib/mail.php:559 +#: lib/mail.php:568 #, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%s (@%s) hat deine Nachricht als Favorit gespeichert" -#: lib/mail.php:561 +#: lib/mail.php:570 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -5876,12 +5868,13 @@ msgid "" "%6$s\n" msgstr "" -#: lib/mail.php:624 +#: lib/mail.php:635 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "" +"%s (@%s) hat dir eine Nachricht gesendet um deine Aufmerksamkeit zu erlangen" -#: lib/mail.php:626 +#: lib/mail.php:637 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -5972,11 +5965,11 @@ msgstr "Upload der Datei wurde wegen der Dateiendung gestoppt." #: lib/mediafile.php:179 lib/mediafile.php:216 msgid "File exceeds user's quota." -msgstr "" +msgstr "Dateigröße liegt über dem Benutzerlimit" #: lib/mediafile.php:196 lib/mediafile.php:233 msgid "File could not be moved to destination directory." -msgstr "" +msgstr "Datei konnte nicht in das Zielverzeichnis verschoben werden." #: lib/mediafile.php:201 lib/mediafile.php:237 #, fuzzy @@ -5986,12 +5979,12 @@ msgstr "Konnte öffentlichen Stream nicht abrufen." #: lib/mediafile.php:270 #, php-format msgid " Try using another %s format." -msgstr "" +msgstr "Versuche ein anderes %s Format." #: lib/mediafile.php:275 #, php-format msgid "%s is not a supported file type on this server." -msgstr "" +msgstr "%s ist kein unterstütztes Dateiformat auf diesem Server." #: lib/messageform.php:120 msgid "Send a direct notice" @@ -6040,6 +6033,8 @@ msgid "" "Sorry, retrieving your geo location is taking longer than expected, please " "try again later" msgstr "" +"Es tut uns Leid, aber die Abfrage deiner GPS Position hat zu lange gedauert. " +"Bitte versuche es später wieder." #: lib/noticelist.php:429 #, php-format @@ -6111,9 +6106,8 @@ msgid "Error inserting remote profile" msgstr "Fehler beim Einfügen des entfernten Profils" #: lib/oauthstore.php:345 -#, fuzzy msgid "Duplicate notice" -msgstr "Notiz löschen" +msgstr "Doppelte Nachricht" #: lib/oauthstore.php:490 msgid "Couldn't insert new subscription." @@ -6153,7 +6147,6 @@ msgid "Tags in %s's notices" msgstr "Stichworte in %ss Nachrichten" #: lib/plugin.php:114 -#, fuzzy msgid "Unknown" msgstr "Unbekannter Befehl" @@ -6192,7 +6185,7 @@ msgstr "Kein id Argument." #: lib/profileformaction.php:137 msgid "Unimplemented method." -msgstr "" +msgstr "Nicht unterstützte Methode." #: lib/publicgroupnav.php:78 msgid "Public" @@ -6223,9 +6216,9 @@ msgid "Repeat this notice" msgstr "Diese Nachricht wiederholen" #: lib/revokeroleform.php:91 -#, fuzzy, php-format +#, php-format msgid "Revoke the \"%s\" role from this user" -msgstr "Diesen Nutzer von der Gruppe sperren" +msgstr "Widerrufe die \"%s\" Rolle von diesem Benutzer" #: lib/router.php:671 msgid "No single user defined for single-user mode." @@ -6245,16 +6238,15 @@ msgstr "Site durchsuchen" #: lib/searchaction.php:126 msgid "Keyword(s)" -msgstr "" +msgstr "Stichwort/Stichwörter" #: lib/searchaction.php:127 msgid "Search" msgstr "Suchen" #: lib/searchaction.php:162 -#, fuzzy msgid "Search help" -msgstr "Suchen" +msgstr "Hilfe suchen" #: lib/searchgroupnav.php:80 msgid "People" @@ -6278,7 +6270,7 @@ msgstr "Abschnitt ohne Titel" #: lib/section.php:106 msgid "More..." -msgstr "" +msgstr "Mehr..." #: lib/silenceform.php:67 msgid "Silence" @@ -6383,21 +6375,18 @@ msgid "Moderate" msgstr "Moderieren" #: lib/userprofile.php:352 -#, fuzzy msgid "User role" -msgstr "Benutzerprofil" +msgstr "Benutzerrolle" #: lib/userprofile.php:354 -#, fuzzy msgctxt "role" msgid "Administrator" -msgstr "Administratoren" +msgstr "Administrator" #: lib/userprofile.php:355 -#, fuzzy msgctxt "role" msgid "Moderator" -msgstr "Moderieren" +msgstr "Moderator" #: lib/util.php:1015 msgid "a few seconds ago" diff --git a/locale/el/LC_MESSAGES/statusnet.po b/locale/el/LC_MESSAGES/statusnet.po index 34c193e29..0ebe84fe7 100644 --- a/locale/el/LC_MESSAGES/statusnet.po +++ b/locale/el/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-04 18:55+0000\n" -"PO-Revision-Date: 2010-03-05 22:35:20+0000\n" +"POT-Creation-Date: 2010-03-06 23:49+0000\n" +"PO-Revision-Date: 2010-03-06 23:49:37+0000\n" "Language-Team: Greek\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63298); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: el\n" "X-Message-Group: out-statusnet\n" @@ -105,7 +105,7 @@ msgstr "Δεν υπάρχει τέτοια σελίδα" #: actions/otp.php:76 actions/remotesubscribe.php:145 #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 +#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:302 #: lib/command.php:355 lib/command.php:401 lib/command.php:462 #: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82 @@ -695,7 +695,7 @@ msgstr "" msgid "Notices tagged with %s" msgstr "" -#: actions/apitimelinetag.php:104 actions/tagrss.php:64 +#: actions/apitimelinetag.php:104 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "" @@ -735,7 +735,7 @@ msgstr "" #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 #: actions/remotesubscribe.php:191 actions/userauthorization.php:72 -#: actions/userrss.php:103 +#: actions/userrss.php:106 msgid "User without matching profile" msgstr "" @@ -1748,7 +1748,7 @@ msgstr "Διαχειριστής" msgid "Make this user an admin" msgstr "" -#: actions/grouprss.php:138 actions/userrss.php:90 +#: actions/grouprss.php:138 actions/userrss.php:93 #: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67 #, php-format msgid "%s timeline" @@ -4349,7 +4349,7 @@ msgstr "" msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" -#: actions/userrss.php:92 lib/atomgroupnoticefeed.php:66 +#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66 #: lib/atomusernoticefeed.php:72 #, php-format msgid "Updates from %1$s on %2$s!" @@ -5119,12 +5119,12 @@ msgstr "ομάδες των χρηστών %s" msgid "Fullname: %s" msgstr "Ονοματεπώνυμο" -#: lib/command.php:312 lib/mail.php:254 +#: lib/command.php:312 lib/mail.php:258 #, php-format msgid "Location: %s" msgstr "" -#: lib/command.php:315 lib/mail.php:256 +#: lib/command.php:315 lib/mail.php:260 #, php-format msgid "Homepage: %s" msgstr "" @@ -5565,11 +5565,11 @@ msgstr "Σύνδεση με όνομα χρήστη και κωδικό" msgid "Sign up for a new account" msgstr "Εγγραφή για ένα νέο λογαριασμό" -#: lib/mail.php:172 +#: lib/mail.php:173 msgid "Email address confirmation" msgstr "Επιβεβαίωση διεύθυνσης email" -#: lib/mail.php:174 +#: lib/mail.php:175 #, php-format msgid "" "Hey, %s.\n" @@ -5586,12 +5586,12 @@ msgid "" "%s\n" msgstr "" -#: lib/mail.php:236 +#: lib/mail.php:240 #, php-format msgid "%1$s is now listening to your notices on %2$s." msgstr "" -#: lib/mail.php:241 +#: lib/mail.php:245 #, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -5606,19 +5606,19 @@ msgid "" "Change your email address or notification options at %8$s\n" msgstr "" -#: lib/mail.php:258 +#: lib/mail.php:262 #, fuzzy, php-format msgid "Bio: %s" msgstr "" "Βιογραφικό: %s\n" "\n" -#: lib/mail.php:286 +#: lib/mail.php:290 #, php-format msgid "New email address for posting to %s" msgstr "" -#: lib/mail.php:289 +#: lib/mail.php:293 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5631,21 +5631,21 @@ msgid "" "%4$s" msgstr "" -#: lib/mail.php:413 +#: lib/mail.php:417 #, php-format msgid "%s status" msgstr "Κατάσταση του/της %s" -#: lib/mail.php:439 +#: lib/mail.php:443 msgid "SMS confirmation" msgstr "" -#: lib/mail.php:463 +#: lib/mail.php:467 #, php-format msgid "You've been nudged by %s" msgstr "" -#: lib/mail.php:467 +#: lib/mail.php:471 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -5661,12 +5661,12 @@ msgid "" "%4$s\n" msgstr "" -#: lib/mail.php:510 +#: lib/mail.php:517 #, php-format msgid "New private message from %s" msgstr "" -#: lib/mail.php:514 +#: lib/mail.php:521 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -5685,12 +5685,12 @@ msgid "" "%5$s\n" msgstr "" -#: lib/mail.php:559 +#: lib/mail.php:568 #, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "" -#: lib/mail.php:561 +#: lib/mail.php:570 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -5711,12 +5711,12 @@ msgid "" "%6$s\n" msgstr "" -#: lib/mail.php:624 +#: lib/mail.php:635 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "" -#: lib/mail.php:626 +#: lib/mail.php:637 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po index d5bb03f3e..8d846c4e2 100644 --- a/locale/en_GB/LC_MESSAGES/statusnet.po +++ b/locale/en_GB/LC_MESSAGES/statusnet.po @@ -2,6 +2,7 @@ # # Author@translatewiki.net: Bruce89 # Author@translatewiki.net: CiaranG +# Author@translatewiki.net: Reedy # -- # This file is distributed under the same license as the StatusNet package. # @@ -9,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-04 18:55+0000\n" -"PO-Revision-Date: 2010-03-05 22:35:23+0000\n" +"POT-Creation-Date: 2010-03-06 23:49+0000\n" +"PO-Revision-Date: 2010-03-06 23:49:40+0000\n" "Language-Team: British English\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63298); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: en-gb\n" "X-Message-Group: out-statusnet\n" @@ -103,7 +104,7 @@ msgstr "No such page" #: actions/otp.php:76 actions/remotesubscribe.php:145 #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 +#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:302 #: lib/command.php:355 lib/command.php:401 lib/command.php:462 #: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82 @@ -697,7 +698,7 @@ msgstr "Repeats of %s" msgid "Notices tagged with %s" msgstr "Notices tagged with %s" -#: actions/apitimelinetag.php:104 actions/tagrss.php:64 +#: actions/apitimelinetag.php:104 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Updates tagged with %1$s on %2$s!" @@ -737,7 +738,7 @@ msgstr "You can upload your personal avatar. The maximum file size is %s." #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 #: actions/remotesubscribe.php:191 actions/userauthorization.php:72 -#: actions/userrss.php:103 +#: actions/userrss.php:106 msgid "User without matching profile" msgstr "User without matching profile" @@ -1734,7 +1735,7 @@ msgstr "Make admin" msgid "Make this user an admin" msgstr "Make this user an admin" -#: actions/grouprss.php:138 actions/userrss.php:90 +#: actions/grouprss.php:138 actions/userrss.php:93 #: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67 #, php-format msgid "%s timeline" @@ -4366,6 +4367,8 @@ msgid "" "Customize the way your profile looks with a background image and a colour " "palette of your choice." msgstr "" +"Customise the way your profile looks with a background image and a colour " +"palette of your choice." #: actions/userdesignsettings.php:282 msgid "Enjoy your hotdog!" @@ -4390,7 +4393,7 @@ msgstr "%s is not a member of any group." msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" -#: actions/userrss.php:92 lib/atomgroupnoticefeed.php:66 +#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66 #: lib/atomusernoticefeed.php:72 #, php-format msgid "Updates from %1$s on %2$s!" @@ -5162,12 +5165,12 @@ msgstr "%s left group %s" msgid "Fullname: %s" msgstr "Fullname: %s" -#: lib/command.php:312 lib/mail.php:254 +#: lib/command.php:312 lib/mail.php:258 #, php-format msgid "Location: %s" msgstr "Location: %s" -#: lib/command.php:315 lib/mail.php:256 +#: lib/command.php:315 lib/mail.php:260 #, php-format msgid "Homepage: %s" msgstr "Homepage: %s" @@ -5601,11 +5604,11 @@ msgstr "Login with a username and password" msgid "Sign up for a new account" msgstr "Sign up for a new account" -#: lib/mail.php:172 +#: lib/mail.php:173 msgid "Email address confirmation" msgstr "E-mail address confirmation" -#: lib/mail.php:174 +#: lib/mail.php:175 #, php-format msgid "" "Hey, %s.\n" @@ -5622,12 +5625,12 @@ msgid "" "%s\n" msgstr "" -#: lib/mail.php:236 +#: lib/mail.php:240 #, php-format msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s is now listening to your notices on %2$s." -#: lib/mail.php:241 +#: lib/mail.php:245 #, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -5652,17 +5655,17 @@ msgstr "" "----\n" "Change your email address or notification options at %8$s\n" -#: lib/mail.php:258 +#: lib/mail.php:262 #, php-format msgid "Bio: %s" msgstr "Bio: %s" -#: lib/mail.php:286 +#: lib/mail.php:290 #, php-format msgid "New email address for posting to %s" msgstr "New e-mail address for posting to %s" -#: lib/mail.php:289 +#: lib/mail.php:293 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5683,21 +5686,21 @@ msgstr "" "Faithfully yours,\n" "%4$s" -#: lib/mail.php:413 +#: lib/mail.php:417 #, php-format msgid "%s status" msgstr "%s status" -#: lib/mail.php:439 +#: lib/mail.php:443 msgid "SMS confirmation" msgstr "SMS confirmation" -#: lib/mail.php:463 +#: lib/mail.php:467 #, php-format msgid "You've been nudged by %s" msgstr "You've been nudged by %s" -#: lib/mail.php:467 +#: lib/mail.php:471 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -5713,12 +5716,12 @@ msgid "" "%4$s\n" msgstr "" -#: lib/mail.php:510 +#: lib/mail.php:517 #, php-format msgid "New private message from %s" msgstr "New private message from %s" -#: lib/mail.php:514 +#: lib/mail.php:521 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -5737,12 +5740,12 @@ msgid "" "%5$s\n" msgstr "" -#: lib/mail.php:559 +#: lib/mail.php:568 #, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%s (@%s) added your notice as a favorite" -#: lib/mail.php:561 +#: lib/mail.php:570 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -5763,12 +5766,12 @@ msgid "" "%6$s\n" msgstr "" -#: lib/mail.php:624 +#: lib/mail.php:635 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "" -#: lib/mail.php:626 +#: lib/mail.php:637 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po index 04e49bc11..cdc0184e4 100644 --- a/locale/es/LC_MESSAGES/statusnet.po +++ b/locale/es/LC_MESSAGES/statusnet.po @@ -13,12 +13,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-04 18:55+0000\n" -"PO-Revision-Date: 2010-03-05 22:35:26+0000\n" +"POT-Creation-Date: 2010-03-06 23:49+0000\n" +"PO-Revision-Date: 2010-03-06 23:49:43+0000\n" "Language-Team: Spanish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63298); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: es\n" "X-Message-Group: out-statusnet\n" @@ -107,7 +107,7 @@ msgstr "No existe tal página" #: actions/otp.php:76 actions/remotesubscribe.php:145 #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 +#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:302 #: lib/command.php:355 lib/command.php:401 lib/command.php:462 #: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82 @@ -707,7 +707,7 @@ msgstr "Repeticiones de %s" msgid "Notices tagged with %s" msgstr "Avisos marcados con %s" -#: actions/apitimelinetag.php:104 actions/tagrss.php:64 +#: actions/apitimelinetag.php:104 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Actualizaciones etiquetadas con %1$s en %2$s!" @@ -747,7 +747,7 @@ msgstr "Puedes subir tu imagen personal. El tamaño máximo de archivo es %s." #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 #: actions/remotesubscribe.php:191 actions/userauthorization.php:72 -#: actions/userrss.php:103 +#: actions/userrss.php:106 msgid "User without matching profile" msgstr "Usuario sin perfil equivalente" @@ -1753,7 +1753,7 @@ msgstr "Convertir en administrador" msgid "Make this user an admin" msgstr "Convertir a este usuario en administrador" -#: actions/grouprss.php:138 actions/userrss.php:90 +#: actions/grouprss.php:138 actions/userrss.php:93 #: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67 #, php-format msgid "%s timeline" @@ -4443,7 +4443,7 @@ msgstr "No eres miembro de ese grupo" msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" -#: actions/userrss.php:92 lib/atomgroupnoticefeed.php:66 +#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66 #: lib/atomusernoticefeed.php:72 #, php-format msgid "Updates from %1$s on %2$s!" @@ -5230,12 +5230,12 @@ msgstr "%s dejó grupo %s" msgid "Fullname: %s" msgstr "Nombre completo: %s" -#: lib/command.php:312 lib/mail.php:254 +#: lib/command.php:312 lib/mail.php:258 #, php-format msgid "Location: %s" msgstr "Lugar: %s" -#: lib/command.php:315 lib/mail.php:256 +#: lib/command.php:315 lib/mail.php:260 #, php-format msgid "Homepage: %s" msgstr "Página de inicio: %s" @@ -5677,11 +5677,11 @@ msgstr "Ingresar con un nombre de usuario y contraseña." msgid "Sign up for a new account" msgstr "Registrarse para una nueva cuenta" -#: lib/mail.php:172 +#: lib/mail.php:173 msgid "Email address confirmation" msgstr "Confirmación de correo electrónico" -#: lib/mail.php:174 +#: lib/mail.php:175 #, php-format msgid "" "Hey, %s.\n" @@ -5698,12 +5698,12 @@ msgid "" "%s\n" msgstr "" -#: lib/mail.php:236 +#: lib/mail.php:240 #, php-format msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s ahora está escuchando tus avisos en %2$s" -#: lib/mail.php:241 +#: lib/mail.php:245 #, fuzzy, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -5724,19 +5724,19 @@ msgstr "" "Atentamente,\n" "%4$s.\n" -#: lib/mail.php:258 +#: lib/mail.php:262 #, fuzzy, php-format msgid "Bio: %s" msgstr "" "Bio: %s\n" "\n" -#: lib/mail.php:286 +#: lib/mail.php:290 #, php-format msgid "New email address for posting to %s" msgstr "Nueva dirección de correo para postear a %s" -#: lib/mail.php:289 +#: lib/mail.php:293 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5757,21 +5757,21 @@ msgstr "" "Attentamente, \n" "%4$s" -#: lib/mail.php:413 +#: lib/mail.php:417 #, php-format msgid "%s status" msgstr "estado de %s" -#: lib/mail.php:439 +#: lib/mail.php:443 msgid "SMS confirmation" msgstr "SMS confirmación" -#: lib/mail.php:463 +#: lib/mail.php:467 #, php-format msgid "You've been nudged by %s" msgstr "%s te mandó un zumbido " -#: lib/mail.php:467 +#: lib/mail.php:471 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -5787,12 +5787,12 @@ msgid "" "%4$s\n" msgstr "" -#: lib/mail.php:510 +#: lib/mail.php:517 #, php-format msgid "New private message from %s" msgstr "Nuevo mensaje privado de %s" -#: lib/mail.php:514 +#: lib/mail.php:521 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -5811,12 +5811,12 @@ msgid "" "%5$s\n" msgstr "" -#: lib/mail.php:559 +#: lib/mail.php:568 #, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%s (@%s) agregó tu aviso como un favorito" -#: lib/mail.php:561 +#: lib/mail.php:570 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -5837,12 +5837,12 @@ msgid "" "%6$s\n" msgstr "" -#: lib/mail.php:624 +#: lib/mail.php:635 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "" -#: lib/mail.php:626 +#: lib/mail.php:637 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" diff --git a/locale/fa/LC_MESSAGES/statusnet.po b/locale/fa/LC_MESSAGES/statusnet.po index 8e2a72d04..955efd243 100644 --- a/locale/fa/LC_MESSAGES/statusnet.po +++ b/locale/fa/LC_MESSAGES/statusnet.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-04 18:55+0000\n" -"PO-Revision-Date: 2010-03-05 22:35:32+0000\n" +"POT-Creation-Date: 2010-03-06 23:49+0000\n" +"PO-Revision-Date: 2010-03-06 23:49:48+0000\n" "Last-Translator: Ahmad Sufi Mahmudi\n" "Language-Team: Persian\n" "MIME-Version: 1.0\n" @@ -20,7 +20,7 @@ msgstr "" "X-Language-Code: fa\n" "X-Message-Group: out-statusnet\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: MediaWiki 1.17alpha (r63298); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" #. TRANS: Page title @@ -109,7 +109,7 @@ msgstr "چنین صفحهای وجود ندارد" #: actions/otp.php:76 actions/remotesubscribe.php:145 #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 +#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:302 #: lib/command.php:355 lib/command.php:401 lib/command.php:462 #: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82 @@ -699,7 +699,7 @@ msgstr "تکرار %s" msgid "Notices tagged with %s" msgstr "پیامهایی که با %s نشانه گزاری شده اند." -#: actions/apitimelinetag.php:104 actions/tagrss.php:64 +#: actions/apitimelinetag.php:104 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "پیامهای نشانه گزاری شده با %1$s در %2$s" @@ -740,7 +740,7 @@ msgstr "" #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 #: actions/remotesubscribe.php:191 actions/userauthorization.php:72 -#: actions/userrss.php:103 +#: actions/userrss.php:106 msgid "User without matching profile" msgstr "کاربر بدون مشخصات" @@ -1750,7 +1750,7 @@ msgstr "مدیر شود" msgid "Make this user an admin" msgstr "این کاربر یک مدیر شود" -#: actions/grouprss.php:138 actions/userrss.php:90 +#: actions/grouprss.php:138 actions/userrss.php:93 #: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67 #, php-format msgid "%s timeline" @@ -4352,7 +4352,7 @@ msgstr "" msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" -#: actions/userrss.php:92 lib/atomgroupnoticefeed.php:66 +#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66 #: lib/atomusernoticefeed.php:72 #, php-format msgid "Updates from %1$s on %2$s!" @@ -5126,12 +5126,12 @@ msgstr "%s گروه %s را ترک کرد." msgid "Fullname: %s" msgstr "نام کامل : %s" -#: lib/command.php:312 lib/mail.php:254 +#: lib/command.php:312 lib/mail.php:258 #, php-format msgid "Location: %s" msgstr "موقعیت : %s" -#: lib/command.php:315 lib/mail.php:256 +#: lib/command.php:315 lib/mail.php:260 #, php-format msgid "Homepage: %s" msgstr "صفحه خانگی : %s" @@ -5567,11 +5567,11 @@ msgstr "وارد شدن با یک نام کاربری و کلمه ی عبور" msgid "Sign up for a new account" msgstr "عضویت برای حساب کاربری جدید" -#: lib/mail.php:172 +#: lib/mail.php:173 msgid "Email address confirmation" msgstr "تاییدیه ی آدرس ایمیل" -#: lib/mail.php:174 +#: lib/mail.php:175 #, php-format msgid "" "Hey, %s.\n" @@ -5588,12 +5588,12 @@ msgid "" "%s\n" msgstr "" -#: lib/mail.php:236 +#: lib/mail.php:240 #, php-format msgid "%1$s is now listening to your notices on %2$s." msgstr "%2$s از حالا به خبر های شما گوش میده %1$s" -#: lib/mail.php:241 +#: lib/mail.php:245 #, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -5608,17 +5608,17 @@ msgid "" "Change your email address or notification options at %8$s\n" msgstr "" -#: lib/mail.php:258 +#: lib/mail.php:262 #, fuzzy, php-format msgid "Bio: %s" msgstr "موقعیت : %s" -#: lib/mail.php:286 +#: lib/mail.php:290 #, php-format msgid "New email address for posting to %s" msgstr "%s ادرس ایمیل جدید برای" -#: lib/mail.php:289 +#: lib/mail.php:293 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5637,21 +5637,21 @@ msgstr "" ", ازروی وفاداری خود شما \n" "%4$s" -#: lib/mail.php:413 +#: lib/mail.php:417 #, php-format msgid "%s status" msgstr "وضعیت %s" -#: lib/mail.php:439 +#: lib/mail.php:443 msgid "SMS confirmation" msgstr "تایید پیامک" -#: lib/mail.php:463 +#: lib/mail.php:467 #, php-format msgid "You've been nudged by %s" msgstr "" -#: lib/mail.php:467 +#: lib/mail.php:471 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -5667,12 +5667,12 @@ msgid "" "%4$s\n" msgstr "" -#: lib/mail.php:510 +#: lib/mail.php:517 #, php-format msgid "New private message from %s" msgstr "" -#: lib/mail.php:514 +#: lib/mail.php:521 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -5691,12 +5691,12 @@ msgid "" "%5$s\n" msgstr "" -#: lib/mail.php:559 +#: lib/mail.php:568 #, php-format msgid "%s (@%s) added your notice as a favorite" msgstr " خبر شما را به علایق خود اضافه کرد %s (@%s)" -#: lib/mail.php:561 +#: lib/mail.php:570 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -5717,12 +5717,12 @@ msgid "" "%6$s\n" msgstr "" -#: lib/mail.php:624 +#: lib/mail.php:635 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "به توجه شما یک خبر فرستاده شده %s (@%s)" -#: lib/mail.php:626 +#: lib/mail.php:637 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po index dc707ff1b..68a63537b 100644 --- a/locale/fi/LC_MESSAGES/statusnet.po +++ b/locale/fi/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-04 18:55+0000\n" -"PO-Revision-Date: 2010-03-05 22:35:29+0000\n" +"POT-Creation-Date: 2010-03-06 23:49+0000\n" +"PO-Revision-Date: 2010-03-06 23:49:46+0000\n" "Language-Team: Finnish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63298); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: fi\n" "X-Message-Group: out-statusnet\n" @@ -110,7 +110,7 @@ msgstr "Sivua ei ole." #: actions/otp.php:76 actions/remotesubscribe.php:145 #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 +#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:302 #: lib/command.php:355 lib/command.php:401 lib/command.php:462 #: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82 @@ -717,7 +717,7 @@ msgstr "Vastaukset käyttäjälle %s" msgid "Notices tagged with %s" msgstr "Päivitykset joilla on tagi %s" -#: actions/apitimelinetag.php:104 actions/tagrss.php:64 +#: actions/apitimelinetag.php:104 actions/tagrss.php:65 #, fuzzy, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Käyttäjän %1$s päivitykset palvelussa %2$s!" @@ -757,7 +757,7 @@ msgstr "Voit ladata oman profiilikuvasi. Maksimikoko on %s." #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 #: actions/remotesubscribe.php:191 actions/userauthorization.php:72 -#: actions/userrss.php:103 +#: actions/userrss.php:106 msgid "User without matching profile" msgstr "Käyttäjälle ei löydy profiilia" @@ -1782,7 +1782,7 @@ msgstr "Tee ylläpitäjäksi" msgid "Make this user an admin" msgstr "Tee tästä käyttäjästä ylläpitäjä" -#: actions/grouprss.php:138 actions/userrss.php:90 +#: actions/grouprss.php:138 actions/userrss.php:93 #: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67 #, php-format msgid "%s timeline" @@ -4520,7 +4520,7 @@ msgstr "Sinä et kuulu tähän ryhmään." msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" -#: actions/userrss.php:92 lib/atomgroupnoticefeed.php:66 +#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66 #: lib/atomusernoticefeed.php:72 #, php-format msgid "Updates from %1$s on %2$s!" @@ -5318,12 +5318,12 @@ msgstr "%s erosi ryhmästä %s" msgid "Fullname: %s" msgstr "Koko nimi: %s" -#: lib/command.php:312 lib/mail.php:254 +#: lib/command.php:312 lib/mail.php:258 #, php-format msgid "Location: %s" msgstr "Kotipaikka: %s" -#: lib/command.php:315 lib/mail.php:256 +#: lib/command.php:315 lib/mail.php:260 #, php-format msgid "Homepage: %s" msgstr "Kotisivu: %s" @@ -5772,11 +5772,11 @@ msgstr "Kirjaudu sisään käyttäjätunnuksella ja salasanalla" msgid "Sign up for a new account" msgstr "Luo uusi käyttäjätili" -#: lib/mail.php:172 +#: lib/mail.php:173 msgid "Email address confirmation" msgstr "Sähköpostiosoitteen vahvistus" -#: lib/mail.php:174 +#: lib/mail.php:175 #, php-format msgid "" "Hey, %s.\n" @@ -5793,12 +5793,12 @@ msgid "" "%s\n" msgstr "" -#: lib/mail.php:236 +#: lib/mail.php:240 #, php-format msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s seuraa nyt päivityksiäsi palvelussa %2$s." -#: lib/mail.php:241 +#: lib/mail.php:245 #, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -5823,19 +5823,19 @@ msgstr "" "----\n" "Voit vaihtaa sähköpostiosoitetta tai ilmoitusasetuksiasi %8$s\n" -#: lib/mail.php:258 +#: lib/mail.php:262 #, fuzzy, php-format msgid "Bio: %s" msgstr "" "Tietoja: %s\n" "\n" -#: lib/mail.php:286 +#: lib/mail.php:290 #, php-format msgid "New email address for posting to %s" msgstr "Uusi sähköpostiosoite päivityksien lähettämiseen palveluun %s" -#: lib/mail.php:289 +#: lib/mail.php:293 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5856,21 +5856,21 @@ msgstr "" "Terveisin,\n" "%4$s" -#: lib/mail.php:413 +#: lib/mail.php:417 #, php-format msgid "%s status" msgstr "%s päivitys" -#: lib/mail.php:439 +#: lib/mail.php:443 msgid "SMS confirmation" msgstr "SMS vahvistus" -#: lib/mail.php:463 +#: lib/mail.php:467 #, php-format msgid "You've been nudged by %s" msgstr "%s tönäisi sinua" -#: lib/mail.php:467 +#: lib/mail.php:471 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -5886,12 +5886,12 @@ msgid "" "%4$s\n" msgstr "" -#: lib/mail.php:510 +#: lib/mail.php:517 #, php-format msgid "New private message from %s" msgstr "Uusi yksityisviesti käyttäjältä %s" -#: lib/mail.php:514 +#: lib/mail.php:521 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -5910,12 +5910,12 @@ msgid "" "%5$s\n" msgstr "" -#: lib/mail.php:559 +#: lib/mail.php:568 #, fuzzy, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%s lisäsi päivityksesi suosikkeihinsa" -#: lib/mail.php:561 +#: lib/mail.php:570 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -5936,12 +5936,12 @@ msgid "" "%6$s\n" msgstr "" -#: lib/mail.php:624 +#: lib/mail.php:635 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "" -#: lib/mail.php:626 +#: lib/mail.php:637 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po index 1965123ea..4c9429e21 100644 --- a/locale/fr/LC_MESSAGES/statusnet.po +++ b/locale/fr/LC_MESSAGES/statusnet.po @@ -14,12 +14,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-04 18:55+0000\n" -"PO-Revision-Date: 2010-03-05 22:35:34+0000\n" +"POT-Creation-Date: 2010-03-06 23:49+0000\n" +"PO-Revision-Date: 2010-03-06 23:49:51+0000\n" "Language-Team: French\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63298); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: fr\n" "X-Message-Group: out-statusnet\n" @@ -106,7 +106,7 @@ msgstr "Page non trouvée" #: actions/otp.php:76 actions/remotesubscribe.php:145 #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 +#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:302 #: lib/command.php:355 lib/command.php:401 lib/command.php:462 #: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82 @@ -713,7 +713,7 @@ msgstr "Reprises de %s" msgid "Notices tagged with %s" msgstr "Avis marqués avec %s" -#: actions/apitimelinetag.php:104 actions/tagrss.php:64 +#: actions/apitimelinetag.php:104 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Mises à jour marquées avec %1$s dans %2$s !" @@ -755,7 +755,7 @@ msgstr "" #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 #: actions/remotesubscribe.php:191 actions/userauthorization.php:72 -#: actions/userrss.php:103 +#: actions/userrss.php:106 msgid "User without matching profile" msgstr "Utilisateur sans profil correspondant" @@ -1754,7 +1754,7 @@ msgstr "Faire un administrateur" msgid "Make this user an admin" msgstr "Faire de cet utilisateur un administrateur" -#: actions/grouprss.php:138 actions/userrss.php:90 +#: actions/grouprss.php:138 actions/userrss.php:93 #: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67 #, php-format msgid "%s timeline" @@ -4503,7 +4503,7 @@ msgstr "" "Essayez de [rechercher un groupe](%%action.groupsearch%%) et de vous y " "inscrire." -#: actions/userrss.php:92 lib/atomgroupnoticefeed.php:66 +#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66 #: lib/atomusernoticefeed.php:72 #, php-format msgid "Updates from %1$s on %2$s!" @@ -5270,12 +5270,12 @@ msgstr "%s a quitté le groupe %s" msgid "Fullname: %s" msgstr "Nom complet : %s" -#: lib/command.php:312 lib/mail.php:254 +#: lib/command.php:312 lib/mail.php:258 #, php-format msgid "Location: %s" msgstr "Emplacement : %s" -#: lib/command.php:315 lib/mail.php:256 +#: lib/command.php:315 lib/mail.php:260 #, php-format msgid "Homepage: %s" msgstr "Site Web : %s" @@ -5760,11 +5760,11 @@ msgstr "Ouvrez une session avec un identifiant et un mot de passe" msgid "Sign up for a new account" msgstr "Créer un nouveau compte" -#: lib/mail.php:172 +#: lib/mail.php:173 msgid "Email address confirmation" msgstr "Confirmation de l’adresse courriel" -#: lib/mail.php:174 +#: lib/mail.php:175 #, php-format msgid "" "Hey, %s.\n" @@ -5794,12 +5794,12 @@ msgstr "" "Merci de votre attention,\n" "%s\n" -#: lib/mail.php:236 +#: lib/mail.php:240 #, php-format msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s suit maintenant vos avis sur %2$s." -#: lib/mail.php:241 +#: lib/mail.php:245 #, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -5824,17 +5824,17 @@ msgstr "" "----\n" "Changez votre adresse de courriel ou vos options de notification sur %8$s\n" -#: lib/mail.php:258 +#: lib/mail.php:262 #, php-format msgid "Bio: %s" msgstr "Bio : %s" -#: lib/mail.php:286 +#: lib/mail.php:290 #, php-format msgid "New email address for posting to %s" msgstr "Nouvelle adresse courriel pour poster dans %s" -#: lib/mail.php:289 +#: lib/mail.php:293 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5855,21 +5855,21 @@ msgstr "" "Cordialement,\n" "%4$s" -#: lib/mail.php:413 +#: lib/mail.php:417 #, php-format msgid "%s status" msgstr "Statut de %s" -#: lib/mail.php:439 +#: lib/mail.php:443 msgid "SMS confirmation" msgstr "Confirmation SMS" -#: lib/mail.php:463 +#: lib/mail.php:467 #, php-format msgid "You've been nudged by %s" msgstr "Vous avez reçu un clin d’œil de %s" -#: lib/mail.php:467 +#: lib/mail.php:471 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -5896,12 +5896,12 @@ msgstr "" "Bien à vous,\n" "%4$s\n" -#: lib/mail.php:510 +#: lib/mail.php:517 #, php-format msgid "New private message from %s" msgstr "Nouveau message personnel de %s" -#: lib/mail.php:514 +#: lib/mail.php:521 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -5934,12 +5934,12 @@ msgstr "" "Bien à vous,\n" "%5$s\n" -#: lib/mail.php:559 +#: lib/mail.php:568 #, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%s (@%s) a ajouté un de vos avis à ses favoris" -#: lib/mail.php:561 +#: lib/mail.php:570 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -5977,12 +5977,12 @@ msgstr "" "Cordialement,\n" "%6$s\n" -#: lib/mail.php:624 +#: lib/mail.php:635 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "%s (@%s) vous a envoyé un avis" -#: lib/mail.php:626 +#: lib/mail.php:637 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" diff --git a/locale/ga/LC_MESSAGES/statusnet.po b/locale/ga/LC_MESSAGES/statusnet.po index b88dc4e2c..dea9dd11c 100644 --- a/locale/ga/LC_MESSAGES/statusnet.po +++ b/locale/ga/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-04 18:55+0000\n" -"PO-Revision-Date: 2010-03-05 22:35:38+0000\n" +"POT-Creation-Date: 2010-03-06 23:49+0000\n" +"PO-Revision-Date: 2010-03-06 23:49:54+0000\n" "Language-Team: Irish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63298); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ga\n" "X-Message-Group: out-statusnet\n" @@ -110,7 +110,7 @@ msgstr "Non existe a etiqueta." #: actions/otp.php:76 actions/remotesubscribe.php:145 #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 +#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:302 #: lib/command.php:355 lib/command.php:401 lib/command.php:462 #: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82 @@ -715,7 +715,7 @@ msgstr "Replies to %s" msgid "Notices tagged with %s" msgstr "Chíos tagueados con %s" -#: actions/apitimelinetag.php:104 actions/tagrss.php:64 +#: actions/apitimelinetag.php:104 actions/tagrss.php:65 #, fuzzy, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Actualizacións dende %1$s en %2$s!" @@ -756,7 +756,7 @@ msgstr "Podes actualizar a túa información do perfil persoal aquí" #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 #: actions/remotesubscribe.php:191 actions/userauthorization.php:72 -#: actions/userrss.php:103 +#: actions/userrss.php:106 msgid "User without matching profile" msgstr "Usuario sen un perfil que coincida." @@ -1816,7 +1816,7 @@ msgstr "" msgid "Make this user an admin" msgstr "" -#: actions/grouprss.php:138 actions/userrss.php:90 +#: actions/grouprss.php:138 actions/userrss.php:93 #: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67 #, php-format msgid "%s timeline" @@ -4575,7 +4575,7 @@ msgstr "%1s non é unha orixe fiable." msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" -#: actions/userrss.php:92 lib/atomgroupnoticefeed.php:66 +#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66 #: lib/atomusernoticefeed.php:72 #, php-format msgid "Updates from %1$s on %2$s!" @@ -5383,12 +5383,12 @@ msgstr "%s / Favoritos dende %s" msgid "Fullname: %s" msgstr "Nome completo: %s" -#: lib/command.php:312 lib/mail.php:254 +#: lib/command.php:312 lib/mail.php:258 #, php-format msgid "Location: %s" msgstr "Ubicación: %s" -#: lib/command.php:315 lib/mail.php:256 +#: lib/command.php:315 lib/mail.php:260 #, php-format msgid "Homepage: %s" msgstr "Páxina persoal: %s" @@ -5881,11 +5881,11 @@ msgstr "Accede co teu nome de usuario e contrasinal." msgid "Sign up for a new account" msgstr "Crear nova conta" -#: lib/mail.php:172 +#: lib/mail.php:173 msgid "Email address confirmation" msgstr "Confirmar correo electrónico" -#: lib/mail.php:174 +#: lib/mail.php:175 #, php-format msgid "" "Hey, %s.\n" @@ -5914,12 +5914,12 @@ msgstr "" "Grazas polo teu tempo, \n" "%s\n" -#: lib/mail.php:236 +#: lib/mail.php:240 #, php-format msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s está a escoitar os teus chíos %2$s." -#: lib/mail.php:241 +#: lib/mail.php:245 #, fuzzy, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -5940,17 +5940,17 @@ msgstr "" "Atentamente todo seu,\n" "%4$s.\n" -#: lib/mail.php:258 +#: lib/mail.php:262 #, fuzzy, php-format msgid "Bio: %s" msgstr "Ubicación: %s" -#: lib/mail.php:286 +#: lib/mail.php:290 #, php-format msgid "New email address for posting to %s" msgstr "Nova dirección de email para posterar en %s" -#: lib/mail.php:289 +#: lib/mail.php:293 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5971,21 +5971,21 @@ msgstr "" "Sempre teu...,\n" "%4$s" -#: lib/mail.php:413 +#: lib/mail.php:417 #, php-format msgid "%s status" msgstr "Estado de %s" -#: lib/mail.php:439 +#: lib/mail.php:443 msgid "SMS confirmation" msgstr "Confirmación de SMS" -#: lib/mail.php:463 +#: lib/mail.php:467 #, php-format msgid "You've been nudged by %s" msgstr "%s douche un toque" -#: lib/mail.php:467 +#: lib/mail.php:471 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -6011,12 +6011,12 @@ msgstr "" "With kind regards,\n" "%4$s\n" -#: lib/mail.php:510 +#: lib/mail.php:517 #, php-format msgid "New private message from %s" msgstr "%s enviouche unha nova mensaxe privada" -#: lib/mail.php:514 +#: lib/mail.php:521 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -6049,12 +6049,12 @@ msgstr "" "With kind regards,\n" "%5$s\n" -#: lib/mail.php:559 +#: lib/mail.php:568 #, fuzzy, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%s gustoulle o teu chío" -#: lib/mail.php:561 +#: lib/mail.php:570 #, fuzzy, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -6087,12 +6087,12 @@ msgstr "" "Fielmente teu,\n" "%5$s\n" -#: lib/mail.php:624 +#: lib/mail.php:635 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "" -#: lib/mail.php:626 +#: lib/mail.php:637 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" diff --git a/locale/he/LC_MESSAGES/statusnet.po b/locale/he/LC_MESSAGES/statusnet.po index 0856fd8fe..49f229a96 100644 --- a/locale/he/LC_MESSAGES/statusnet.po +++ b/locale/he/LC_MESSAGES/statusnet.po @@ -7,12 +7,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-04 18:55+0000\n" -"PO-Revision-Date: 2010-03-05 22:35:40+0000\n" +"POT-Creation-Date: 2010-03-06 23:49+0000\n" +"PO-Revision-Date: 2010-03-06 23:49:57+0000\n" "Language-Team: Hebrew\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63298); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: he\n" "X-Message-Group: out-statusnet\n" @@ -107,7 +107,7 @@ msgstr "אין הודעה כזו." #: actions/otp.php:76 actions/remotesubscribe.php:145 #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 +#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:302 #: lib/command.php:355 lib/command.php:401 lib/command.php:462 #: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82 @@ -706,7 +706,7 @@ msgstr "תגובת עבור %s" msgid "Notices tagged with %s" msgstr "" -#: actions/apitimelinetag.php:104 actions/tagrss.php:64 +#: actions/apitimelinetag.php:104 actions/tagrss.php:65 #, fuzzy, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "מיקרובלוג מאת %s" @@ -748,7 +748,7 @@ msgstr "" #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 #: actions/remotesubscribe.php:191 actions/userauthorization.php:72 -#: actions/userrss.php:103 +#: actions/userrss.php:106 msgid "User without matching profile" msgstr "" @@ -1787,7 +1787,7 @@ msgstr "" msgid "Make this user an admin" msgstr "" -#: actions/grouprss.php:138 actions/userrss.php:90 +#: actions/grouprss.php:138 actions/userrss.php:93 #: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67 #, php-format msgid "%s timeline" @@ -4424,7 +4424,7 @@ msgstr "לא שלחנו אלינו את הפרופיל הזה" msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" -#: actions/userrss.php:92 lib/atomgroupnoticefeed.php:66 +#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66 #: lib/atomusernoticefeed.php:72 #, php-format msgid "Updates from %1$s on %2$s!" @@ -5216,12 +5216,12 @@ msgstr "הסטטוס של %1$s ב-%2$s " msgid "Fullname: %s" msgstr "שם מלא" -#: lib/command.php:312 lib/mail.php:254 +#: lib/command.php:312 lib/mail.php:258 #, php-format msgid "Location: %s" msgstr "" -#: lib/command.php:315 lib/mail.php:256 +#: lib/command.php:315 lib/mail.php:260 #, php-format msgid "Homepage: %s" msgstr "" @@ -5676,11 +5676,11 @@ msgstr "שם המשתמש או הסיסמה לא חוקיים" msgid "Sign up for a new account" msgstr "צור חשבון חדש" -#: lib/mail.php:172 +#: lib/mail.php:173 msgid "Email address confirmation" msgstr "" -#: lib/mail.php:174 +#: lib/mail.php:175 #, php-format msgid "" "Hey, %s.\n" @@ -5697,12 +5697,12 @@ msgid "" "%s\n" msgstr "" -#: lib/mail.php:236 +#: lib/mail.php:240 #, php-format msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s כעת מאזין להודעות שלך ב-%2$s" -#: lib/mail.php:241 +#: lib/mail.php:245 #, fuzzy, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -5722,17 +5722,17 @@ msgstr "" " שלך,\n" " %4$s.\n" -#: lib/mail.php:258 +#: lib/mail.php:262 #, fuzzy, php-format msgid "Bio: %s" msgstr "אודות: %s" -#: lib/mail.php:286 +#: lib/mail.php:290 #, php-format msgid "New email address for posting to %s" msgstr "" -#: lib/mail.php:289 +#: lib/mail.php:293 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5745,21 +5745,21 @@ msgid "" "%4$s" msgstr "" -#: lib/mail.php:413 +#: lib/mail.php:417 #, php-format msgid "%s status" msgstr "" -#: lib/mail.php:439 +#: lib/mail.php:443 msgid "SMS confirmation" msgstr "" -#: lib/mail.php:463 +#: lib/mail.php:467 #, php-format msgid "You've been nudged by %s" msgstr "" -#: lib/mail.php:467 +#: lib/mail.php:471 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -5775,12 +5775,12 @@ msgid "" "%4$s\n" msgstr "" -#: lib/mail.php:510 +#: lib/mail.php:517 #, php-format msgid "New private message from %s" msgstr "" -#: lib/mail.php:514 +#: lib/mail.php:521 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -5799,12 +5799,12 @@ msgid "" "%5$s\n" msgstr "" -#: lib/mail.php:559 +#: lib/mail.php:568 #, fuzzy, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%1$s כעת מאזין להודעות שלך ב-%2$s" -#: lib/mail.php:561 +#: lib/mail.php:570 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -5825,12 +5825,12 @@ msgid "" "%6$s\n" msgstr "" -#: lib/mail.php:624 +#: lib/mail.php:635 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "" -#: lib/mail.php:626 +#: lib/mail.php:637 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" diff --git a/locale/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po index 8c129a376..91d9c9c73 100644 --- a/locale/hsb/LC_MESSAGES/statusnet.po +++ b/locale/hsb/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-04 18:55+0000\n" -"PO-Revision-Date: 2010-03-05 22:35:43+0000\n" +"POT-Creation-Date: 2010-03-06 23:49+0000\n" +"PO-Revision-Date: 2010-03-06 23:50:00+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63298); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: hsb\n" "X-Message-Group: out-statusnet\n" @@ -107,7 +107,7 @@ msgstr "Strona njeeksistuje" #: actions/otp.php:76 actions/remotesubscribe.php:145 #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 +#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:302 #: lib/command.php:355 lib/command.php:401 lib/command.php:462 #: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82 @@ -686,7 +686,7 @@ msgstr "" msgid "Notices tagged with %s" msgstr "" -#: actions/apitimelinetag.php:104 actions/tagrss.php:64 +#: actions/apitimelinetag.php:104 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "" @@ -727,7 +727,7 @@ msgstr "" #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 #: actions/remotesubscribe.php:191 actions/userauthorization.php:72 -#: actions/userrss.php:103 +#: actions/userrss.php:106 msgid "User without matching profile" msgstr "Wužiwar bjez hodźaceho so profila" @@ -1707,7 +1707,7 @@ msgstr "" msgid "Make this user an admin" msgstr "Tutoho wužiwarja k administratorej činić" -#: actions/grouprss.php:138 actions/userrss.php:90 +#: actions/grouprss.php:138 actions/userrss.php:93 #: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67 #, php-format msgid "%s timeline" @@ -4232,7 +4232,7 @@ msgstr "" msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" -#: actions/userrss.php:92 lib/atomgroupnoticefeed.php:66 +#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66 #: lib/atomusernoticefeed.php:72 #, php-format msgid "Updates from %1$s on %2$s!" @@ -4992,12 +4992,12 @@ msgstr "%s je skupinu %s wopušćił" msgid "Fullname: %s" msgstr "Dospołne mjeno: %s" -#: lib/command.php:312 lib/mail.php:254 +#: lib/command.php:312 lib/mail.php:258 #, php-format msgid "Location: %s" msgstr "Městno: %s" -#: lib/command.php:315 lib/mail.php:256 +#: lib/command.php:315 lib/mail.php:260 #, php-format msgid "Homepage: %s" msgstr "" @@ -5436,11 +5436,11 @@ msgstr "Přizjewjenje z wužiwarskim mjenom a hesłom" msgid "Sign up for a new account" msgstr "Nowe konto registrować" -#: lib/mail.php:172 +#: lib/mail.php:173 msgid "Email address confirmation" msgstr "Wobkrućenje e-mejloweje adresy" -#: lib/mail.php:174 +#: lib/mail.php:175 #, php-format msgid "" "Hey, %s.\n" @@ -5457,12 +5457,12 @@ msgid "" "%s\n" msgstr "" -#: lib/mail.php:236 +#: lib/mail.php:240 #, php-format msgid "%1$s is now listening to your notices on %2$s." msgstr "" -#: lib/mail.php:241 +#: lib/mail.php:245 #, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -5477,17 +5477,17 @@ msgid "" "Change your email address or notification options at %8$s\n" msgstr "" -#: lib/mail.php:258 +#: lib/mail.php:262 #, php-format msgid "Bio: %s" msgstr "Biografija: %s" -#: lib/mail.php:286 +#: lib/mail.php:290 #, php-format msgid "New email address for posting to %s" msgstr "" -#: lib/mail.php:289 +#: lib/mail.php:293 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5500,21 +5500,21 @@ msgid "" "%4$s" msgstr "" -#: lib/mail.php:413 +#: lib/mail.php:417 #, php-format msgid "%s status" msgstr "" -#: lib/mail.php:439 +#: lib/mail.php:443 msgid "SMS confirmation" msgstr "SMS-wobkrućenje" -#: lib/mail.php:463 +#: lib/mail.php:467 #, php-format msgid "You've been nudged by %s" msgstr "" -#: lib/mail.php:467 +#: lib/mail.php:471 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -5530,12 +5530,12 @@ msgid "" "%4$s\n" msgstr "" -#: lib/mail.php:510 +#: lib/mail.php:517 #, php-format msgid "New private message from %s" msgstr "Nowa priwatna powěsć wot %s" -#: lib/mail.php:514 +#: lib/mail.php:521 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -5554,12 +5554,12 @@ msgid "" "%5$s\n" msgstr "" -#: lib/mail.php:559 +#: lib/mail.php:568 #, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%s (@%s) je twoju zdźělenku jako faworit přidał" -#: lib/mail.php:561 +#: lib/mail.php:570 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -5580,12 +5580,12 @@ msgid "" "%6$s\n" msgstr "" -#: lib/mail.php:624 +#: lib/mail.php:635 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "" -#: lib/mail.php:626 +#: lib/mail.php:637 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" diff --git a/locale/ia/LC_MESSAGES/statusnet.po b/locale/ia/LC_MESSAGES/statusnet.po index 4116b91d5..7a96686ed 100644 --- a/locale/ia/LC_MESSAGES/statusnet.po +++ b/locale/ia/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-04 18:55+0000\n" -"PO-Revision-Date: 2010-03-05 22:35:46+0000\n" +"POT-Creation-Date: 2010-03-06 23:49+0000\n" +"PO-Revision-Date: 2010-03-06 23:50:08+0000\n" "Language-Team: Interlingua\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63298); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ia\n" "X-Message-Group: out-statusnet\n" @@ -102,7 +102,7 @@ msgstr "Pagina non existe" #: actions/otp.php:76 actions/remotesubscribe.php:145 #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 +#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:302 #: lib/command.php:355 lib/command.php:401 lib/command.php:462 #: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82 @@ -702,7 +702,7 @@ msgstr "Repetitiones de %s" msgid "Notices tagged with %s" msgstr "Notas con etiquetta %s" -#: actions/apitimelinetag.php:104 actions/tagrss.php:64 +#: actions/apitimelinetag.php:104 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Actualisationes con etiquetta %1$s in %2$s!" @@ -743,7 +743,7 @@ msgstr "" #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 #: actions/remotesubscribe.php:191 actions/userauthorization.php:72 -#: actions/userrss.php:103 +#: actions/userrss.php:106 msgid "User without matching profile" msgstr "Usator sin profilo correspondente" @@ -1743,7 +1743,7 @@ msgstr "Facer administrator" msgid "Make this user an admin" msgstr "Facer iste usator administrator" -#: actions/grouprss.php:138 actions/userrss.php:90 +#: actions/grouprss.php:138 actions/userrss.php:93 #: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67 #, php-format msgid "%s timeline" @@ -4466,7 +4466,7 @@ msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" "Tenta [cercar gruppos](%%action.groupsearch%%) e facer te membro de illos." -#: actions/userrss.php:92 lib/atomgroupnoticefeed.php:66 +#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66 #: lib/atomusernoticefeed.php:72 #, php-format msgid "Updates from %1$s on %2$s!" @@ -5255,12 +5255,12 @@ msgstr "%s quitava le gruppo %s" msgid "Fullname: %s" msgstr "Nomine complete: %s" -#: lib/command.php:312 lib/mail.php:254 +#: lib/command.php:312 lib/mail.php:258 #, php-format msgid "Location: %s" msgstr "Loco: %s" -#: lib/command.php:315 lib/mail.php:256 +#: lib/command.php:315 lib/mail.php:260 #, php-format msgid "Homepage: %s" msgstr "Pagina personal: %s" @@ -5736,11 +5736,11 @@ msgstr "Aperir session con nomine de usator e contrasigno" msgid "Sign up for a new account" msgstr "Crear un nove conto" -#: lib/mail.php:172 +#: lib/mail.php:173 msgid "Email address confirmation" msgstr "Confirmation del adresse de e-mail" -#: lib/mail.php:174 +#: lib/mail.php:175 #, php-format msgid "" "Hey, %s.\n" @@ -5769,12 +5769,12 @@ msgstr "" "Gratias pro tu attention,\n" "%s\n" -#: lib/mail.php:236 +#: lib/mail.php:240 #, php-format msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s seque ora tu notas in %2$s." -#: lib/mail.php:241 +#: lib/mail.php:245 #, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -5799,17 +5799,17 @@ msgstr "" "----\n" "Cambia tu adresse de e-mail o optiones de notification a %8$s\n" -#: lib/mail.php:258 +#: lib/mail.php:262 #, php-format msgid "Bio: %s" msgstr "Bio: %s" -#: lib/mail.php:286 +#: lib/mail.php:290 #, php-format msgid "New email address for posting to %s" msgstr "Nove adresse de e-mail pro publicar in %s" -#: lib/mail.php:289 +#: lib/mail.php:293 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5830,21 +5830,21 @@ msgstr "" "Cordialmente,\n" "%4$s" -#: lib/mail.php:413 +#: lib/mail.php:417 #, php-format msgid "%s status" msgstr "Stato de %s" -#: lib/mail.php:439 +#: lib/mail.php:443 msgid "SMS confirmation" msgstr "Confirmation SMS" -#: lib/mail.php:463 +#: lib/mail.php:467 #, php-format msgid "You've been nudged by %s" msgstr "%s te ha pulsate" -#: lib/mail.php:467 +#: lib/mail.php:471 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -5871,12 +5871,12 @@ msgstr "" "Con salutes cordial,\n" "%4$s\n" -#: lib/mail.php:510 +#: lib/mail.php:517 #, php-format msgid "New private message from %s" msgstr "Nove message private de %s" -#: lib/mail.php:514 +#: lib/mail.php:521 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -5909,12 +5909,12 @@ msgstr "" "Con salutes cordial,\n" "%5$s\n" -#: lib/mail.php:559 +#: lib/mail.php:568 #, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%s (@%s) ha addite tu nota como favorite" -#: lib/mail.php:561 +#: lib/mail.php:570 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -5952,12 +5952,12 @@ msgstr "" "Cordialmente,\n" "%6$s\n" -#: lib/mail.php:624 +#: lib/mail.php:635 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "%s (@%s) ha inviate un nota a tu attention" -#: lib/mail.php:626 +#: lib/mail.php:637 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" diff --git a/locale/is/LC_MESSAGES/statusnet.po b/locale/is/LC_MESSAGES/statusnet.po index be9a80250..3c8f33565 100644 --- a/locale/is/LC_MESSAGES/statusnet.po +++ b/locale/is/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-04 18:55+0000\n" -"PO-Revision-Date: 2010-03-05 22:35:49+0000\n" +"POT-Creation-Date: 2010-03-06 23:49+0000\n" +"PO-Revision-Date: 2010-03-06 23:50:12+0000\n" "Language-Team: Icelandic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63298); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: is\n" "X-Message-Group: out-statusnet\n" @@ -110,7 +110,7 @@ msgstr "Ekkert þannig merki." #: actions/otp.php:76 actions/remotesubscribe.php:145 #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 +#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:302 #: lib/command.php:355 lib/command.php:401 lib/command.php:462 #: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82 @@ -707,7 +707,7 @@ msgstr "Svör við %s" msgid "Notices tagged with %s" msgstr "Babl merkt með %s" -#: actions/apitimelinetag.php:104 actions/tagrss.php:64 +#: actions/apitimelinetag.php:104 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "" @@ -747,7 +747,7 @@ msgstr "" #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 #: actions/remotesubscribe.php:191 actions/userauthorization.php:72 -#: actions/userrss.php:103 +#: actions/userrss.php:106 msgid "User without matching profile" msgstr "Notandi með enga persónulega síðu sem passar við" @@ -1769,7 +1769,7 @@ msgstr "" msgid "Make this user an admin" msgstr "" -#: actions/grouprss.php:138 actions/userrss.php:90 +#: actions/grouprss.php:138 actions/userrss.php:93 #: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67 #, php-format msgid "%s timeline" @@ -4472,7 +4472,7 @@ msgstr "" msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" -#: actions/userrss.php:92 lib/atomgroupnoticefeed.php:66 +#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66 #: lib/atomusernoticefeed.php:72 #, php-format msgid "Updates from %1$s on %2$s!" @@ -5265,12 +5265,12 @@ msgstr "%s gekk úr hópnum %s" msgid "Fullname: %s" msgstr "Fullt nafn: %s" -#: lib/command.php:312 lib/mail.php:254 +#: lib/command.php:312 lib/mail.php:258 #, php-format msgid "Location: %s" msgstr "Staðsetning: %s" -#: lib/command.php:315 lib/mail.php:256 +#: lib/command.php:315 lib/mail.php:260 #, php-format msgid "Homepage: %s" msgstr "Heimasíða: %s" @@ -5716,11 +5716,11 @@ msgstr "Skráðu þig inn með notendanafni og lykilorði" msgid "Sign up for a new account" msgstr "Búðu til nýjan aðgang" -#: lib/mail.php:172 +#: lib/mail.php:173 msgid "Email address confirmation" msgstr "Staðfesting tölvupóstfangs" -#: lib/mail.php:174 +#: lib/mail.php:175 #, php-format msgid "" "Hey, %s.\n" @@ -5737,12 +5737,12 @@ msgid "" "%s\n" msgstr "" -#: lib/mail.php:236 +#: lib/mail.php:240 #, php-format msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s er að hlusta á bablið þitt á %2$s." -#: lib/mail.php:241 +#: lib/mail.php:245 #, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -5757,19 +5757,19 @@ msgid "" "Change your email address or notification options at %8$s\n" msgstr "" -#: lib/mail.php:258 +#: lib/mail.php:262 #, fuzzy, php-format msgid "Bio: %s" msgstr "" "Lýsing: %s\n" "\n" -#: lib/mail.php:286 +#: lib/mail.php:290 #, php-format msgid "New email address for posting to %s" msgstr "Nýtt tölvupóstfang til að senda á %s" -#: lib/mail.php:289 +#: lib/mail.php:293 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5790,21 +5790,21 @@ msgstr "" "Með kærri kveðju,\n" "%4$s" -#: lib/mail.php:413 +#: lib/mail.php:417 #, php-format msgid "%s status" msgstr "Staða %s" -#: lib/mail.php:439 +#: lib/mail.php:443 msgid "SMS confirmation" msgstr "SMS staðfesting" -#: lib/mail.php:463 +#: lib/mail.php:467 #, php-format msgid "You've been nudged by %s" msgstr "%s ýtti við þér" -#: lib/mail.php:467 +#: lib/mail.php:471 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -5820,12 +5820,12 @@ msgid "" "%4$s\n" msgstr "" -#: lib/mail.php:510 +#: lib/mail.php:517 #, php-format msgid "New private message from %s" msgstr "Ný persónuleg skilaboð frá %s" -#: lib/mail.php:514 +#: lib/mail.php:521 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -5844,12 +5844,12 @@ msgid "" "%5$s\n" msgstr "" -#: lib/mail.php:559 +#: lib/mail.php:568 #, fuzzy, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%s heldur upp á babl frá þér" -#: lib/mail.php:561 +#: lib/mail.php:570 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -5870,12 +5870,12 @@ msgid "" "%6$s\n" msgstr "" -#: lib/mail.php:624 +#: lib/mail.php:635 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "" -#: lib/mail.php:626 +#: lib/mail.php:637 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po index 05b829067..1bd3f26ad 100644 --- a/locale/it/LC_MESSAGES/statusnet.po +++ b/locale/it/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-04 18:55+0000\n" -"PO-Revision-Date: 2010-03-05 22:35:52+0000\n" +"POT-Creation-Date: 2010-03-06 23:49+0000\n" +"PO-Revision-Date: 2010-03-06 23:50:15+0000\n" "Language-Team: Italian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63298); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: it\n" "X-Message-Group: out-statusnet\n" @@ -103,7 +103,7 @@ msgstr "Pagina inesistente." #: actions/otp.php:76 actions/remotesubscribe.php:145 #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 +#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:302 #: lib/command.php:355 lib/command.php:401 lib/command.php:462 #: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82 @@ -701,7 +701,7 @@ msgstr "Ripetizioni di %s" msgid "Notices tagged with %s" msgstr "Messaggi etichettati con %s" -#: actions/apitimelinetag.php:104 actions/tagrss.php:64 +#: actions/apitimelinetag.php:104 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Messaggi etichettati con %1$s su %2$s!" @@ -742,7 +742,7 @@ msgstr "" #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 #: actions/remotesubscribe.php:191 actions/userauthorization.php:72 -#: actions/userrss.php:103 +#: actions/userrss.php:106 msgid "User without matching profile" msgstr "Utente senza profilo corrispondente" @@ -1742,7 +1742,7 @@ msgstr "Rendi amm." msgid "Make this user an admin" msgstr "Rende questo utente un amministratore" -#: actions/grouprss.php:138 actions/userrss.php:90 +#: actions/grouprss.php:138 actions/userrss.php:93 #: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67 #, php-format msgid "%s timeline" @@ -4446,7 +4446,7 @@ msgstr "%s non fa parte di alcun gruppo." msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "Prova a [cercare dei gruppi](%%action.groupsearch%%) e iscriviti." -#: actions/userrss.php:92 lib/atomgroupnoticefeed.php:66 +#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66 #: lib/atomusernoticefeed.php:72 #, php-format msgid "Updates from %1$s on %2$s!" @@ -5213,12 +5213,12 @@ msgstr "%1$s ha lasciato il gruppo %2$s" msgid "Fullname: %s" msgstr "Nome completo: %s" -#: lib/command.php:312 lib/mail.php:254 +#: lib/command.php:312 lib/mail.php:258 #, php-format msgid "Location: %s" msgstr "Posizione: %s" -#: lib/command.php:315 lib/mail.php:256 +#: lib/command.php:315 lib/mail.php:260 #, php-format msgid "Homepage: %s" msgstr "Pagina web: %s" @@ -5697,11 +5697,11 @@ msgstr "Accedi con nome utente e password" msgid "Sign up for a new account" msgstr "Iscriviti per un nuovo account" -#: lib/mail.php:172 +#: lib/mail.php:173 msgid "Email address confirmation" msgstr "Conferma indirizzo email" -#: lib/mail.php:174 +#: lib/mail.php:175 #, php-format msgid "" "Hey, %s.\n" @@ -5731,12 +5731,12 @@ msgstr "" "Grazie per il tuo tempo, \n" "%s\n" -#: lib/mail.php:236 +#: lib/mail.php:240 #, php-format msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s sta ora seguendo i tuoi messaggi su %2$s." -#: lib/mail.php:241 +#: lib/mail.php:245 #, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -5761,17 +5761,17 @@ msgstr "" "----\n" "Modifica il tuo indirizzo email o le opzioni di notifica presso %8$s\n" -#: lib/mail.php:258 +#: lib/mail.php:262 #, php-format msgid "Bio: %s" msgstr "Biografia: %s" -#: lib/mail.php:286 +#: lib/mail.php:290 #, php-format msgid "New email address for posting to %s" msgstr "Nuovo indirizzo email per inviare messaggi a %s" -#: lib/mail.php:289 +#: lib/mail.php:293 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5792,21 +5792,21 @@ msgstr "" "Cordiali saluti,\n" "%4$s" -#: lib/mail.php:413 +#: lib/mail.php:417 #, php-format msgid "%s status" msgstr "stato di %s" -#: lib/mail.php:439 +#: lib/mail.php:443 msgid "SMS confirmation" msgstr "Conferma SMS" -#: lib/mail.php:463 +#: lib/mail.php:467 #, php-format msgid "You've been nudged by %s" msgstr "%s ti ha richiamato" -#: lib/mail.php:467 +#: lib/mail.php:471 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -5833,12 +5833,12 @@ msgstr "" "Cordiali saluti,\n" "%4$s\n" -#: lib/mail.php:510 +#: lib/mail.php:517 #, php-format msgid "New private message from %s" msgstr "Nuovo messaggio privato da %s" -#: lib/mail.php:514 +#: lib/mail.php:521 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -5871,12 +5871,12 @@ msgstr "" "Cordiali saluti,\n" "%5$s\n" -#: lib/mail.php:559 +#: lib/mail.php:568 #, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%s (@%s) ha aggiunto il tuo messaggio tra i suoi preferiti" -#: lib/mail.php:561 +#: lib/mail.php:570 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -5914,12 +5914,12 @@ msgstr "" "Cordiali saluti,\n" "%6$s\n" -#: lib/mail.php:624 +#: lib/mail.php:635 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "%s (@%s) ti ha inviato un messaggio" -#: lib/mail.php:626 +#: lib/mail.php:637 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po index 95695792b..847f24c59 100644 --- a/locale/ja/LC_MESSAGES/statusnet.po +++ b/locale/ja/LC_MESSAGES/statusnet.po @@ -11,12 +11,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-04 18:55+0000\n" -"PO-Revision-Date: 2010-03-05 22:35:55+0000\n" +"POT-Creation-Date: 2010-03-06 23:49+0000\n" +"PO-Revision-Date: 2010-03-06 23:50:18+0000\n" "Language-Team: Japanese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63298); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ja\n" "X-Message-Group: out-statusnet\n" @@ -105,7 +105,7 @@ msgstr "そのようなページはありません。" #: actions/otp.php:76 actions/remotesubscribe.php:145 #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 +#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:302 #: lib/command.php:355 lib/command.php:401 lib/command.php:462 #: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82 @@ -696,7 +696,7 @@ msgstr "%s の返信" msgid "Notices tagged with %s" msgstr "%s とタグ付けされたつぶやき" -#: actions/apitimelinetag.php:104 actions/tagrss.php:64 +#: actions/apitimelinetag.php:104 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "%2$s に %1$s による更新があります！" @@ -736,7 +736,7 @@ msgstr "自分のアバターをアップロードできます。最大サイズ #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 #: actions/remotesubscribe.php:191 actions/userauthorization.php:72 -#: actions/userrss.php:103 +#: actions/userrss.php:106 msgid "User without matching profile" msgstr "合っているプロフィールのないユーザ" @@ -1740,7 +1740,7 @@ msgstr "管理者にする" msgid "Make this user an admin" msgstr "このユーザを管理者にする" -#: actions/grouprss.php:138 actions/userrss.php:90 +#: actions/grouprss.php:138 actions/userrss.php:93 #: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67 #, php-format msgid "%s timeline" @@ -4455,7 +4455,7 @@ msgstr "%s はどのグループのメンバーでもありません。" msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "[グループを探して](%%action.groupsearch%%)それに加入してください。" -#: actions/userrss.php:92 lib/atomgroupnoticefeed.php:66 +#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66 #: lib/atomusernoticefeed.php:72 #, php-format msgid "Updates from %1$s on %2$s!" @@ -5233,12 +5233,12 @@ msgstr "%s はグループ %s に残りました。" msgid "Fullname: %s" msgstr "フルネーム： %s" -#: lib/command.php:312 lib/mail.php:254 +#: lib/command.php:312 lib/mail.php:258 #, php-format msgid "Location: %s" msgstr "場所: %s" -#: lib/command.php:315 lib/mail.php:256 +#: lib/command.php:315 lib/mail.php:260 #, php-format msgid "Homepage: %s" msgstr "ホームページ: %s" @@ -5672,11 +5672,11 @@ msgstr "ユーザ名とパスワードでログイン" msgid "Sign up for a new account" msgstr "新しいアカウントでサインアップ" -#: lib/mail.php:172 +#: lib/mail.php:173 msgid "Email address confirmation" msgstr "メールアドレス確認" -#: lib/mail.php:174 +#: lib/mail.php:175 #, php-format msgid "" "Hey, %s.\n" @@ -5705,12 +5705,12 @@ msgstr "" "ありがとうございます。\n" "%s\n" -#: lib/mail.php:236 +#: lib/mail.php:240 #, php-format msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s は %2$s であなたのつぶやきを聞いています。" -#: lib/mail.php:241 +#: lib/mail.php:245 #, fuzzy, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -5735,17 +5735,17 @@ msgstr "" "----\n" "%8$s でメールアドレスか通知オプションを変えてください。\n" -#: lib/mail.php:258 +#: lib/mail.php:262 #, php-format msgid "Bio: %s" msgstr "自己紹介: %s" -#: lib/mail.php:286 +#: lib/mail.php:290 #, php-format msgid "New email address for posting to %s" msgstr "%s へ投稿のための新しいメールアドレス" -#: lib/mail.php:289 +#: lib/mail.php:293 #, fuzzy, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5766,21 +5766,21 @@ msgstr "" "忠実である、あなたのもの、\n" "%4$s" -#: lib/mail.php:413 +#: lib/mail.php:417 #, php-format msgid "%s status" msgstr "%s の状態" -#: lib/mail.php:439 +#: lib/mail.php:443 msgid "SMS confirmation" msgstr "SMS確認" -#: lib/mail.php:463 +#: lib/mail.php:467 #, php-format msgid "You've been nudged by %s" msgstr "あなたは %s に合図されています" -#: lib/mail.php:467 +#: lib/mail.php:471 #, fuzzy, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -5807,12 +5807,12 @@ msgstr "" "敬具\n" "%4$s\n" -#: lib/mail.php:510 +#: lib/mail.php:517 #, php-format msgid "New private message from %s" msgstr "%s からの新しいプライベートメッセージ" -#: lib/mail.php:514 +#: lib/mail.php:521 #, fuzzy, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -5845,12 +5845,12 @@ msgstr "" "敬具\n" "%5$s\n" -#: lib/mail.php:559 +#: lib/mail.php:568 #, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%s (@%s) はお気に入りとしてあなたのつぶやきを加えました" -#: lib/mail.php:561 +#: lib/mail.php:570 #, fuzzy, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -5888,12 +5888,12 @@ msgstr "" "忠実である、あなたのもの、\n" "%6%s\n" -#: lib/mail.php:624 +#: lib/mail.php:635 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "%s (@%s) はあなた宛てにつぶやきを送りました" -#: lib/mail.php:626 +#: lib/mail.php:637 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po index 09af2e6f0..69bf4efb9 100644 --- a/locale/ko/LC_MESSAGES/statusnet.po +++ b/locale/ko/LC_MESSAGES/statusnet.po @@ -7,12 +7,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-04 18:55+0000\n" -"PO-Revision-Date: 2010-03-05 22:35:58+0000\n" +"POT-Creation-Date: 2010-03-06 23:49+0000\n" +"PO-Revision-Date: 2010-03-06 23:50:22+0000\n" "Language-Team: Korean\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63299); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ko\n" "X-Message-Group: out-statusnet\n" @@ -108,7 +108,7 @@ msgstr "그러한 태그가 없습니다." #: actions/otp.php:76 actions/remotesubscribe.php:145 #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 +#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:302 #: lib/command.php:355 lib/command.php:401 lib/command.php:462 #: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82 @@ -711,7 +711,7 @@ msgstr "%s에 답신" msgid "Notices tagged with %s" msgstr "%s 태그된 통지" -#: actions/apitimelinetag.php:104 actions/tagrss.php:64 +#: actions/apitimelinetag.php:104 actions/tagrss.php:65 #, fuzzy, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "%2$s에 있는 %1$s의 업데이트!" @@ -752,7 +752,7 @@ msgstr "당신의 개인적인 아바타를 업로드할 수 있습니다." #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 #: actions/remotesubscribe.php:191 actions/userauthorization.php:72 -#: actions/userrss.php:103 +#: actions/userrss.php:106 msgid "User without matching profile" msgstr "프로필 매칭이 없는 사용자" @@ -1798,7 +1798,7 @@ msgstr "관리자" msgid "Make this user an admin" msgstr "" -#: actions/grouprss.php:138 actions/userrss.php:90 +#: actions/grouprss.php:138 actions/userrss.php:93 #: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67 #, php-format msgid "%s timeline" @@ -4493,7 +4493,7 @@ msgstr "당신은 해당 그룹의 멤버가 아닙니다." msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" -#: actions/userrss.php:92 lib/atomgroupnoticefeed.php:66 +#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66 #: lib/atomusernoticefeed.php:72 #, php-format msgid "Updates from %1$s on %2$s!" @@ -5292,12 +5292,12 @@ msgstr "%s가 그룹%s를 떠났습니다." msgid "Fullname: %s" msgstr "전체이름: %s" -#: lib/command.php:312 lib/mail.php:254 +#: lib/command.php:312 lib/mail.php:258 #, php-format msgid "Location: %s" msgstr "위치: %s" -#: lib/command.php:315 lib/mail.php:256 +#: lib/command.php:315 lib/mail.php:260 #, php-format msgid "Homepage: %s" msgstr "홈페이지: %s" @@ -5741,11 +5741,11 @@ msgstr "사용자 이름과 비밀번호로 로그인" msgid "Sign up for a new account" msgstr "새 계정을 위한 회원가입" -#: lib/mail.php:172 +#: lib/mail.php:173 msgid "Email address confirmation" msgstr "이메일 주소 확인서" -#: lib/mail.php:174 +#: lib/mail.php:175 #, php-format msgid "" "Hey, %s.\n" @@ -5762,12 +5762,12 @@ msgid "" "%s\n" msgstr "" -#: lib/mail.php:236 +#: lib/mail.php:240 #, php-format msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s님이 귀하의 알림 메시지를 %2$s에서 듣고 있습니다." -#: lib/mail.php:241 +#: lib/mail.php:245 #, fuzzy, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -5786,19 +5786,19 @@ msgstr "" "\n" "그럼 이만,%4$s.\n" -#: lib/mail.php:258 +#: lib/mail.php:262 #, fuzzy, php-format msgid "Bio: %s" msgstr "" "소개: %s\n" "\n" -#: lib/mail.php:286 +#: lib/mail.php:290 #, php-format msgid "New email address for posting to %s" msgstr "%s에 포스팅 할 새로운 이메일 주소" -#: lib/mail.php:289 +#: lib/mail.php:293 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5813,21 +5813,21 @@ msgstr "" "포스팅 주소는 %1$s입니다.새 메시지를 등록하려면 %2$ 주소로 이메일을 보내십시" "오.이메일 사용법은 %3$s 페이지를 보십시오.안녕히,%4$s" -#: lib/mail.php:413 +#: lib/mail.php:417 #, php-format msgid "%s status" msgstr "%s 상태" -#: lib/mail.php:439 +#: lib/mail.php:443 msgid "SMS confirmation" msgstr "SMS 인증" -#: lib/mail.php:463 +#: lib/mail.php:467 #, php-format msgid "You've been nudged by %s" msgstr "%s 사용자가 찔러 봤습니다." -#: lib/mail.php:467 +#: lib/mail.php:471 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -5843,12 +5843,12 @@ msgid "" "%4$s\n" msgstr "" -#: lib/mail.php:510 +#: lib/mail.php:517 #, php-format msgid "New private message from %s" msgstr "%s로부터 새로운 비밀 메시지가 도착하였습니다." -#: lib/mail.php:514 +#: lib/mail.php:521 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -5867,12 +5867,12 @@ msgid "" "%5$s\n" msgstr "" -#: lib/mail.php:559 +#: lib/mail.php:568 #, fuzzy, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%s님이 당신의 게시글을 좋아하는 글로 추가했습니다." -#: lib/mail.php:561 +#: lib/mail.php:570 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -5893,12 +5893,12 @@ msgid "" "%6$s\n" msgstr "" -#: lib/mail.php:624 +#: lib/mail.php:635 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "" -#: lib/mail.php:626 +#: lib/mail.php:637 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po index a5736795f..74b9cb228 100644 --- a/locale/mk/LC_MESSAGES/statusnet.po +++ b/locale/mk/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-04 18:55+0000\n" -"PO-Revision-Date: 2010-03-05 22:36:01+0000\n" +"POT-Creation-Date: 2010-03-06 23:49+0000\n" +"PO-Revision-Date: 2010-03-06 23:50:24+0000\n" "Language-Team: Macedonian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63299); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: mk\n" "X-Message-Group: out-statusnet\n" @@ -103,7 +103,7 @@ msgstr "Нема таква страница" #: actions/otp.php:76 actions/remotesubscribe.php:145 #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 +#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:302 #: lib/command.php:355 lib/command.php:401 lib/command.php:462 #: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82 @@ -702,7 +702,7 @@ msgstr "Повторувања на %s" msgid "Notices tagged with %s" msgstr "Забелешки означени со %s" -#: actions/apitimelinetag.php:104 actions/tagrss.php:64 +#: actions/apitimelinetag.php:104 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Подновувањата се означени со %1$s на %2$s!" @@ -744,7 +744,7 @@ msgstr "" #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 #: actions/remotesubscribe.php:191 actions/userauthorization.php:72 -#: actions/userrss.php:103 +#: actions/userrss.php:106 msgid "User without matching profile" msgstr "Корисник без соодветен профил" @@ -1747,7 +1747,7 @@ msgstr "Направи го/ја администратор" msgid "Make this user an admin" msgstr "Направи го корисникот администратор" -#: actions/grouprss.php:138 actions/userrss.php:90 +#: actions/grouprss.php:138 actions/userrss.php:93 #: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67 #, php-format msgid "%s timeline" @@ -4469,7 +4469,7 @@ msgstr "" "Обидете се со [пребарување на групи](%%action.groupsearch%%) и придружете им " "се." -#: actions/userrss.php:92 lib/atomgroupnoticefeed.php:66 +#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66 #: lib/atomusernoticefeed.php:72 #, php-format msgid "Updates from %1$s on %2$s!" @@ -5235,12 +5235,12 @@ msgstr "%s ја напушти групата %s" msgid "Fullname: %s" msgstr "Име и презиме: %s" -#: lib/command.php:312 lib/mail.php:254 +#: lib/command.php:312 lib/mail.php:258 #, php-format msgid "Location: %s" msgstr "Локација: %s" -#: lib/command.php:315 lib/mail.php:256 +#: lib/command.php:315 lib/mail.php:260 #, php-format msgid "Homepage: %s" msgstr "Домашна страница: %s" @@ -5716,11 +5716,11 @@ msgstr "Најава со корисничко име и лозинка" msgid "Sign up for a new account" msgstr "Создај нова сметка" -#: lib/mail.php:172 +#: lib/mail.php:173 msgid "Email address confirmation" msgstr "Потврдување на адресата" -#: lib/mail.php:174 +#: lib/mail.php:175 #, php-format msgid "" "Hey, %s.\n" @@ -5750,12 +5750,12 @@ msgstr "" "Ви благодариме за потрошеното време, \n" "%s\n" -#: lib/mail.php:236 +#: lib/mail.php:240 #, php-format msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s сега ги следи Вашите забелешки на %2$s." -#: lib/mail.php:241 +#: lib/mail.php:245 #, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -5781,17 +5781,17 @@ msgstr "" "Изменете си ја е-поштенската адреса или ги нагодувањата за известувања на %8" "$s\n" -#: lib/mail.php:258 +#: lib/mail.php:262 #, php-format msgid "Bio: %s" msgstr "Биографија: %s" -#: lib/mail.php:286 +#: lib/mail.php:290 #, php-format msgid "New email address for posting to %s" msgstr "Нова е-поштенска адреса за објавување на %s" -#: lib/mail.php:289 +#: lib/mail.php:293 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5812,21 +5812,21 @@ msgstr "" "Со искрена почит,\n" "%4$s" -#: lib/mail.php:413 +#: lib/mail.php:417 #, php-format msgid "%s status" msgstr "Статус на %s" -#: lib/mail.php:439 +#: lib/mail.php:443 msgid "SMS confirmation" msgstr "Потврда за СМС" -#: lib/mail.php:463 +#: lib/mail.php:467 #, php-format msgid "You've been nudged by %s" msgstr "%s Ве подбуцна" -#: lib/mail.php:467 +#: lib/mail.php:471 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -5853,12 +5853,12 @@ msgstr "" "Со почит,\n" "%4$s\n" -#: lib/mail.php:510 +#: lib/mail.php:517 #, php-format msgid "New private message from %s" msgstr "Нова приватна порака од %s" -#: lib/mail.php:514 +#: lib/mail.php:521 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -5891,12 +5891,12 @@ msgstr "" "Со почит,\n" "%5$s\n" -#: lib/mail.php:559 +#: lib/mail.php:568 #, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%s (@%s) додаде Ваша забелешка како омилена" -#: lib/mail.php:561 +#: lib/mail.php:570 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -5934,12 +5934,12 @@ msgstr "" "Со искрена почит,\n" "%6$s\n" -#: lib/mail.php:624 +#: lib/mail.php:635 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "%s (@%s) Ви испрати забелешка што сака да ја прочитате" -#: lib/mail.php:626 +#: lib/mail.php:637 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po index 61e5cfdcd..b687e445e 100644 --- a/locale/nb/LC_MESSAGES/statusnet.po +++ b/locale/nb/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-04 18:55+0000\n" -"PO-Revision-Date: 2010-03-05 22:36:06+0000\n" +"POT-Creation-Date: 2010-03-06 23:49+0000\n" +"PO-Revision-Date: 2010-03-08 21:11:29+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.17alpha (r63299); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63415); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: no\n" "X-Message-Group: out-statusnet\n" @@ -43,7 +43,6 @@ msgstr "Forhindre anonyme brukere (ikke innlogget) å se nettsted?" #. TRANS: Checkbox label for prohibiting anonymous users from viewing site. #: actions/accessadminpanel.php:167 -#, fuzzy msgctxt "LABEL" msgid "Private" msgstr "Privat" @@ -74,7 +73,6 @@ msgid "Save access settings" msgstr "Lagre tilgangsinnstillinger" #: actions/accessadminpanel.php:203 -#, fuzzy msgctxt "BUTTON" msgid "Save" msgstr "Lagre" @@ -103,7 +101,7 @@ msgstr "Ingen slik side" #: actions/otp.php:76 actions/remotesubscribe.php:145 #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 +#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:302 #: lib/command.php:355 lib/command.php:401 lib/command.php:462 #: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82 @@ -695,7 +693,7 @@ msgstr "Repetisjoner av %s" msgid "Notices tagged with %s" msgstr "Notiser merket med %s" -#: actions/apitimelinetag.php:104 actions/tagrss.php:64 +#: actions/apitimelinetag.php:104 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Oppdateringer merket med %1$s på %2$s!" @@ -735,7 +733,7 @@ msgstr "Du kan laste opp en personlig avatar. Maks filstørrelse er %s." #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 #: actions/remotesubscribe.php:191 actions/userauthorization.php:72 -#: actions/userrss.php:103 +#: actions/userrss.php:106 msgid "User without matching profile" msgstr "Bruker uten samsvarende profil" @@ -1094,11 +1092,11 @@ msgstr "Av" #: actions/designadminpanel.php:474 lib/designsettings.php:156 msgid "Turn background image on or off." -msgstr "" +msgstr "Slå på eller av bakgrunnsbilde." #: actions/designadminpanel.php:479 lib/designsettings.php:161 msgid "Tile background image" -msgstr "" +msgstr "Gjenta bakgrunnsbildet" #: actions/designadminpanel.php:488 lib/designsettings.php:170 msgid "Change colours" @@ -1213,7 +1211,7 @@ msgstr "Organisasjon er for lang (maks 255 tegn)." #: actions/editapplication.php:209 actions/newapplication.php:194 msgid "Organization homepage is required." -msgstr "" +msgstr "Hjemmeside for organisasjon kreves." #: actions/editapplication.php:218 actions/newapplication.php:206 msgid "Callback is too long." @@ -1224,9 +1222,8 @@ msgid "Callback URL is not valid." msgstr "" #: actions/editapplication.php:258 -#, fuzzy msgid "Could not update application." -msgstr "Klarte ikke å oppdatere bruker." +msgstr "Kunne ikke oppdatere programmet." #: actions/editgroup.php:56 #, php-format @@ -1320,11 +1317,11 @@ msgstr "innkommende e-post" #: actions/emailsettings.php:138 actions/smssettings.php:157 msgid "Send email to this address to post new notices." -msgstr "" +msgstr "Send e-post til denne adressen for å poste nye notiser." #: actions/emailsettings.php:145 actions/smssettings.php:162 msgid "Make a new email address for posting to; cancels the old one." -msgstr "" +msgstr "Angi en ny e-postadresse for å poste til; fjerner den gamle." #: actions/emailsettings.php:148 actions/smssettings.php:164 msgid "New" @@ -1341,15 +1338,15 @@ msgstr "" #: actions/emailsettings.php:163 msgid "Send me email when someone adds my notice as a favorite." -msgstr "" +msgstr "Send meg en e-post når noen legger min notis til som favoritt." #: actions/emailsettings.php:169 msgid "Send me email when someone sends me a private message." -msgstr "" +msgstr "Send meg en e-post når noen sender meg en privat melding." #: actions/emailsettings.php:174 msgid "Send me email when someone sends me an \"@-reply\"." -msgstr "" +msgstr "Send meg en e-post når noen sender meg et «@-svar»." #: actions/emailsettings.php:179 msgid "Allow friends to nudge me and send me an email." @@ -1357,7 +1354,7 @@ msgstr "" #: actions/emailsettings.php:185 msgid "I want to post notices by email." -msgstr "" +msgstr "Jeg vil poste notiser med e-post." #: actions/emailsettings.php:191 msgid "Publish a MicroID for my email address." @@ -1387,12 +1384,12 @@ msgstr "Det er allerede din e-postadresse." #: actions/emailsettings.php:337 msgid "That email address already belongs to another user." -msgstr "" +msgstr "Den e-postadressen tilhører allerede en annen bruker." #: actions/emailsettings.php:353 actions/imsettings.php:319 #: actions/smssettings.php:337 msgid "Couldn't insert confirmation code." -msgstr "" +msgstr "Kunne ikke sette inn bekreftelseskode." #: actions/emailsettings.php:359 msgid "" @@ -1427,7 +1424,7 @@ msgstr "Adressen ble fjernet." #: actions/emailsettings.php:446 actions/smssettings.php:518 msgid "No incoming email address." -msgstr "" +msgstr "Ingen innkommende e-postadresse." #: actions/emailsettings.php:456 actions/emailsettings.php:478 #: actions/smssettings.php:528 actions/smssettings.php:552 @@ -1440,15 +1437,15 @@ msgstr "" #: actions/emailsettings.php:481 actions/smssettings.php:555 msgid "New incoming email address added." -msgstr "" +msgstr "Ny innkommende e-postadresse lagt til." #: actions/favor.php:79 msgid "This notice is already a favorite!" -msgstr "" +msgstr "Denne notisen er allerede en favoritt." #: actions/favor.php:92 lib/disfavorform.php:140 msgid "Disfavor favorite" -msgstr "" +msgstr "Fjern favoritt" #: actions/favorited.php:65 lib/popularnoticesection.php:91 #: lib/publicgroupnav.php:93 @@ -1508,14 +1505,12 @@ msgid "A selection of some great users on %s" msgstr "" #: actions/file.php:34 -#, fuzzy msgid "No notice ID." -msgstr "Nytt nick" +msgstr "Ingen notis-ID." #: actions/file.php:38 -#, fuzzy msgid "No notice." -msgstr "Nytt nick" +msgstr "Ingen notis." #: actions/file.php:42 msgid "No attachments." @@ -1566,40 +1561,37 @@ msgid "Cannot read file." msgstr "Kan ikke lese fil." #: actions/grantrole.php:62 actions/revokerole.php:62 -#, fuzzy msgid "Invalid role." -msgstr "Ugyldig symbol." +msgstr "Ugyldig rolle." #: actions/grantrole.php:66 actions/revokerole.php:66 msgid "This role is reserved and cannot be set." -msgstr "" +msgstr "Denne rollen er reservert og kan ikke stilles inn." #: actions/grantrole.php:75 -#, fuzzy msgid "You cannot grant user roles on this site." -msgstr "Du er allerede logget inn!" +msgstr "Du kan ikke tildele brukerroller på dette nettstedet." #: actions/grantrole.php:82 -#, fuzzy msgid "User already has this role." -msgstr "Du er allerede logget inn!" +msgstr "Bruker har allerede denne rollen." #: actions/groupblock.php:71 actions/groupunblock.php:71 #: actions/makeadmin.php:71 actions/subedit.php:46 #: lib/profileformaction.php:70 msgid "No profile specified." -msgstr "" +msgstr "Ingen profil oppgitt." #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 #: actions/unsubscribe.php:84 lib/profileformaction.php:77 msgid "No profile with that ID." -msgstr "" +msgstr "Ingen profil med den ID'en." #: actions/groupblock.php:81 actions/groupunblock.php:81 #: actions/makeadmin.php:81 msgid "No group specified." -msgstr "" +msgstr "Ingen gruppe oppgitt." #: actions/groupblock.php:91 msgid "Only an admin can block group members." @@ -1612,11 +1604,11 @@ msgstr "Du er allerede logget inn!" #: actions/groupblock.php:100 msgid "User is not a member of group." -msgstr "" +msgstr "Bruker er ikke et medlem av gruppa." #: actions/groupblock.php:136 actions/groupmembers.php:323 msgid "Block user from group" -msgstr "" +msgstr "Blokker bruker fra gruppe" #: actions/groupblock.php:162 #, php-format @@ -1628,7 +1620,7 @@ msgstr "" #: actions/groupblock.php:178 msgid "Do not block this user from this group" -msgstr "" +msgstr "Ikke blokker denne brukeren fra denne gruppa" #: actions/groupblock.php:179 msgid "Block this user from this group" @@ -1727,7 +1719,7 @@ msgstr "Gjør til administrator" msgid "Make this user an admin" msgstr "Gjør denne brukeren til administrator" -#: actions/grouprss.php:138 actions/userrss.php:90 +#: actions/grouprss.php:138 actions/userrss.php:93 #: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67 #, php-format msgid "%s timeline" @@ -1977,7 +1969,6 @@ msgstr "" #. TRANS: Send button for inviting friends #: actions/invite.php:198 -#, fuzzy msgctxt "BUTTON" msgid "Send" msgstr "Send" @@ -2044,9 +2035,8 @@ msgid "You must be logged in to join a group." msgstr "Du må være innlogget for å bli med i en gruppe." #: actions/joingroup.php:88 actions/leavegroup.php:88 -#, fuzzy msgid "No nickname or ID." -msgstr "Ingen kallenavn." +msgstr "ngen kallenavn eller ID." #: actions/joingroup.php:141 #, php-format @@ -2160,28 +2150,28 @@ msgstr "Klarte ikke å lagre avatar-informasjonen" #: actions/newgroup.php:53 msgid "New group" -msgstr "" +msgstr "Ny gruppe" #: actions/newgroup.php:110 msgid "Use this form to create a new group." -msgstr "" +msgstr "Bruk dette skjemaet for å opprette en ny gruppe." #: actions/newmessage.php:71 actions/newmessage.php:231 msgid "New message" -msgstr "" +msgstr "Ny melding" #: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 msgid "You can't send a message to this user." -msgstr "" +msgstr "Du kan ikke sende en melding til denne brukeren." #: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 #: lib/command.php:475 msgid "No content!" -msgstr "" +msgstr "Inget innhold." #: actions/newmessage.php:158 msgid "No recipient specified." -msgstr "" +msgstr "Ingen mottaker oppgitt." #: actions/newmessage.php:164 lib/command.php:361 msgid "" @@ -2190,7 +2180,7 @@ msgstr "" #: actions/newmessage.php:181 msgid "Message sent" -msgstr "" +msgstr "Melding sendt" #: actions/newmessage.php:185 #, fuzzy, php-format @@ -2199,15 +2189,15 @@ msgstr "Direktemeldinger til %s" #: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 msgid "Ajax Error" -msgstr "" +msgstr "Ajax-feil" #: actions/newnotice.php:69 msgid "New notice" -msgstr "" +msgstr "Ny notis" #: actions/newnotice.php:211 msgid "Notice posted" -msgstr "" +msgstr "Notis postet" #: actions/noticesearch.php:68 #, php-format @@ -2345,7 +2335,7 @@ msgstr "" #: actions/othersettings.php:108 msgid " (free service)" -msgstr "" +msgstr " (gratis tjeneste)" #: actions/othersettings.php:116 msgid "Shorten URLs with" @@ -4343,7 +4333,7 @@ msgstr "Du er allerede logget inn!" msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" -#: actions/userrss.php:92 lib/atomgroupnoticefeed.php:66 +#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66 #: lib/atomusernoticefeed.php:72 #, php-format msgid "Updates from %1$s on %2$s!" @@ -4644,59 +4634,50 @@ msgid "Invite friends and colleagues to join you on %s" msgstr "" #: lib/action.php:456 -#, fuzzy msgctxt "MENU" msgid "Invite" -msgstr "Kun invitasjon" +msgstr "Inviter" #. TRANS: Tooltip for main menu option "Logout" #: lib/action.php:462 -#, fuzzy msgctxt "TOOLTIP" msgid "Logout from the site" -msgstr "Tema for nettstedet." +msgstr "Logg ut fra nettstedet" #: lib/action.php:465 -#, fuzzy msgctxt "MENU" msgid "Logout" msgstr "Logg ut" #. TRANS: Tooltip for main menu option "Register" #: lib/action.php:470 -#, fuzzy msgctxt "TOOLTIP" msgid "Create an account" -msgstr "Opprett en ny konto" +msgstr "Opprett en konto" #: lib/action.php:473 -#, fuzzy msgctxt "MENU" msgid "Register" -msgstr "Registrering" +msgstr "Registrer" #. TRANS: Tooltip for main menu option "Login" #: lib/action.php:476 -#, fuzzy msgctxt "TOOLTIP" msgid "Login to the site" -msgstr "Tema for nettstedet." +msgstr "Log inn på nettstedet" #: lib/action.php:479 -#, fuzzy msgctxt "MENU" msgid "Login" msgstr "Logg inn" #. TRANS: Tooltip for main menu option "Help" #: lib/action.php:482 -#, fuzzy msgctxt "TOOLTIP" msgid "Help me!" -msgstr "Hjelp" +msgstr "Hjelp meg." #: lib/action.php:485 -#, fuzzy msgctxt "MENU" msgid "Help" msgstr "Hjelp" @@ -4705,10 +4686,9 @@ msgstr "Hjelp" #: lib/action.php:488 msgctxt "TOOLTIP" msgid "Search for people or text" -msgstr "" +msgstr "Søk etter personer eller tekst" #: lib/action.php:491 -#, fuzzy msgctxt "MENU" msgid "Search" msgstr "Søk" @@ -4809,11 +4789,11 @@ msgstr "" #: lib/action.php:847 msgid "All " -msgstr "" +msgstr "Alle " #: lib/action.php:853 msgid "license." -msgstr "" +msgstr "lisens." #: lib/action.php:1152 msgid "Pagination" @@ -4821,12 +4801,11 @@ msgstr "" #: lib/action.php:1161 msgid "After" -msgstr "" +msgstr "Etter" #: lib/action.php:1169 -#, fuzzy msgid "Before" -msgstr "Tidligere »" +msgstr "Før" #: lib/activity.php:453 msgid "Can't handle remote content yet." @@ -4843,7 +4822,7 @@ msgstr "" #. TRANS: Client error message #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." -msgstr "" +msgstr "Du kan ikke gjøre endringer på dette nettstedet." #. TRANS: Client error message #: lib/adminpanelaction.php:110 @@ -5116,12 +5095,12 @@ msgstr "%1$s sin status på %2$s" msgid "Fullname: %s" msgstr "Fullt navn" -#: lib/command.php:312 lib/mail.php:254 +#: lib/command.php:312 lib/mail.php:258 #, php-format msgid "Location: %s" msgstr "" -#: lib/command.php:315 lib/mail.php:256 +#: lib/command.php:315 lib/mail.php:260 #, php-format msgid "Homepage: %s" msgstr "" @@ -5456,31 +5435,30 @@ msgstr "" #: lib/groupnav.php:85 msgid "Group" -msgstr "" +msgstr "Gruppe" #: lib/groupnav.php:101 msgid "Blocked" -msgstr "" +msgstr "Blokkert" #: lib/groupnav.php:102 #, php-format msgid "%s blocked users" -msgstr "" +msgstr "%s blokkerte brukere" #: lib/groupnav.php:108 #, php-format msgid "Edit %s group properties" -msgstr "" +msgstr "Rediger %s gruppeegenskaper" #: lib/groupnav.php:113 -#, fuzzy msgid "Logo" -msgstr "Logg ut" +msgstr "Logo" #: lib/groupnav.php:114 #, php-format msgid "Add or edit %s logo" -msgstr "" +msgstr "Legg til eller rediger %s logo" #: lib/groupnav.php:120 #, php-format @@ -5489,11 +5467,11 @@ msgstr "" #: lib/groupsbymemberssection.php:71 msgid "Groups with most members" -msgstr "" +msgstr "Grupper med flest medlemmer" #: lib/groupsbypostssection.php:71 msgid "Groups with most posts" -msgstr "" +msgstr "Grupper med flest innlegg" #: lib/grouptagcloudsection.php:56 #, php-format @@ -5502,81 +5480,76 @@ msgstr "" #: lib/htmloutputter.php:103 msgid "This page is not available in a media type you accept" -msgstr "" +msgstr "Denne siden er ikke tilgjengelig i en mediatype du aksepterer" #: lib/imagefile.php:75 #, php-format msgid "That file is too big. The maximum file size is %s." -msgstr "" +msgstr "Filen er for stor. Maks filstørrelse er %s." #: lib/imagefile.php:80 msgid "Partial upload." -msgstr "" +msgstr "Delvis opplasting." #: lib/imagefile.php:88 lib/mediafile.php:170 msgid "System error uploading file." -msgstr "" +msgstr "Systemfeil ved opplasting av fil." #: lib/imagefile.php:96 msgid "Not an image or corrupt file." -msgstr "" +msgstr "Ikke et bilde eller en korrupt fil." #: lib/imagefile.php:109 msgid "Unsupported image file format." -msgstr "" +msgstr "Bildefilformatet støttes ikke." #: lib/imagefile.php:122 -#, fuzzy msgid "Lost our file." -msgstr "Klarte ikke å lagre profil." +msgstr "Mistet filen vår." #: lib/imagefile.php:166 lib/imagefile.php:231 msgid "Unknown file type" -msgstr "" +msgstr "Ukjent filtype" #: lib/imagefile.php:251 msgid "MB" -msgstr "" +msgstr "MB" #: lib/imagefile.php:253 msgid "kB" -msgstr "" +msgstr "kB" #: lib/jabber.php:220 #, php-format msgid "[%s]" -msgstr "" +msgstr "[%s]" #: lib/jabber.php:400 #, php-format msgid "Unknown inbox source %d." -msgstr "" +msgstr "Ukjent innbokskilde %d." #: lib/joinform.php:114 -#, fuzzy msgid "Join" -msgstr "Logg inn" +msgstr "Bli med" #: lib/leaveform.php:114 -#, fuzzy msgid "Leave" -msgstr "Lagre" +msgstr "Forlat" #: lib/logingroupnav.php:80 -#, fuzzy msgid "Login with a username and password" -msgstr "Ugyldig brukernavn eller passord" +msgstr "Logg inn med brukernavn og passord" #: lib/logingroupnav.php:86 -#, fuzzy msgid "Sign up for a new account" -msgstr "Opprett en ny konto" +msgstr "Registrer deg for en ny konto" -#: lib/mail.php:172 +#: lib/mail.php:173 msgid "Email address confirmation" -msgstr "" +msgstr "Bekreftelse av e-postadresse" -#: lib/mail.php:174 +#: lib/mail.php:175 #, php-format msgid "" "Hey, %s.\n" @@ -5592,14 +5565,26 @@ msgid "" "Thanks for your time, \n" "%s\n" msgstr "" +"Hei %s.\n" +"\n" +"Noen skrev nettopp inn denne e-postadressen på %s.\n" +"\n" +"Dersom det var deg og du vil bekrefte det, bruk nettadressen under:\n" +"\n" +"%s\n" +"\n" +"Om ikke, bare ignorer denne meldingen.\n" +"\n" +"Takk for tiden din,\n" +"%s\n" -#: lib/mail.php:236 +#: lib/mail.php:240 #, php-format msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s lytter nå til dine notiser på %2$s." -#: lib/mail.php:241 -#, fuzzy, php-format +#: lib/mail.php:245 +#, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" "\n" @@ -5614,22 +5599,26 @@ msgid "" msgstr "" "%1$s lytter nå til dine notiser på %2$s.\n" "\n" -"\t%3$s\n" +"%3$s\n" "\n" +"%4$s%5$s%6$s\n" "Vennlig hilsen,\n" -"%4$s.\n" +"%7$s.\n" +"\n" +"----\n" +"Endre e-postadressen din eller dine varslingsvalg på %8$s\n" -#: lib/mail.php:258 -#, fuzzy, php-format +#: lib/mail.php:262 +#, php-format msgid "Bio: %s" -msgstr "Om meg" +msgstr "Biografi: %s" -#: lib/mail.php:286 +#: lib/mail.php:290 #, php-format msgid "New email address for posting to %s" -msgstr "" +msgstr "Ny e-postadresse for posting til %s" -#: lib/mail.php:289 +#: lib/mail.php:293 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5641,22 +5630,30 @@ msgid "" "Faithfully yours,\n" "%4$s" msgstr "" +"Du har en ny adresse for posting på %1$s.\n" +"\n" +"Send e-post til %2$s for å poste nye meldinger.\n" +"\n" +"Flere e-postinstrukser på %3$s.\n" +"\n" +"Vennlig hilsen,\n" +"%4$s" -#: lib/mail.php:413 +#: lib/mail.php:417 #, php-format msgid "%s status" msgstr "%s status" -#: lib/mail.php:439 +#: lib/mail.php:443 msgid "SMS confirmation" -msgstr "" +msgstr "SMS-bekreftelse" -#: lib/mail.php:463 +#: lib/mail.php:467 #, php-format msgid "You've been nudged by %s" -msgstr "" +msgstr "Du har blitt knuffet av %s" -#: lib/mail.php:467 +#: lib/mail.php:471 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -5671,13 +5668,24 @@ msgid "" "With kind regards,\n" "%4$s\n" msgstr "" +"%1$s (%2$s) lurer på hva du gjør nå for tiden og inviterer deg til å poste " +"noen nyheter.\n" +"\n" +"La oss høre fra deg :)\n" +"\n" +"%3$s\n" +"\n" +"Ikke svar på denne e-posten; det vil ikke nå frem til dem.\n" +"\n" +"Med vennlig hilsen,\n" +"%4$s\n" -#: lib/mail.php:510 +#: lib/mail.php:517 #, php-format msgid "New private message from %s" -msgstr "" +msgstr "Ny privat melding fra %s" -#: lib/mail.php:514 +#: lib/mail.php:521 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -5695,13 +5703,27 @@ msgid "" "With kind regards,\n" "%5$s\n" msgstr "" +"%1$s (%2$s) sendte deg en privat melding:\n" +"\n" +"------------------------------------------------------\n" +"%3$s\n" +"------------------------------------------------------\n" +"\n" +"Du kan svare på deres melding her:\n" +"\n" +"%4$s\n" +"\n" +"Ikke svar på denne e-posten; det vil ikke nå frem til dem.\n" +"\n" +"Med vennlig hilsen,\n" +"%5$s\n" -#: lib/mail.php:559 +#: lib/mail.php:568 #, php-format msgid "%s (@%s) added your notice as a favorite" -msgstr "" +msgstr "%s /@%s) la din notis til som en favoritt" -#: lib/mail.php:561 +#: lib/mail.php:570 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -5721,13 +5743,29 @@ msgid "" "Faithfully yours,\n" "%6$s\n" msgstr "" +"%1$s (@%7$s) la akkurat din notis fra %2$s til som en av sine favoritter.\n" +"\n" +"Nettadressen til din notis er:\n" +"\n" +"%3$s\n" +"\n" +"Teksten i din notis er:\n" +"\n" +"%4$s\n" +"\n" +"Du kan se listen over %1$s sine favoritter her:\n" +"\n" +"%5$s\n" +"\n" +"Vennlig hilsen,\n" +"%6$s\n" -#: lib/mail.php:624 +#: lib/mail.php:635 #, php-format msgid "%s (@%s) sent a notice to your attention" -msgstr "" +msgstr "%s (@%s) sendte en notis for din oppmerksomhet" -#: lib/mail.php:626 +#: lib/mail.php:637 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -5741,29 +5779,42 @@ msgid "" "\t%4$s\n" "\n" msgstr "" +"%1$s (@%9$s) sendte deg akkurat en notis for din oppmerksomhet (et '@-svar') " +"på %2$s.\n" +"\n" +"Notisen er her:\n" +"\n" +"%3$s\n" +"\n" +"Den lyder:\n" +"\n" +"%4$s\n" +"\n" #: lib/mailbox.php:89 msgid "Only the user can read their own mailboxes." -msgstr "" +msgstr "Bare brukeren kan lese sine egne postbokser." #: 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 "" +"Du har ingen private meldinger. Du kan sende private meldinger for å " +"engasjere andre brukere i en samtale. Personer kan sende deg meldinger som " +"bare du kan se." #: lib/mailbox.php:227 lib/noticelist.php:482 -#, fuzzy msgid "from" msgstr "fra" #: lib/mailhandler.php:37 msgid "Could not parse message." -msgstr "" +msgstr "Kunne ikke tolke meldingen." #: lib/mailhandler.php:42 msgid "Not a registered user." -msgstr "" +msgstr "Ikke en registrert bruker." #: lib/mailhandler.php:46 msgid "Sorry, that is not your incoming email address." @@ -5774,9 +5825,9 @@ msgid "Sorry, no incoming email allowed." msgstr "" #: lib/mailhandler.php:228 -#, fuzzy, php-format +#, php-format msgid "Unsupported message type: %s" -msgstr "Direktemeldinger til %s" +msgstr "Meldingstypen støttes ikke: %s" #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." @@ -5806,103 +5857,100 @@ msgstr "" #: lib/mediafile.php:165 msgid "File upload stopped by extension." -msgstr "" +msgstr "Filopplasting stoppet grunnet filendelse." #: lib/mediafile.php:179 lib/mediafile.php:216 msgid "File exceeds user's quota." -msgstr "" +msgstr "Fil overgår brukers kvote." #: lib/mediafile.php:196 lib/mediafile.php:233 msgid "File could not be moved to destination directory." -msgstr "" +msgstr "Filen kunne ikke flyttes til målmappen." #: lib/mediafile.php:201 lib/mediafile.php:237 -#, fuzzy msgid "Could not determine file's MIME type." -msgstr "Klarte ikke å oppdatere bruker." +msgstr "Kunne ikke avgjøre filens MIME-type." #: lib/mediafile.php:270 #, php-format msgid " Try using another %s format." -msgstr "" +msgstr " Prøv å bruke et annet %s-format." #: lib/mediafile.php:275 #, php-format msgid "%s is not a supported file type on this server." -msgstr "" +msgstr "filtypen %s støttes ikke på denne tjeneren." #: lib/messageform.php:120 msgid "Send a direct notice" -msgstr "" +msgstr "Send en direktenotis" #: lib/messageform.php:146 msgid "To" -msgstr "" +msgstr "Til" #: lib/messageform.php:159 lib/noticeform.php:185 -#, fuzzy msgid "Available characters" -msgstr "6 eller flere tegn" +msgstr "Tilgjengelige tegn" #: lib/messageform.php:178 lib/noticeform.php:236 -#, fuzzy msgctxt "Send button for sending notice" msgid "Send" msgstr "Send" #: lib/noticeform.php:160 msgid "Send a notice" -msgstr "" +msgstr "Send en notis" #: lib/noticeform.php:173 #, php-format msgid "What's up, %s?" -msgstr "" +msgstr "Hva skjer %s?" #: lib/noticeform.php:192 msgid "Attach" -msgstr "" +msgstr "Legg ved" #: lib/noticeform.php:196 msgid "Attach a file" -msgstr "" +msgstr "Legg ved en fil" #: lib/noticeform.php:212 -#, fuzzy msgid "Share my location" -msgstr "Klarte ikke å lagre profil." +msgstr "Del min posisjon" #: lib/noticeform.php:215 -#, fuzzy msgid "Do not share my location" -msgstr "Klarte ikke å lagre profil." +msgstr "Ikke del min posisjon" #: lib/noticeform.php:216 msgid "" "Sorry, retrieving your geo location is taking longer than expected, please " "try again later" msgstr "" +"Beklager, henting av din geoposisjon tar lenger tid enn forventet, prøv " +"igjen senere" #: lib/noticelist.php:429 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" -msgstr "" +msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" #: lib/noticelist.php:430 msgid "N" -msgstr "" +msgstr "N" #: lib/noticelist.php:430 msgid "S" -msgstr "" +msgstr "S" #: lib/noticelist.php:431 msgid "E" -msgstr "" +msgstr "Ø" #: lib/noticelist.php:431 msgid "W" -msgstr "" +msgstr "V" #: lib/noticelist.php:438 msgid "at" @@ -5913,35 +5961,32 @@ msgid "in context" msgstr "" #: lib/noticelist.php:601 -#, fuzzy msgid "Repeated by" -msgstr "Opprett" +msgstr "Repetert av" #: lib/noticelist.php:628 msgid "Reply to this notice" -msgstr "" +msgstr "Svar på denne notisen" #: lib/noticelist.php:629 -#, fuzzy msgid "Reply" -msgstr "svar" +msgstr "Svar" #: lib/noticelist.php:673 -#, fuzzy msgid "Notice repeated" -msgstr "Nytt nick" +msgstr "Notis repetert" #: lib/nudgeform.php:116 msgid "Nudge this user" -msgstr "" +msgstr "Knuff denne brukeren" #: lib/nudgeform.php:128 msgid "Nudge" -msgstr "" +msgstr "Knuff" #: lib/nudgeform.php:128 msgid "Send a nudge to this user" -msgstr "" +msgstr "Send et knuff til denne brukeren" #: lib/oauthstore.php:283 msgid "Error inserting new profile" @@ -5957,7 +6002,7 @@ msgstr "" #: lib/oauthstore.php:345 msgid "Duplicate notice" -msgstr "" +msgstr "Duplikatnotis" #: lib/oauthstore.php:490 msgid "Couldn't insert new subscription." @@ -5973,23 +6018,23 @@ msgstr "Svar" #: lib/personalgroupnav.php:114 msgid "Favorites" -msgstr "" +msgstr "Favoritter" #: lib/personalgroupnav.php:125 msgid "Inbox" -msgstr "" +msgstr "Innboks" #: lib/personalgroupnav.php:126 msgid "Your incoming messages" -msgstr "" +msgstr "Dine innkommende meldinger" #: lib/personalgroupnav.php:130 msgid "Outbox" -msgstr "" +msgstr "Utboks" #: lib/personalgroupnav.php:131 msgid "Your sent messages" -msgstr "" +msgstr "Dine sendte meldinger" #: lib/personaltagcloudsection.php:56 #, php-format @@ -5998,11 +6043,11 @@ msgstr "" #: lib/plugin.php:114 msgid "Unknown" -msgstr "" +msgstr "Ukjent" #: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 msgid "Subscriptions" -msgstr "" +msgstr "Abonnement" #: lib/profileaction.php:126 msgid "All subscriptions" @@ -6010,16 +6055,15 @@ msgstr "Alle abonnementer" #: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 msgid "Subscribers" -msgstr "" +msgstr "Abonnenter" #: lib/profileaction.php:159 -#, fuzzy msgid "All subscribers" -msgstr "Alle abonnementer" +msgstr "Alle abonnenter" #: lib/profileaction.php:180 msgid "User ID" -msgstr "" +msgstr "Bruker-ID" #: lib/profileaction.php:185 msgid "Member since" @@ -6027,7 +6071,7 @@ msgstr "Medlem siden" #: lib/profileaction.php:247 msgid "All groups" -msgstr "" +msgstr "Alle grupper" #: lib/profileformaction.php:123 msgid "No return-to arguments." @@ -6035,16 +6079,15 @@ msgstr "" #: lib/profileformaction.php:137 msgid "Unimplemented method." -msgstr "" +msgstr "Ikke-implementert metode." #: lib/publicgroupnav.php:78 -#, fuzzy msgid "Public" msgstr "Offentlig" #: lib/publicgroupnav.php:82 msgid "User groups" -msgstr "" +msgstr "Brukergrupper" #: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85 #, fuzzy @@ -6060,14 +6103,12 @@ msgid "Popular" msgstr "" #: lib/repeatform.php:107 -#, fuzzy msgid "Repeat this notice?" -msgstr "Kan ikke slette notisen." +msgstr "Repeter denne notisen?" #: lib/repeatform.php:132 -#, fuzzy msgid "Repeat this notice" -msgstr "Kan ikke slette notisen." +msgstr "Repeter denne notisen" #: lib/revokeroleform.php:91 #, php-format @@ -6088,38 +6129,36 @@ msgid "Sandbox this user" msgstr "Kan ikke slette notisen." #: lib/searchaction.php:120 -#, fuzzy msgid "Search site" -msgstr "Søk" +msgstr "Søk nettsted" #: lib/searchaction.php:126 msgid "Keyword(s)" -msgstr "" +msgstr "Nøkkelord" #: lib/searchaction.php:127 msgid "Search" msgstr "Søk" #: lib/searchaction.php:162 -#, fuzzy msgid "Search help" -msgstr "Søk" +msgstr "Søkehjelp" #: lib/searchgroupnav.php:80 msgid "People" -msgstr "" +msgstr "Personer" #: lib/searchgroupnav.php:81 msgid "Find people on this site" -msgstr "" +msgstr "Finn personer på dette nettstedet" #: lib/searchgroupnav.php:83 msgid "Find content of notices" -msgstr "" +msgstr "Finn innhold i notiser" #: lib/searchgroupnav.php:85 msgid "Find groups on this site" -msgstr "" +msgstr "Finn grupper på dette nettstedet" #: lib/section.php:89 msgid "Untitled section" @@ -6127,7 +6166,7 @@ msgstr "" #: lib/section.php:106 msgid "More..." -msgstr "" +msgstr "Mer..." #: lib/silenceform.php:67 msgid "Silence" @@ -6155,7 +6194,7 @@ msgstr "" #: lib/subgroupnav.php:105 msgid "Invite" -msgstr "" +msgstr "Inviter" #: lib/subgroupnav.php:106 #, php-format @@ -6174,7 +6213,7 @@ msgstr "" #: lib/tagcloudsection.php:56 msgid "None" -msgstr "" +msgstr "Ingen" #: lib/topposterssection.php:74 msgid "Top posters" @@ -6216,40 +6255,38 @@ msgid "User actions" msgstr "" #: lib/userprofile.php:251 -#, fuzzy msgid "Edit profile settings" -msgstr "Endre profilinnstillingene dine" +msgstr "Endre profilinnstillinger" #: lib/userprofile.php:252 msgid "Edit" -msgstr "" +msgstr "Rediger" #: lib/userprofile.php:275 msgid "Send a direct message to this user" -msgstr "" +msgstr "Send en direktemelding til denne brukeren" #: lib/userprofile.php:276 msgid "Message" -msgstr "" +msgstr "Melding" #: lib/userprofile.php:314 msgid "Moderate" -msgstr "" +msgstr "Moderer" #: lib/userprofile.php:352 -#, fuzzy msgid "User role" -msgstr "Klarte ikke å lagre profil." +msgstr "Brukerrolle" #: lib/userprofile.php:354 msgctxt "role" msgid "Administrator" -msgstr "" +msgstr "Administrator" #: lib/userprofile.php:355 msgctxt "role" msgid "Moderator" -msgstr "" +msgstr "Moderator" #: lib/util.php:1015 msgid "a few seconds ago" @@ -6298,14 +6335,14 @@ msgstr "omtrent ett år siden" #: lib/webcolor.php:82 #, php-format msgid "%s is not a valid color!" -msgstr "" +msgstr "%s er ikke en gyldig farge." #: lib/webcolor.php:123 #, php-format msgid "%s is not a valid color! Use 3 or 6 hex chars." -msgstr "" +msgstr "%s er ikke en gyldig farge. Bruk 3 eller 6 heksadesimale tegn." #: lib/xmppmanager.php:402 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." -msgstr "" +msgstr "Melding for lang - maks er %1$d tegn, du sendte %2$d." diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po index 2b1b48ade..c73771f84 100644 --- a/locale/nl/LC_MESSAGES/statusnet.po +++ b/locale/nl/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-04 18:55+0000\n" -"PO-Revision-Date: 2010-03-05 22:36:21+0000\n" +"POT-Creation-Date: 2010-03-06 23:49+0000\n" +"PO-Revision-Date: 2010-03-06 23:50:33+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63299); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: nl\n" "X-Message-Group: out-statusnet\n" @@ -102,7 +102,7 @@ msgstr "Deze pagina bestaat niet" #: actions/otp.php:76 actions/remotesubscribe.php:145 #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 +#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:302 #: lib/command.php:355 lib/command.php:401 lib/command.php:462 #: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82 @@ -712,7 +712,7 @@ msgstr "Herhaald van %s" msgid "Notices tagged with %s" msgstr "Mededelingen met het label %s" -#: actions/apitimelinetag.php:104 actions/tagrss.php:64 +#: actions/apitimelinetag.php:104 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Updates met het label %1$s op %2$s!" @@ -753,7 +753,7 @@ msgstr "" #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 #: actions/remotesubscribe.php:191 actions/userauthorization.php:72 -#: actions/userrss.php:103 +#: actions/userrss.php:106 msgid "User without matching profile" msgstr "Gebruiker zonder bijbehorend profiel" @@ -1761,7 +1761,7 @@ msgstr "Beheerder maken" msgid "Make this user an admin" msgstr "Deze gebruiker beheerder maken" -#: actions/grouprss.php:138 actions/userrss.php:90 +#: actions/grouprss.php:138 actions/userrss.php:93 #: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67 #, php-format msgid "%s timeline" @@ -4499,7 +4499,7 @@ msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" "U kunt [naar groepen zoeken](%%action.groupsearch%%) en daar lid van worden." -#: actions/userrss.php:92 lib/atomgroupnoticefeed.php:66 +#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66 #: lib/atomusernoticefeed.php:72 #, php-format msgid "Updates from %1$s on %2$s!" @@ -5274,12 +5274,12 @@ msgstr "%s heeft de groep %s verlaten" msgid "Fullname: %s" msgstr "Volledige naam: %s" -#: lib/command.php:312 lib/mail.php:254 +#: lib/command.php:312 lib/mail.php:258 #, php-format msgid "Location: %s" msgstr "Locatie: %s" -#: lib/command.php:315 lib/mail.php:256 +#: lib/command.php:315 lib/mail.php:260 #, php-format msgid "Homepage: %s" msgstr "Thuispagina: %s" @@ -5763,11 +5763,11 @@ msgstr "Aanmelden met gebruikersnaam en wachtwoord" msgid "Sign up for a new account" msgstr "Nieuwe gebruiker aanmaken" -#: lib/mail.php:172 +#: lib/mail.php:173 msgid "Email address confirmation" msgstr "E-mailadresbevestiging" -#: lib/mail.php:174 +#: lib/mail.php:175 #, php-format msgid "" "Hey, %s.\n" @@ -5797,12 +5797,12 @@ msgstr "" "Dank u wel voor uw tijd.\n" "%s\n" -#: lib/mail.php:236 +#: lib/mail.php:240 #, php-format msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s volgt nu uw berichten %2$s." -#: lib/mail.php:241 +#: lib/mail.php:245 #, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -5827,17 +5827,17 @@ msgstr "" "----\n" "Wijzig uw e-mailadres of instellingen op %8$s\n" -#: lib/mail.php:258 +#: lib/mail.php:262 #, php-format msgid "Bio: %s" msgstr "Beschrijving: %s" -#: lib/mail.php:286 +#: lib/mail.php:290 #, php-format msgid "New email address for posting to %s" msgstr "Nieuw e-mailadres om e-mail te versturen aan %s" -#: lib/mail.php:289 +#: lib/mail.php:293 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5858,21 +5858,21 @@ msgstr "" "Met vriendelijke groet,\n" "%4$s" -#: lib/mail.php:413 +#: lib/mail.php:417 #, php-format msgid "%s status" msgstr "%s status" -#: lib/mail.php:439 +#: lib/mail.php:443 msgid "SMS confirmation" msgstr "SMS-bevestiging" -#: lib/mail.php:463 +#: lib/mail.php:467 #, php-format msgid "You've been nudged by %s" msgstr "%s heeft u gepord" -#: lib/mail.php:467 +#: lib/mail.php:471 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -5900,12 +5900,12 @@ msgstr "" "Met vriendelijke groet,\n" "%4$s\n" -#: lib/mail.php:510 +#: lib/mail.php:517 #, php-format msgid "New private message from %s" msgstr "U hebt een nieuw privébericht van %s." -#: lib/mail.php:514 +#: lib/mail.php:521 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -5939,12 +5939,12 @@ msgstr "" "Met vriendelijke groet,\n" "%5$s\n" -#: lib/mail.php:559 +#: lib/mail.php:568 #, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%s (@%s) heeft uw mededeling als favoriet toegevoegd" -#: lib/mail.php:561 +#: lib/mail.php:570 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -5982,12 +5982,12 @@ msgstr "" "Met vriendelijke groet,\n" "%6$s\n" -#: lib/mail.php:624 +#: lib/mail.php:635 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "%s (@%s) heeft u een mededeling gestuurd" -#: lib/mail.php:626 +#: lib/mail.php:637 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po index 72fe47924..a16e15649 100644 --- a/locale/nn/LC_MESSAGES/statusnet.po +++ b/locale/nn/LC_MESSAGES/statusnet.po @@ -7,12 +7,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-04 18:55+0000\n" -"PO-Revision-Date: 2010-03-05 22:36:11+0000\n" +"POT-Creation-Date: 2010-03-06 23:49+0000\n" +"PO-Revision-Date: 2010-03-06 23:50:30+0000\n" "Language-Team: Norwegian Nynorsk\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63299); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: nn\n" "X-Message-Group: out-statusnet\n" @@ -108,7 +108,7 @@ msgstr "Dette emneord finst ikkje." #: actions/otp.php:76 actions/remotesubscribe.php:145 #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 +#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:302 #: lib/command.php:355 lib/command.php:401 lib/command.php:462 #: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82 @@ -709,7 +709,7 @@ msgstr "Svar til %s" msgid "Notices tagged with %s" msgstr "Notisar merka med %s" -#: actions/apitimelinetag.php:104 actions/tagrss.php:64 +#: actions/apitimelinetag.php:104 actions/tagrss.php:65 #, fuzzy, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Oppdateringar frå %1$s på %2$s!" @@ -750,7 +750,7 @@ msgstr "Du kan laste opp ein personleg avatar." #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 #: actions/remotesubscribe.php:191 actions/userauthorization.php:72 -#: actions/userrss.php:103 +#: actions/userrss.php:106 msgid "User without matching profile" msgstr "Kan ikkje finne brukar" @@ -1798,7 +1798,7 @@ msgstr "Administrator" msgid "Make this user an admin" msgstr "" -#: actions/grouprss.php:138 actions/userrss.php:90 +#: actions/grouprss.php:138 actions/userrss.php:93 #: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67 #, php-format msgid "%s timeline" @@ -4512,7 +4512,7 @@ msgstr "Du er ikkje medlem av den gruppa." msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" -#: actions/userrss.php:92 lib/atomgroupnoticefeed.php:66 +#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66 #: lib/atomusernoticefeed.php:72 #, php-format msgid "Updates from %1$s on %2$s!" @@ -5309,12 +5309,12 @@ msgstr "%s forlot %s gruppa" msgid "Fullname: %s" msgstr "Fullt namn: %s" -#: lib/command.php:312 lib/mail.php:254 +#: lib/command.php:312 lib/mail.php:258 #, php-format msgid "Location: %s" msgstr "Stad: %s" -#: lib/command.php:315 lib/mail.php:256 +#: lib/command.php:315 lib/mail.php:260 #, php-format msgid "Homepage: %s" msgstr "Heimeside: %s" @@ -5761,11 +5761,11 @@ msgstr "Log inn med brukarnamn og passord." msgid "Sign up for a new account" msgstr "Opprett ny konto" -#: lib/mail.php:172 +#: lib/mail.php:173 msgid "Email address confirmation" msgstr "Stadfesting av epostadresse" -#: lib/mail.php:174 +#: lib/mail.php:175 #, php-format msgid "" "Hey, %s.\n" @@ -5782,12 +5782,12 @@ msgid "" "%s\n" msgstr "" -#: lib/mail.php:236 +#: lib/mail.php:240 #, php-format msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s høyrer no på notisane dine på %2$s." -#: lib/mail.php:241 +#: lib/mail.php:245 #, fuzzy, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -5808,19 +5808,19 @@ msgstr "" "Beste helsing,\n" "%4$s.\n" -#: lib/mail.php:258 +#: lib/mail.php:262 #, fuzzy, php-format msgid "Bio: %s" msgstr "" "Bio: %s\n" "\n" -#: lib/mail.php:286 +#: lib/mail.php:290 #, php-format msgid "New email address for posting to %s" msgstr "Ny epostadresse for å oppdatera %s" -#: lib/mail.php:289 +#: lib/mail.php:293 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5840,21 +5840,21 @@ msgstr "" "\n" "Helsing frå %4$s" -#: lib/mail.php:413 +#: lib/mail.php:417 #, php-format msgid "%s status" msgstr "%s status" -#: lib/mail.php:439 +#: lib/mail.php:443 msgid "SMS confirmation" msgstr "SMS bekreftelse" -#: lib/mail.php:463 +#: lib/mail.php:467 #, php-format msgid "You've been nudged by %s" msgstr "Du har blitt dulta av %s" -#: lib/mail.php:467 +#: lib/mail.php:471 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -5870,12 +5870,12 @@ msgid "" "%4$s\n" msgstr "" -#: lib/mail.php:510 +#: lib/mail.php:517 #, php-format msgid "New private message from %s" msgstr "Ny privat melding fra %s" -#: lib/mail.php:514 +#: lib/mail.php:521 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -5894,12 +5894,12 @@ msgid "" "%5$s\n" msgstr "" -#: lib/mail.php:559 +#: lib/mail.php:568 #, fuzzy, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%s la til di melding som ein favoritt" -#: lib/mail.php:561 +#: lib/mail.php:570 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -5920,12 +5920,12 @@ msgid "" "%6$s\n" msgstr "" -#: lib/mail.php:624 +#: lib/mail.php:635 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "" -#: lib/mail.php:626 +#: lib/mail.php:637 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po index e592ff747..3a0bd39c3 100644 --- a/locale/pl/LC_MESSAGES/statusnet.po +++ b/locale/pl/LC_MESSAGES/statusnet.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-04 18:55+0000\n" -"PO-Revision-Date: 2010-03-05 22:36:24+0000\n" +"POT-Creation-Date: 2010-03-06 23:49+0000\n" +"PO-Revision-Date: 2010-03-06 23:50:36+0000\n" "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n" "Language-Team: Polish <pl@li.org>\n" "MIME-Version: 1.0\n" @@ -19,7 +19,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" -"X-Generator: MediaWiki 1.17alpha (r63299); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pl\n" "X-Message-Group: out-statusnet\n" @@ -47,7 +47,6 @@ msgstr "Zabronić anonimowym użytkownikom (niezalogowanym) przeglądać witryn #. TRANS: Checkbox label for prohibiting anonymous users from viewing site. #: actions/accessadminpanel.php:167 -#, fuzzy msgctxt "LABEL" msgid "Private" msgstr "Prywatna" @@ -78,7 +77,6 @@ msgid "Save access settings" msgstr "Zapisz ustawienia dostępu" #: actions/accessadminpanel.php:203 -#, fuzzy msgctxt "BUTTON" msgid "Save" msgstr "Zapisz" @@ -107,7 +105,7 @@ msgstr "Nie ma takiej strony" #: actions/otp.php:76 actions/remotesubscribe.php:145 #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 +#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:302 #: lib/command.php:355 lib/command.php:401 lib/command.php:462 #: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82 @@ -702,7 +700,7 @@ msgstr "Powtórzenia %s" msgid "Notices tagged with %s" msgstr "Wpisy ze znacznikiem %s" -#: actions/apitimelinetag.php:104 actions/tagrss.php:64 +#: actions/apitimelinetag.php:104 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Aktualizacje ze znacznikiem %1$s na %2$s." @@ -742,7 +740,7 @@ msgstr "Można wysłać osobisty awatar. Maksymalny rozmiar pliku to %s." #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 #: actions/remotesubscribe.php:191 actions/userauthorization.php:72 -#: actions/userrss.php:103 +#: actions/userrss.php:106 msgid "User without matching profile" msgstr "Użytkownik bez odpowiadającego profilu" @@ -1575,23 +1573,20 @@ msgid "Cannot read file." msgstr "Nie można odczytać pliku." #: actions/grantrole.php:62 actions/revokerole.php:62 -#, fuzzy msgid "Invalid role." -msgstr "Nieprawidłowy token." +msgstr "Nieprawidłowa rola." #: actions/grantrole.php:66 actions/revokerole.php:66 msgid "This role is reserved and cannot be set." -msgstr "" +msgstr "Ta rola jest zastrzeżona i nie może zostać ustawiona." #: actions/grantrole.php:75 -#, fuzzy msgid "You cannot grant user roles on this site." -msgstr "Nie można ograniczać użytkowników na tej witrynie." +msgstr "Nie można udzielić rol użytkownikom na tej witrynie." #: actions/grantrole.php:82 -#, fuzzy msgid "User already has this role." -msgstr "Użytkownik jest już wyciszony." +msgstr "Użytkownik ma już tę rolę." #: actions/groupblock.php:71 actions/groupunblock.php:71 #: actions/makeadmin.php:71 actions/subedit.php:46 @@ -1736,7 +1731,7 @@ msgstr "Uczyń administratorem" msgid "Make this user an admin" msgstr "Uczyń tego użytkownika administratorem" -#: actions/grouprss.php:138 actions/userrss.php:90 +#: actions/grouprss.php:138 actions/userrss.php:93 #: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67 #, php-format msgid "%s timeline" @@ -2008,7 +2003,6 @@ msgstr "Opcjonalnie dodaj osobistą wiadomość do zaproszenia." #. TRANS: Send button for inviting friends #: actions/invite.php:198 -#, fuzzy msgctxt "BUTTON" msgid "Send" msgstr "Wyślij" @@ -3327,14 +3321,12 @@ msgid "Replies to %1$s on %2$s!" msgstr "odpowiedzi dla użytkownika %1$s na %2$s." #: actions/revokerole.php:75 -#, fuzzy msgid "You cannot revoke user roles on this site." -msgstr "Nie można wyciszać użytkowników na tej witrynie." +msgstr "Nie można unieważnić rol użytkowników na tej witrynie." #: actions/revokerole.php:82 -#, fuzzy msgid "User doesn't have this role." -msgstr "Użytkownik bez odpowiadającego profilu." +msgstr "Użytkownik nie ma tej roli." #: actions/rsd.php:146 actions/version.php:157 msgid "StatusNet" @@ -3738,9 +3730,8 @@ msgid "User is already silenced." msgstr "Użytkownik jest już wyciszony." #: actions/siteadminpanel.php:69 -#, fuzzy msgid "Basic settings for this StatusNet site" -msgstr "Podstawowe ustawienia tej witryny StatusNet." +msgstr "Podstawowe ustawienia tej witryny StatusNet" #: actions/siteadminpanel.php:133 msgid "Site name must have non-zero length." @@ -3808,13 +3799,14 @@ msgid "Default timezone for the site; usually UTC." msgstr "Domyśla strefa czasowa witryny, zwykle UTC." #: actions/siteadminpanel.php:262 -#, fuzzy msgid "Default language" -msgstr "Domyślny język witryny" +msgstr "Domyślny język" #: actions/siteadminpanel.php:263 msgid "Site language when autodetection from browser settings is not available" msgstr "" +"Język witryny, kiedy automatyczne wykrywanie z ustawień przeglądarki nie " +"jest dostępne" #: actions/siteadminpanel.php:271 msgid "Limits" @@ -3839,37 +3831,33 @@ msgstr "" "samo." #: actions/sitenoticeadminpanel.php:56 -#, fuzzy msgid "Site Notice" msgstr "Wpis witryny" #: actions/sitenoticeadminpanel.php:67 -#, fuzzy msgid "Edit site-wide message" -msgstr "Nowa wiadomość" +msgstr "Zmodyfikuj wiadomość witryny" #: actions/sitenoticeadminpanel.php:103 -#, fuzzy msgid "Unable to save site notice." -msgstr "Nie można zapisać ustawień wyglądu." +msgstr "Nie można zapisać wpisu witryny." #: actions/sitenoticeadminpanel.php:113 msgid "Max length for the site-wide notice is 255 chars" -msgstr "" +msgstr "Maksymalna długość wpisu witryny to 255 znaków" #: actions/sitenoticeadminpanel.php:176 -#, fuzzy msgid "Site notice text" -msgstr "Wpis witryny" +msgstr "Tekst wpisu witryny" #: actions/sitenoticeadminpanel.php:178 msgid "Site-wide notice text (255 chars max; HTML okay)" msgstr "" +"Tekst wpisu witryny (maksymalnie 255 znaków, można używać znaczników HTML)" #: actions/sitenoticeadminpanel.php:198 -#, fuzzy msgid "Save site notice" -msgstr "Wpis witryny" +msgstr "Zapisz wpis witryny" #: actions/smssettings.php:58 msgid "SMS settings" @@ -3977,9 +3965,8 @@ msgid "Snapshots" msgstr "Migawki" #: actions/snapshotadminpanel.php:65 -#, fuzzy msgid "Manage snapshot configuration" -msgstr "Zmień konfigurację witryny" +msgstr "Zarządzaj konfiguracją migawki" #: actions/snapshotadminpanel.php:127 msgid "Invalid snapshot run value." @@ -4026,9 +4013,8 @@ msgid "Snapshots will be sent to this URL" msgstr "Migawki będą wysyłane na ten adres URL" #: actions/snapshotadminpanel.php:248 -#, fuzzy msgid "Save snapshot settings" -msgstr "Zapisz ustawienia witryny" +msgstr "Zapisz ustawienia migawki" #: actions/subedit.php:70 msgid "You are not subscribed to that profile." @@ -4250,7 +4236,6 @@ msgstr "" #. TRANS: User admin panel title #: actions/useradminpanel.php:59 -#, fuzzy msgctxt "TITLE" msgid "User" msgstr "Użytkownik" @@ -4451,7 +4436,7 @@ msgstr "Użytkownik %s nie jest członkiem żadnej grupy." msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "Spróbuj [wyszukać grupy](%%action.groupsearch%%) i dołączyć do nich." -#: actions/userrss.php:92 lib/atomgroupnoticefeed.php:66 +#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66 #: lib/atomusernoticefeed.php:72 #, php-format msgid "Updates from %1$s on %2$s!" @@ -4643,9 +4628,8 @@ msgid "Couldn't delete self-subscription." msgstr "Nie można usunąć autosubskrypcji." #: classes/Subscription.php:190 -#, fuzzy msgid "Couldn't delete subscription OMB token." -msgstr "Nie można usunąć subskrypcji." +msgstr "Nie można usunąć tokenu subskrypcji OMB." #: classes/Subscription.php:201 lib/subs.php:69 msgid "Couldn't delete subscription." @@ -4715,27 +4699,23 @@ msgstr "Główna nawigacja witryny" #. TRANS: Tooltip for main menu option "Personal" #: lib/action.php:430 -#, fuzzy msgctxt "TOOLTIP" msgid "Personal profile and friends timeline" msgstr "Profil osobisty i oś czasu przyjaciół" #: lib/action.php:433 -#, fuzzy msgctxt "MENU" msgid "Personal" msgstr "Osobiste" #. TRANS: Tooltip for main menu option "Account" #: lib/action.php:435 -#, fuzzy msgctxt "TOOLTIP" msgid "Change your email, avatar, password, profile" msgstr "Zmień adres e-mail, awatar, hasło, profil" #. TRANS: Tooltip for main menu option "Services" #: lib/action.php:440 -#, fuzzy msgctxt "TOOLTIP" msgid "Connect to services" msgstr "Połącz z serwisami" @@ -4746,91 +4726,78 @@ msgstr "Połącz" #. TRANS: Tooltip for menu option "Admin" #: lib/action.php:446 -#, fuzzy msgctxt "TOOLTIP" msgid "Change site configuration" msgstr "Zmień konfigurację witryny" #: lib/action.php:449 -#, fuzzy msgctxt "MENU" msgid "Admin" msgstr "Administrator" #. TRANS: Tooltip for main menu option "Invite" #: lib/action.php:453 -#, fuzzy, php-format +#, php-format msgctxt "TOOLTIP" msgid "Invite friends and colleagues to join you on %s" msgstr "Zaproś przyjaciół i kolegów do dołączenia do ciebie na %s" #: lib/action.php:456 -#, fuzzy msgctxt "MENU" msgid "Invite" msgstr "Zaproś" #. TRANS: Tooltip for main menu option "Logout" #: lib/action.php:462 -#, fuzzy msgctxt "TOOLTIP" msgid "Logout from the site" msgstr "Wyloguj się z witryny" #: lib/action.php:465 -#, fuzzy msgctxt "MENU" msgid "Logout" msgstr "Wyloguj się" #. TRANS: Tooltip for main menu option "Register" #: lib/action.php:470 -#, fuzzy msgctxt "TOOLTIP" msgid "Create an account" msgstr "Utwórz konto" #: lib/action.php:473 -#, fuzzy msgctxt "MENU" msgid "Register" msgstr "Zarejestruj się" #. TRANS: Tooltip for main menu option "Login" #: lib/action.php:476 -#, fuzzy msgctxt "TOOLTIP" msgid "Login to the site" msgstr "Zaloguj się na witrynie" #: lib/action.php:479 -#, fuzzy msgctxt "MENU" msgid "Login" msgstr "Zaloguj się" #. TRANS: Tooltip for main menu option "Help" #: lib/action.php:482 -#, fuzzy msgctxt "TOOLTIP" msgid "Help me!" msgstr "Pomóż mi." #: lib/action.php:485 -#, fuzzy msgctxt "MENU" msgid "Help" msgstr "Pomoc" #. TRANS: Tooltip for main menu option "Search" #: lib/action.php:488 -#, fuzzy msgctxt "TOOLTIP" msgid "Search for people or text" msgstr "Wyszukaj osoby lub tekst" #: lib/action.php:491 -#, fuzzy msgctxt "MENU" msgid "Search" msgstr "Wyszukaj" @@ -5000,10 +4967,9 @@ msgstr "Podstawowa konfiguracja witryny" #. TRANS: Menu item for site administration #: lib/adminpanelaction.php:350 -#, fuzzy msgctxt "MENU" msgid "Site" -msgstr "Witryny" +msgstr "Witryna" #. TRANS: Menu item title/tooltip #: lib/adminpanelaction.php:356 @@ -5012,7 +4978,6 @@ msgstr "Konfiguracja wyglądu" #. TRANS: Menu item for site administration #: lib/adminpanelaction.php:358 -#, fuzzy msgctxt "MENU" msgid "Design" msgstr "Wygląd" @@ -5044,15 +5009,13 @@ msgstr "Konfiguracja sesji" #. TRANS: Menu item title/tooltip #: lib/adminpanelaction.php:396 -#, fuzzy msgid "Edit site notice" -msgstr "Wpis witryny" +msgstr "Zmodyfikuj wpis witryny" #. TRANS: Menu item title/tooltip #: lib/adminpanelaction.php:404 -#, fuzzy msgid "Snapshots configuration" -msgstr "Konfiguracja ścieżek" +msgstr "Konfiguracja migawek" #: lib/apiauth.php:94 msgid "API resource requires read-write access, but you only have read access." @@ -5244,12 +5207,12 @@ msgstr "Użytkownik %1$s opuścił grupę %2$s" msgid "Fullname: %s" msgstr "Imię i nazwisko: %s" -#: lib/command.php:312 lib/mail.php:254 +#: lib/command.php:312 lib/mail.php:258 #, php-format msgid "Location: %s" msgstr "Położenie: %s" -#: lib/command.php:315 lib/mail.php:256 +#: lib/command.php:315 lib/mail.php:260 #, php-format msgid "Homepage: %s" msgstr "Strona domowa: %s" @@ -5589,7 +5552,7 @@ msgstr "Przejdź" #: lib/grantroleform.php:91 #, php-format msgid "Grant this user the \"%s\" role" -msgstr "" +msgstr "Nadaj użytkownikowi rolę \"%s\"" #: lib/groupeditform.php:163 msgid "URL of the homepage or blog of the group or topic" @@ -5730,11 +5693,11 @@ msgstr "Zaloguj się za pomocą nazwy użytkownika i hasła" msgid "Sign up for a new account" msgstr "Załóż nowe konto" -#: lib/mail.php:172 +#: lib/mail.php:173 msgid "Email address confirmation" msgstr "Potwierdzenie adresu e-mail" -#: lib/mail.php:174 +#: lib/mail.php:175 #, php-format msgid "" "Hey, %s.\n" @@ -5764,12 +5727,12 @@ msgstr "" "Dziękujemy za twój czas, \n" "%s\n" -#: lib/mail.php:236 +#: lib/mail.php:240 #, php-format msgid "%1$s is now listening to your notices on %2$s." msgstr "Użytkownik %1$s obserwuje teraz twoje wpisy na %2$s." -#: lib/mail.php:241 +#: lib/mail.php:245 #, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -5794,17 +5757,17 @@ msgstr "" "----\n" "Zmień adres e-mail lub opcje powiadamiania na %8$s\n" -#: lib/mail.php:258 +#: lib/mail.php:262 #, php-format msgid "Bio: %s" msgstr "O mnie: %s" -#: lib/mail.php:286 +#: lib/mail.php:290 #, php-format msgid "New email address for posting to %s" msgstr "Nowy adres e-mail do wysyłania do %s" -#: lib/mail.php:289 +#: lib/mail.php:293 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5825,21 +5788,21 @@ msgstr "" "Z poważaniem,\n" "%4$s" -#: lib/mail.php:413 +#: lib/mail.php:417 #, php-format msgid "%s status" msgstr "Stan użytkownika %s" -#: lib/mail.php:439 +#: lib/mail.php:443 msgid "SMS confirmation" msgstr "Potwierdzenie SMS" -#: lib/mail.php:463 +#: lib/mail.php:467 #, php-format msgid "You've been nudged by %s" msgstr "Zostałeś szturchnięty przez %s" -#: lib/mail.php:467 +#: lib/mail.php:471 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -5866,12 +5829,12 @@ msgstr "" "Z poważaniem,\n" "%4$s\n" -#: lib/mail.php:510 +#: lib/mail.php:517 #, php-format msgid "New private message from %s" msgstr "Nowa prywatna wiadomość od użytkownika %s" -#: lib/mail.php:514 +#: lib/mail.php:521 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -5904,12 +5867,12 @@ msgstr "" "Z poważaniem,\n" "%5$s\n" -#: lib/mail.php:559 +#: lib/mail.php:568 #, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "Użytkownik %s (@%s) dodał twój wpis jako ulubiony" -#: lib/mail.php:561 +#: lib/mail.php:570 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -5947,12 +5910,12 @@ msgstr "" "Z poważaniem,\n" "%6$s\n" -#: lib/mail.php:624 +#: lib/mail.php:635 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "Użytkownik %s (@%s) wysłał wpis wymagający twojej uwagi" -#: lib/mail.php:626 +#: lib/mail.php:637 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -6298,9 +6261,9 @@ msgid "Repeat this notice" msgstr "Powtórz ten wpis" #: lib/revokeroleform.php:91 -#, fuzzy, php-format +#, php-format msgid "Revoke the \"%s\" role from this user" -msgstr "Zablokuj tego użytkownika w tej grupie" +msgstr "Unieważnij rolę \"%s\" tego użytkownika" #: lib/router.php:671 msgid "No single user defined for single-user mode." @@ -6458,21 +6421,18 @@ msgid "Moderate" msgstr "Moderuj" #: lib/userprofile.php:352 -#, fuzzy msgid "User role" -msgstr "Profil użytkownika" +msgstr "Rola użytkownika" #: lib/userprofile.php:354 -#, fuzzy msgctxt "role" msgid "Administrator" -msgstr "Administratorzy" +msgstr "Administrator" #: lib/userprofile.php:355 -#, fuzzy msgctxt "role" msgid "Moderator" -msgstr "Moderuj" +msgstr "Moderator" #: lib/util.php:1015 msgid "a few seconds ago" diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po index 27e75fe97..7041bea81 100644 --- a/locale/pt/LC_MESSAGES/statusnet.po +++ b/locale/pt/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-04 18:55+0000\n" -"PO-Revision-Date: 2010-03-05 22:36:27+0000\n" +"POT-Creation-Date: 2010-03-06 23:49+0000\n" +"PO-Revision-Date: 2010-03-06 23:50:48+0000\n" "Language-Team: Portuguese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63299); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pt\n" "X-Message-Group: out-statusnet\n" @@ -106,7 +106,7 @@ msgstr "Página não encontrada." #: actions/otp.php:76 actions/remotesubscribe.php:145 #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 +#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:302 #: lib/command.php:355 lib/command.php:401 lib/command.php:462 #: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82 @@ -700,7 +700,7 @@ msgstr "Repetências de %s" msgid "Notices tagged with %s" msgstr "Notas categorizadas com %s" -#: actions/apitimelinetag.php:104 actions/tagrss.php:64 +#: actions/apitimelinetag.php:104 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Actualizações categorizadas com %1$s em %2$s!" @@ -740,7 +740,7 @@ msgstr "Pode carregar o seu avatar pessoal. O tamanho máximo do ficheiro é %s. #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 #: actions/remotesubscribe.php:191 actions/userauthorization.php:72 -#: actions/userrss.php:103 +#: actions/userrss.php:106 msgid "User without matching profile" msgstr "Utilizador sem perfil correspondente" @@ -1763,7 +1763,7 @@ msgstr "Tornar Gestor" msgid "Make this user an admin" msgstr "Tornar este utilizador um gestor" -#: actions/grouprss.php:138 actions/userrss.php:90 +#: actions/grouprss.php:138 actions/userrss.php:93 #: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67 #, php-format msgid "%s timeline" @@ -4499,7 +4499,7 @@ msgstr "%s não é membro de nenhum grupo." msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "Tente [pesquisar grupos](%%action.groupsearch%%) e juntar-se a eles." -#: actions/userrss.php:92 lib/atomgroupnoticefeed.php:66 +#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66 #: lib/atomusernoticefeed.php:72 #, php-format msgid "Updates from %1$s on %2$s!" @@ -5293,12 +5293,12 @@ msgstr "%s deixou o grupo %s" msgid "Fullname: %s" msgstr "Nome completo: %s" -#: lib/command.php:312 lib/mail.php:254 +#: lib/command.php:312 lib/mail.php:258 #, php-format msgid "Location: %s" msgstr "Localidade: %s" -#: lib/command.php:315 lib/mail.php:256 +#: lib/command.php:315 lib/mail.php:260 #, php-format msgid "Homepage: %s" msgstr "Página pessoal: %s" @@ -5775,11 +5775,11 @@ msgstr "Iniciar sessão com um nome de utilizador e senha" msgid "Sign up for a new account" msgstr "Registar uma conta nova" -#: lib/mail.php:172 +#: lib/mail.php:173 msgid "Email address confirmation" msgstr "Confirmação do endereço electrónico" -#: lib/mail.php:174 +#: lib/mail.php:175 #, php-format msgid "" "Hey, %s.\n" @@ -5808,12 +5808,12 @@ msgstr "" "Obrigado pelo tempo que dedicou, \n" "%s\n" -#: lib/mail.php:236 +#: lib/mail.php:240 #, php-format msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s está agora a ouvir as suas notas em %2$s." -#: lib/mail.php:241 +#: lib/mail.php:245 #, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -5839,17 +5839,17 @@ msgstr "" "Altere o seu endereço de correio electrónico ou as opções de notificação em %" "8$s\n" -#: lib/mail.php:258 +#: lib/mail.php:262 #, php-format msgid "Bio: %s" msgstr "Bio: %s" -#: lib/mail.php:286 +#: lib/mail.php:290 #, php-format msgid "New email address for posting to %s" msgstr "Novo endereço electrónico para publicar no site %s" -#: lib/mail.php:289 +#: lib/mail.php:293 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5870,21 +5870,21 @@ msgstr "" "Melhores cumprimentos,\n" "%4$s" -#: lib/mail.php:413 +#: lib/mail.php:417 #, php-format msgid "%s status" msgstr "Estado de %s" -#: lib/mail.php:439 +#: lib/mail.php:443 msgid "SMS confirmation" msgstr "Confirmação SMS" -#: lib/mail.php:463 +#: lib/mail.php:467 #, php-format msgid "You've been nudged by %s" msgstr "%s envia-lhe um toque" -#: lib/mail.php:467 +#: lib/mail.php:471 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -5911,12 +5911,12 @@ msgstr "" "Graciosamente,\n" "%4$s\n" -#: lib/mail.php:510 +#: lib/mail.php:517 #, php-format msgid "New private message from %s" msgstr "Nova mensagem privada de %s" -#: lib/mail.php:514 +#: lib/mail.php:521 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -5949,12 +5949,12 @@ msgstr "" "Profusos cumprimentos,\n" "%5$s\n" -#: lib/mail.php:559 +#: lib/mail.php:568 #, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%s (@%s) adicionou a sua nota às favoritas." -#: lib/mail.php:561 +#: lib/mail.php:570 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -5991,12 +5991,12 @@ msgstr "" "Sinceramente,\n" "%6$s\n" -#: lib/mail.php:624 +#: lib/mail.php:635 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "%s (@%s) enviou uma nota à sua atenção" -#: lib/mail.php:626 +#: lib/mail.php:637 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po index 65061f02d..51d926eba 100644 --- a/locale/pt_BR/LC_MESSAGES/statusnet.po +++ b/locale/pt_BR/LC_MESSAGES/statusnet.po @@ -11,12 +11,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-04 18:55+0000\n" -"PO-Revision-Date: 2010-03-05 22:36:30+0000\n" +"POT-Creation-Date: 2010-03-06 23:49+0000\n" +"PO-Revision-Date: 2010-03-06 23:50:51+0000\n" "Language-Team: Brazilian Portuguese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63299); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pt-br\n" "X-Message-Group: out-statusnet\n" @@ -105,7 +105,7 @@ msgstr "Esta página não existe." #: actions/otp.php:76 actions/remotesubscribe.php:145 #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 +#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:302 #: lib/command.php:355 lib/command.php:401 lib/command.php:462 #: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82 @@ -707,7 +707,7 @@ msgstr "Repetições de %s" msgid "Notices tagged with %s" msgstr "Mensagens etiquetadas como %s" -#: actions/apitimelinetag.php:104 actions/tagrss.php:64 +#: actions/apitimelinetag.php:104 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Mensagens etiquetadas como %1$s no %2$s!" @@ -748,7 +748,7 @@ msgstr "" #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 #: actions/remotesubscribe.php:191 actions/userauthorization.php:72 -#: actions/userrss.php:103 +#: actions/userrss.php:106 msgid "User without matching profile" msgstr "Usuário sem um perfil correspondente" @@ -1755,7 +1755,7 @@ msgstr "Tornar administrador" msgid "Make this user an admin" msgstr "Torna este usuário um administrador" -#: actions/grouprss.php:138 actions/userrss.php:90 +#: actions/grouprss.php:138 actions/userrss.php:93 #: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67 #, php-format msgid "%s timeline" @@ -4490,7 +4490,7 @@ msgstr "" "Experimente [procurar por grupos](%%action.groupsearch%%) e associar-se à " "eles." -#: actions/userrss.php:92 lib/atomgroupnoticefeed.php:66 +#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66 #: lib/atomusernoticefeed.php:72 #, php-format msgid "Updates from %1$s on %2$s!" @@ -5279,12 +5279,12 @@ msgstr "%s deixou o grupo %s" msgid "Fullname: %s" msgstr "Nome completo: %s" -#: lib/command.php:312 lib/mail.php:254 +#: lib/command.php:312 lib/mail.php:258 #, php-format msgid "Location: %s" msgstr "Localização: %s" -#: lib/command.php:315 lib/mail.php:256 +#: lib/command.php:315 lib/mail.php:260 #, php-format msgid "Homepage: %s" msgstr "Site: %s" @@ -5763,11 +5763,11 @@ msgstr "Autentique-se com um nome de usuário e uma senha" msgid "Sign up for a new account" msgstr "Cadastre-se para uma nova conta" -#: lib/mail.php:172 +#: lib/mail.php:173 msgid "Email address confirmation" msgstr "Confirmação do endereço de e-mail" -#: lib/mail.php:174 +#: lib/mail.php:175 #, php-format msgid "" "Hey, %s.\n" @@ -5796,12 +5796,12 @@ msgstr "" "Obrigado pela sua atenção, \n" "%s\n" -#: lib/mail.php:236 +#: lib/mail.php:240 #, php-format msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s agora está acompanhando suas mensagens no %2$s." -#: lib/mail.php:241 +#: lib/mail.php:245 #, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -5826,17 +5826,17 @@ msgstr "" "----\n" "Altere seu endereço de e-mail e suas opções de notificação em %8$s\n" -#: lib/mail.php:258 +#: lib/mail.php:262 #, php-format msgid "Bio: %s" msgstr "Descrição: %s" -#: lib/mail.php:286 +#: lib/mail.php:290 #, php-format msgid "New email address for posting to %s" msgstr "Novo endereço de e-mail para publicar no %s" -#: lib/mail.php:289 +#: lib/mail.php:293 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5857,21 +5857,21 @@ msgstr "" "Atenciosamente,\n" "%4$s" -#: lib/mail.php:413 +#: lib/mail.php:417 #, php-format msgid "%s status" msgstr "Mensagem de %s" -#: lib/mail.php:439 +#: lib/mail.php:443 msgid "SMS confirmation" msgstr "Confirmação de SMS" -#: lib/mail.php:463 +#: lib/mail.php:467 #, php-format msgid "You've been nudged by %s" msgstr "Você teve a atenção chamada por %s" -#: lib/mail.php:467 +#: lib/mail.php:471 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -5898,12 +5898,12 @@ msgstr "" "Atenciosamente,\n" "%4$s\n" -#: lib/mail.php:510 +#: lib/mail.php:517 #, php-format msgid "New private message from %s" msgstr "Nova mensagem particular de %s" -#: lib/mail.php:514 +#: lib/mail.php:521 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -5936,12 +5936,12 @@ msgstr "" "Atenciosamente,\n" "%5$s\n" -#: lib/mail.php:559 +#: lib/mail.php:568 #, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%s (@%s) marcou sua mensagem como favorita" -#: lib/mail.php:561 +#: lib/mail.php:570 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -5978,12 +5978,12 @@ msgstr "" "Atenciosamente,\n" "%6$s\n" -#: lib/mail.php:624 +#: lib/mail.php:635 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "%s (@%s) enviou uma mensagem citando você" -#: lib/mail.php:626 +#: lib/mail.php:637 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po index 94e9a7902..03aaa074a 100644 --- a/locale/ru/LC_MESSAGES/statusnet.po +++ b/locale/ru/LC_MESSAGES/statusnet.po @@ -12,12 +12,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-04 18:55+0000\n" -"PO-Revision-Date: 2010-03-05 22:36:33+0000\n" +"POT-Creation-Date: 2010-03-06 23:49+0000\n" +"PO-Revision-Date: 2010-03-06 23:50:54+0000\n" "Language-Team: Russian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63299); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ru\n" "X-Message-Group: out-statusnet\n" @@ -106,7 +106,7 @@ msgstr "Нет такой страницы" #: actions/otp.php:76 actions/remotesubscribe.php:145 #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 +#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:302 #: lib/command.php:355 lib/command.php:401 lib/command.php:462 #: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82 @@ -703,7 +703,7 @@ msgstr "Повторы за %s" msgid "Notices tagged with %s" msgstr "Записи с тегом %s" -#: actions/apitimelinetag.php:104 actions/tagrss.php:64 +#: actions/apitimelinetag.php:104 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Обновления с тегом %1$s на %2$s!" @@ -744,7 +744,7 @@ msgstr "" #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 #: actions/remotesubscribe.php:191 actions/userauthorization.php:72 -#: actions/userrss.php:103 +#: actions/userrss.php:106 msgid "User without matching profile" msgstr "Пользователь без соответствующего профиля" @@ -1751,7 +1751,7 @@ msgstr "Сделать администратором" msgid "Make this user an admin" msgstr "Сделать этого пользователя администратором" -#: actions/grouprss.php:138 actions/userrss.php:90 +#: actions/grouprss.php:138 actions/userrss.php:93 #: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67 #, php-format msgid "%s timeline" @@ -4459,7 +4459,7 @@ msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" "Попробуйте [найти группы](%%action.groupsearch%%) и присоединиться к ним." -#: actions/userrss.php:92 lib/atomgroupnoticefeed.php:66 +#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66 #: lib/atomusernoticefeed.php:72 #, php-format msgid "Updates from %1$s on %2$s!" @@ -5225,12 +5225,12 @@ msgstr "%1$s покинул группу %2$s" msgid "Fullname: %s" msgstr "Полное имя: %s" -#: lib/command.php:312 lib/mail.php:254 +#: lib/command.php:312 lib/mail.php:258 #, php-format msgid "Location: %s" msgstr "Месторасположение: %s" -#: lib/command.php:315 lib/mail.php:256 +#: lib/command.php:315 lib/mail.php:260 #, php-format msgid "Homepage: %s" msgstr "Домашняя страница: %s" @@ -5707,11 +5707,11 @@ msgstr "Войти с вашим ником и паролем." msgid "Sign up for a new account" msgstr "Создать новый аккаунт" -#: lib/mail.php:172 +#: lib/mail.php:173 msgid "Email address confirmation" msgstr "Подтверждение электронного адреса" -#: lib/mail.php:174 +#: lib/mail.php:175 #, php-format msgid "" "Hey, %s.\n" @@ -5741,12 +5741,12 @@ msgstr "" "Благодарим за потраченное время, \n" "%s\n" -#: lib/mail.php:236 +#: lib/mail.php:240 #, php-format msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s теперь следит за вашими записями на %2$s." -#: lib/mail.php:241 +#: lib/mail.php:245 #, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -5771,17 +5771,17 @@ msgstr "" "----\n" "Измените email-адрес и настройки уведомлений на %8$s\n" -#: lib/mail.php:258 +#: lib/mail.php:262 #, php-format msgid "Bio: %s" msgstr "Биография: %s" -#: lib/mail.php:286 +#: lib/mail.php:290 #, php-format msgid "New email address for posting to %s" msgstr "Новый электронный адрес для постинга %s" -#: lib/mail.php:289 +#: lib/mail.php:293 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5802,21 +5802,21 @@ msgstr "" "Искренне Ваш,\n" "%4$s" -#: lib/mail.php:413 +#: lib/mail.php:417 #, php-format msgid "%s status" msgstr "%s статус" -#: lib/mail.php:439 +#: lib/mail.php:443 msgid "SMS confirmation" msgstr "Подтверждение СМС" -#: lib/mail.php:463 +#: lib/mail.php:467 #, php-format msgid "You've been nudged by %s" msgstr "Вас «подтолкнул» пользователь %s" -#: lib/mail.php:467 +#: lib/mail.php:471 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -5843,12 +5843,12 @@ msgstr "" "С уважением,\n" "%4$s\n" -#: lib/mail.php:510 +#: lib/mail.php:517 #, php-format msgid "New private message from %s" msgstr "Новое приватное сообщение от %s" -#: lib/mail.php:514 +#: lib/mail.php:521 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -5881,12 +5881,12 @@ msgstr "" "С уважением,\n" "%5$s\n" -#: lib/mail.php:559 +#: lib/mail.php:568 #, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%s (@%s) добавил вашу запись в число своих любимых" -#: lib/mail.php:561 +#: lib/mail.php:570 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -5923,12 +5923,12 @@ msgstr "" "С уважением,\n" "%6$s\n" -#: lib/mail.php:624 +#: lib/mail.php:635 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "%s (@%s) отправил запись для вашего внимания" -#: lib/mail.php:626 +#: lib/mail.php:637 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" diff --git a/locale/statusnet.po b/locale/statusnet.po index 0f6185ffc..61d902a1a 100644 --- a/locale/statusnet.po +++ b/locale/statusnet.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-05 22:34+0000\n" +"POT-Creation-Date: 2010-03-08 21:09+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" @@ -98,7 +98,7 @@ msgstr "" #: actions/otp.php:76 actions/remotesubscribe.php:145 #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 +#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:302 #: lib/command.php:355 lib/command.php:401 lib/command.php:462 #: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82 @@ -674,7 +674,7 @@ msgstr "" msgid "Notices tagged with %s" msgstr "" -#: actions/apitimelinetag.php:104 actions/tagrss.php:64 +#: actions/apitimelinetag.php:104 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "" @@ -714,7 +714,7 @@ msgstr "" #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 #: actions/remotesubscribe.php:191 actions/userauthorization.php:72 -#: actions/userrss.php:103 +#: actions/userrss.php:106 msgid "User without matching profile" msgstr "" @@ -1681,7 +1681,7 @@ msgstr "" msgid "Make this user an admin" msgstr "" -#: actions/grouprss.php:138 actions/userrss.php:90 +#: actions/grouprss.php:138 actions/userrss.php:93 #: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67 #, php-format msgid "%s timeline" @@ -4184,7 +4184,7 @@ msgstr "" msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" -#: actions/userrss.php:92 lib/atomgroupnoticefeed.php:66 +#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66 #: lib/atomusernoticefeed.php:72 #, php-format msgid "Updates from %1$s on %2$s!" @@ -4915,12 +4915,12 @@ msgstr "" msgid "Fullname: %s" msgstr "" -#: lib/command.php:312 lib/mail.php:254 +#: lib/command.php:312 lib/mail.php:258 #, php-format msgid "Location: %s" msgstr "" -#: lib/command.php:315 lib/mail.php:256 +#: lib/command.php:315 lib/mail.php:260 #, php-format msgid "Homepage: %s" msgstr "" @@ -5352,11 +5352,11 @@ msgstr "" msgid "Sign up for a new account" msgstr "" -#: lib/mail.php:172 +#: lib/mail.php:173 msgid "Email address confirmation" msgstr "" -#: lib/mail.php:174 +#: lib/mail.php:175 #, php-format msgid "" "Hey, %s.\n" @@ -5373,12 +5373,12 @@ msgid "" "%s\n" msgstr "" -#: lib/mail.php:236 +#: lib/mail.php:240 #, php-format msgid "%1$s is now listening to your notices on %2$s." msgstr "" -#: lib/mail.php:241 +#: lib/mail.php:245 #, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -5393,17 +5393,17 @@ msgid "" "Change your email address or notification options at %8$s\n" msgstr "" -#: lib/mail.php:258 +#: lib/mail.php:262 #, php-format msgid "Bio: %s" msgstr "" -#: lib/mail.php:286 +#: lib/mail.php:290 #, php-format msgid "New email address for posting to %s" msgstr "" -#: lib/mail.php:289 +#: lib/mail.php:293 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5416,21 +5416,21 @@ msgid "" "%4$s" msgstr "" -#: lib/mail.php:413 +#: lib/mail.php:417 #, php-format msgid "%s status" msgstr "" -#: lib/mail.php:439 +#: lib/mail.php:443 msgid "SMS confirmation" msgstr "" -#: lib/mail.php:463 +#: lib/mail.php:467 #, php-format msgid "You've been nudged by %s" msgstr "" -#: lib/mail.php:467 +#: lib/mail.php:471 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -5446,12 +5446,12 @@ msgid "" "%4$s\n" msgstr "" -#: lib/mail.php:510 +#: lib/mail.php:517 #, php-format msgid "New private message from %s" msgstr "" -#: lib/mail.php:514 +#: lib/mail.php:521 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -5470,12 +5470,12 @@ msgid "" "%5$s\n" msgstr "" -#: lib/mail.php:559 +#: lib/mail.php:568 #, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "" -#: lib/mail.php:561 +#: lib/mail.php:570 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -5496,12 +5496,12 @@ msgid "" "%6$s\n" msgstr "" -#: lib/mail.php:624 +#: lib/mail.php:635 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "" -#: lib/mail.php:626 +#: lib/mail.php:637 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po index ffafd9f93..2a508849f 100644 --- a/locale/sv/LC_MESSAGES/statusnet.po +++ b/locale/sv/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-04 18:55+0000\n" -"PO-Revision-Date: 2010-03-05 22:36:36+0000\n" +"POT-Creation-Date: 2010-03-06 23:49+0000\n" +"PO-Revision-Date: 2010-03-06 23:50:58+0000\n" "Language-Team: Swedish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63299); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: sv\n" "X-Message-Group: out-statusnet\n" @@ -102,7 +102,7 @@ msgstr "Ingen sådan sida" #: actions/otp.php:76 actions/remotesubscribe.php:145 #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 +#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:302 #: lib/command.php:355 lib/command.php:401 lib/command.php:462 #: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82 @@ -691,7 +691,7 @@ msgstr "Upprepningar av %s" msgid "Notices tagged with %s" msgstr "Notiser taggade med %s" -#: actions/apitimelinetag.php:104 actions/tagrss.php:64 +#: actions/apitimelinetag.php:104 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Uppdateringar taggade med %1$s på %2$s!" @@ -732,7 +732,7 @@ msgstr "" #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 #: actions/remotesubscribe.php:191 actions/userauthorization.php:72 -#: actions/userrss.php:103 +#: actions/userrss.php:106 msgid "User without matching profile" msgstr "Användare utan matchande profil" @@ -1730,7 +1730,7 @@ msgstr "Gör till administratör" msgid "Make this user an admin" msgstr "Gör denna användare till administratör" -#: actions/grouprss.php:138 actions/userrss.php:90 +#: actions/grouprss.php:138 actions/userrss.php:93 #: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67 #, php-format msgid "%s timeline" @@ -4445,7 +4445,7 @@ msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" "Prova att [söka efter grupper](%%action.groupsearch%%) och gå med i dem." -#: actions/userrss.php:92 lib/atomgroupnoticefeed.php:66 +#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66 #: lib/atomusernoticefeed.php:72 #, php-format msgid "Updates from %1$s on %2$s!" @@ -5210,12 +5210,12 @@ msgstr "%s lämnade grupp %s" msgid "Fullname: %s" msgstr "Fullständigt namn: %s" -#: lib/command.php:312 lib/mail.php:254 +#: lib/command.php:312 lib/mail.php:258 #, php-format msgid "Location: %s" msgstr "Plats: %s" -#: lib/command.php:315 lib/mail.php:256 +#: lib/command.php:315 lib/mail.php:260 #, php-format msgid "Homepage: %s" msgstr "Hemsida: %s" @@ -5688,11 +5688,11 @@ msgstr "Logga in med ett användarnamn och lösenord" msgid "Sign up for a new account" msgstr "Registrera dig för ett nytt konto" -#: lib/mail.php:172 +#: lib/mail.php:173 msgid "Email address confirmation" msgstr "E-postadressbekräftelse" -#: lib/mail.php:174 +#: lib/mail.php:175 #, php-format msgid "" "Hey, %s.\n" @@ -5721,12 +5721,12 @@ msgstr "" "Tack för din tid, \n" "%s\n" -#: lib/mail.php:236 +#: lib/mail.php:240 #, php-format msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s lyssnar nu på dina notiser på %2$s." -#: lib/mail.php:241 +#: lib/mail.php:245 #, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -5751,17 +5751,17 @@ msgstr "" "----\n" "Ändra din e-postadress eller notiferingsinställningar på %8$s\n" -#: lib/mail.php:258 +#: lib/mail.php:262 #, php-format msgid "Bio: %s" msgstr "Biografi: %s" -#: lib/mail.php:286 +#: lib/mail.php:290 #, php-format msgid "New email address for posting to %s" msgstr "Ny e-postadress för att skicka till %s" -#: lib/mail.php:289 +#: lib/mail.php:293 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5782,21 +5782,21 @@ msgstr "" "Med vänliga hälsningar,\n" "%4$s" -#: lib/mail.php:413 +#: lib/mail.php:417 #, php-format msgid "%s status" msgstr "%s status" -#: lib/mail.php:439 +#: lib/mail.php:443 msgid "SMS confirmation" msgstr "SMS-bekräftelse" -#: lib/mail.php:463 +#: lib/mail.php:467 #, php-format msgid "You've been nudged by %s" msgstr "Du har blivit knuffad av %s" -#: lib/mail.php:467 +#: lib/mail.php:471 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -5823,12 +5823,12 @@ msgstr "" "Med vänliga hälsningar,\n" "%4$s\n" -#: lib/mail.php:510 +#: lib/mail.php:517 #, php-format msgid "New private message from %s" msgstr "Nytt privat meddelande från %s" -#: lib/mail.php:514 +#: lib/mail.php:521 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -5861,12 +5861,12 @@ msgstr "" "Med vänliga hälsningar,\n" "%5$s\n" -#: lib/mail.php:559 +#: lib/mail.php:568 #, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%s (@%s) lade till din notis som en favorit" -#: lib/mail.php:561 +#: lib/mail.php:570 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -5903,12 +5903,12 @@ msgstr "" "Med vänliga hälsningar,\n" "%6$s\n" -#: lib/mail.php:624 +#: lib/mail.php:635 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "%s (@%s) skickade en notis för din uppmärksamhet" -#: lib/mail.php:626 +#: lib/mail.php:637 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po index f32e1499e..c8a2f5c1a 100644 --- a/locale/te/LC_MESSAGES/statusnet.po +++ b/locale/te/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-04 18:55+0000\n" -"PO-Revision-Date: 2010-03-05 22:36:39+0000\n" +"POT-Creation-Date: 2010-03-06 23:49+0000\n" +"PO-Revision-Date: 2010-03-06 23:51:01+0000\n" "Language-Team: Telugu\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63299); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: te\n" "X-Message-Group: out-statusnet\n" @@ -106,7 +106,7 @@ msgstr "అటువంటి పేజీ లేదు" #: actions/otp.php:76 actions/remotesubscribe.php:145 #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 +#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:302 #: lib/command.php:355 lib/command.php:401 lib/command.php:462 #: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82 @@ -692,7 +692,7 @@ msgstr "%s యొక్క పునరావృతాలు" msgid "Notices tagged with %s" msgstr "" -#: actions/apitimelinetag.php:104 actions/tagrss.php:64 +#: actions/apitimelinetag.php:104 actions/tagrss.php:65 #, fuzzy, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "%s యొక్క మైక్రోబ్లాగు" @@ -733,7 +733,7 @@ msgstr "మీ వ్యక్తిగత అవతారాన్ని మీ #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 #: actions/remotesubscribe.php:191 actions/userauthorization.php:72 -#: actions/userrss.php:103 +#: actions/userrss.php:106 msgid "User without matching profile" msgstr "" @@ -1719,7 +1719,7 @@ msgstr "నిర్వాహకున్ని చేయి" msgid "Make this user an admin" msgstr "ఈ వాడుకరిని నిర్వాహకున్ని చేయి" -#: actions/grouprss.php:138 actions/userrss.php:90 +#: actions/grouprss.php:138 actions/userrss.php:93 #: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67 #, php-format msgid "%s timeline" @@ -4317,7 +4317,7 @@ msgstr "%s ఏ గుంపు లోనూ సభ్యులు కాదు." msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "[గుంపులని వెతికి](%%action.groupsearch%%) వాటిలో చేరడానికి ప్రయత్నించండి." -#: actions/userrss.php:92 lib/atomgroupnoticefeed.php:66 +#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66 #: lib/atomusernoticefeed.php:72 #, php-format msgid "Updates from %1$s on %2$s!" @@ -5099,12 +5099,12 @@ msgstr "%2$s గుంపు నుండి %1$s వైదొలిగారు msgid "Fullname: %s" msgstr "పూర్తిపేరు: %s" -#: lib/command.php:312 lib/mail.php:254 +#: lib/command.php:312 lib/mail.php:258 #, php-format msgid "Location: %s" msgstr "ప్రాంతం: %s" -#: lib/command.php:315 lib/mail.php:256 +#: lib/command.php:315 lib/mail.php:260 #, php-format msgid "Homepage: %s" msgstr "హోంపేజీ: %s" @@ -5545,11 +5545,11 @@ msgstr "వాడుకరిపేరు మరియు సంకేతపద msgid "Sign up for a new account" msgstr "కొత్త ఖాతా సృష్టించుకోండి" -#: lib/mail.php:172 +#: lib/mail.php:173 msgid "Email address confirmation" msgstr "ఈమెయిల్ చిరునామా నిర్ధారణ" -#: lib/mail.php:174 +#: lib/mail.php:175 #, php-format msgid "" "Hey, %s.\n" @@ -5566,12 +5566,12 @@ msgid "" "%s\n" msgstr "" -#: lib/mail.php:236 +#: lib/mail.php:240 #, php-format msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s ఇప్పుడు %2$sలో మీ నోటీసులని వింటున్నారు." -#: lib/mail.php:241 +#: lib/mail.php:245 #, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -5596,17 +5596,17 @@ msgstr "" "----\n" "మీ ఈమెయిలు చిరునామాని లేదా గమనింపుల ఎంపికలను %8$s వద్ద మార్చుకోండి\n" -#: lib/mail.php:258 +#: lib/mail.php:262 #, php-format msgid "Bio: %s" msgstr "స్వపరిచయం: %s" -#: lib/mail.php:286 +#: lib/mail.php:290 #, php-format msgid "New email address for posting to %s" msgstr "" -#: lib/mail.php:289 +#: lib/mail.php:293 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5619,21 +5619,21 @@ msgid "" "%4$s" msgstr "" -#: lib/mail.php:413 +#: lib/mail.php:417 #, php-format msgid "%s status" msgstr "%s స్థితి" -#: lib/mail.php:439 +#: lib/mail.php:443 msgid "SMS confirmation" msgstr "SMS నిర్ధారణ" -#: lib/mail.php:463 +#: lib/mail.php:467 #, php-format msgid "You've been nudged by %s" msgstr "" -#: lib/mail.php:467 +#: lib/mail.php:471 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -5649,12 +5649,12 @@ msgid "" "%4$s\n" msgstr "" -#: lib/mail.php:510 +#: lib/mail.php:517 #, php-format msgid "New private message from %s" msgstr "%s నుండి కొత్త అంతరంగిక సందేశం" -#: lib/mail.php:514 +#: lib/mail.php:521 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -5673,12 +5673,12 @@ msgid "" "%5$s\n" msgstr "" -#: lib/mail.php:559 +#: lib/mail.php:568 #, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "" -#: lib/mail.php:561 +#: lib/mail.php:570 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -5699,12 +5699,12 @@ msgid "" "%6$s\n" msgstr "" -#: lib/mail.php:624 +#: lib/mail.php:635 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "%s (@%s) మీకు ఒక నోటీసుని పంపించారు" -#: lib/mail.php:626 +#: lib/mail.php:637 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po index 80dba9abf..805e55268 100644 --- a/locale/tr/LC_MESSAGES/statusnet.po +++ b/locale/tr/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-04 18:55+0000\n" -"PO-Revision-Date: 2010-03-05 22:36:42+0000\n" +"POT-Creation-Date: 2010-03-06 23:49+0000\n" +"PO-Revision-Date: 2010-03-06 23:51:04+0000\n" "Language-Team: Turkish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63299); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: tr\n" "X-Message-Group: out-statusnet\n" @@ -109,7 +109,7 @@ msgstr "Böyle bir durum mesajı yok." #: actions/otp.php:76 actions/remotesubscribe.php:145 #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 +#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:302 #: lib/command.php:355 lib/command.php:401 lib/command.php:462 #: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82 @@ -712,7 +712,7 @@ msgstr "%s için cevaplar" msgid "Notices tagged with %s" msgstr "" -#: actions/apitimelinetag.php:104 actions/tagrss.php:64 +#: actions/apitimelinetag.php:104 actions/tagrss.php:65 #, fuzzy, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "%s adli kullanicinin durum mesajlari" @@ -754,7 +754,7 @@ msgstr "" #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 #: actions/remotesubscribe.php:191 actions/userauthorization.php:72 -#: actions/userrss.php:103 +#: actions/userrss.php:106 msgid "User without matching profile" msgstr "" @@ -1788,7 +1788,7 @@ msgstr "" msgid "Make this user an admin" msgstr "" -#: actions/grouprss.php:138 actions/userrss.php:90 +#: actions/grouprss.php:138 actions/userrss.php:93 #: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67 #, php-format msgid "%s timeline" @@ -4430,7 +4430,7 @@ msgstr "Bize o profili yollamadınız" msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" -#: actions/userrss.php:92 lib/atomgroupnoticefeed.php:66 +#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66 #: lib/atomusernoticefeed.php:72 #, php-format msgid "Updates from %1$s on %2$s!" @@ -5224,12 +5224,12 @@ msgstr "%1$s'in %2$s'deki durum mesajları " msgid "Fullname: %s" msgstr "Tam İsim" -#: lib/command.php:312 lib/mail.php:254 +#: lib/command.php:312 lib/mail.php:258 #, php-format msgid "Location: %s" msgstr "" -#: lib/command.php:315 lib/mail.php:256 +#: lib/command.php:315 lib/mail.php:260 #, php-format msgid "Homepage: %s" msgstr "" @@ -5684,11 +5684,11 @@ msgstr "Geçersiz kullanıcı adı veya parola." msgid "Sign up for a new account" msgstr "Yeni hesap oluştur" -#: lib/mail.php:172 +#: lib/mail.php:173 msgid "Email address confirmation" msgstr "Eposta adresi onayı" -#: lib/mail.php:174 +#: lib/mail.php:175 #, php-format msgid "" "Hey, %s.\n" @@ -5705,12 +5705,12 @@ msgid "" "%s\n" msgstr "" -#: lib/mail.php:236 +#: lib/mail.php:240 #, php-format msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s %2$s'da durumunuzu takip ediyor" -#: lib/mail.php:241 +#: lib/mail.php:245 #, fuzzy, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -5731,17 +5731,17 @@ msgstr "" "Kendisini durumsuz bırakmayın!,\n" "%4$s.\n" -#: lib/mail.php:258 +#: lib/mail.php:262 #, fuzzy, php-format msgid "Bio: %s" msgstr "Hakkında" -#: lib/mail.php:286 +#: lib/mail.php:290 #, php-format msgid "New email address for posting to %s" msgstr "" -#: lib/mail.php:289 +#: lib/mail.php:293 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5754,21 +5754,21 @@ msgid "" "%4$s" msgstr "" -#: lib/mail.php:413 +#: lib/mail.php:417 #, php-format msgid "%s status" msgstr "%s durum" -#: lib/mail.php:439 +#: lib/mail.php:443 msgid "SMS confirmation" msgstr "" -#: lib/mail.php:463 +#: lib/mail.php:467 #, php-format msgid "You've been nudged by %s" msgstr "" -#: lib/mail.php:467 +#: lib/mail.php:471 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -5784,12 +5784,12 @@ msgid "" "%4$s\n" msgstr "" -#: lib/mail.php:510 +#: lib/mail.php:517 #, php-format msgid "New private message from %s" msgstr "" -#: lib/mail.php:514 +#: lib/mail.php:521 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -5808,12 +5808,12 @@ msgid "" "%5$s\n" msgstr "" -#: lib/mail.php:559 +#: lib/mail.php:568 #, fuzzy, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%1$s %2$s'da durumunuzu takip ediyor" -#: lib/mail.php:561 +#: lib/mail.php:570 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -5834,12 +5834,12 @@ msgid "" "%6$s\n" msgstr "" -#: lib/mail.php:624 +#: lib/mail.php:635 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "" -#: lib/mail.php:626 +#: lib/mail.php:637 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po index 145eb3854..78aa5dc23 100644 --- a/locale/uk/LC_MESSAGES/statusnet.po +++ b/locale/uk/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-04 18:55+0000\n" -"PO-Revision-Date: 2010-03-05 22:36:45+0000\n" +"POT-Creation-Date: 2010-03-06 23:49+0000\n" +"PO-Revision-Date: 2010-03-06 23:51:07+0000\n" "Language-Team: Ukrainian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63299); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: uk\n" "X-Message-Group: out-statusnet\n" @@ -105,7 +105,7 @@ msgstr "Немає такої сторінки" #: actions/otp.php:76 actions/remotesubscribe.php:145 #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 +#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:302 #: lib/command.php:355 lib/command.php:401 lib/command.php:462 #: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82 @@ -702,7 +702,7 @@ msgstr "Повторення %s" msgid "Notices tagged with %s" msgstr "Дописи позначені з %s" -#: actions/apitimelinetag.php:104 actions/tagrss.php:64 +#: actions/apitimelinetag.php:104 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Оновлення позначені з %1$s на %2$s!" @@ -742,7 +742,7 @@ msgstr "Ви можете завантажити аватару. Максима #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 #: actions/remotesubscribe.php:191 actions/userauthorization.php:72 -#: actions/userrss.php:103 +#: actions/userrss.php:106 msgid "User without matching profile" msgstr "Користувач з невідповідним профілем" @@ -1735,7 +1735,7 @@ msgstr "Зробити адміном" msgid "Make this user an admin" msgstr "Надати цьому користувачеві права адміністратора" -#: actions/grouprss.php:138 actions/userrss.php:90 +#: actions/grouprss.php:138 actions/userrss.php:93 #: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67 #, php-format msgid "%s timeline" @@ -4444,7 +4444,7 @@ msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" "Спробуйте [знайти якісь групи](%%action.groupsearch%%) і приєднайтеся до них." -#: actions/userrss.php:92 lib/atomgroupnoticefeed.php:66 +#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66 #: lib/atomusernoticefeed.php:72 #, php-format msgid "Updates from %1$s on %2$s!" @@ -5206,12 +5206,12 @@ msgstr "%1$s залишив групу %2$s" msgid "Fullname: %s" msgstr "Повне ім’я: %s" -#: lib/command.php:312 lib/mail.php:254 +#: lib/command.php:312 lib/mail.php:258 #, php-format msgid "Location: %s" msgstr "Локація: %s" -#: lib/command.php:315 lib/mail.php:256 +#: lib/command.php:315 lib/mail.php:260 #, php-format msgid "Homepage: %s" msgstr "Веб-сторінка: %s" @@ -5685,11 +5685,11 @@ msgstr "Увійти використовуючи ім’я та пароль" msgid "Sign up for a new account" msgstr "Зареєструвати новий акаунт" -#: lib/mail.php:172 +#: lib/mail.php:173 msgid "Email address confirmation" msgstr "Підтвердження електронної адреси" -#: lib/mail.php:174 +#: lib/mail.php:175 #, php-format msgid "" "Hey, %s.\n" @@ -5718,12 +5718,12 @@ msgstr "" "Дякуємо за Ваш час \n" "%s\n" -#: lib/mail.php:236 +#: lib/mail.php:240 #, php-format msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s тепер слідкує за Вашими дописами на %2$s." -#: lib/mail.php:241 +#: lib/mail.php:245 #, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -5748,17 +5748,17 @@ msgstr "" "----\n" "Змінити електронну адресу або умови сповіщення — %8$s\n" -#: lib/mail.php:258 +#: lib/mail.php:262 #, php-format msgid "Bio: %s" msgstr "Про себе: %s" -#: lib/mail.php:286 +#: lib/mail.php:290 #, php-format msgid "New email address for posting to %s" msgstr "Нова електронна адреса для надсилання повідомлень на %s" -#: lib/mail.php:289 +#: lib/mail.php:293 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5779,21 +5779,21 @@ msgstr "" "Щиро Ваші,\n" "%4$s" -#: lib/mail.php:413 +#: lib/mail.php:417 #, php-format msgid "%s status" msgstr "%s статус" -#: lib/mail.php:439 +#: lib/mail.php:443 msgid "SMS confirmation" msgstr "Підтвердження СМС" -#: lib/mail.php:463 +#: lib/mail.php:467 #, php-format msgid "You've been nudged by %s" msgstr "Вас спробував «розштовхати» %s" -#: lib/mail.php:467 +#: lib/mail.php:471 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -5820,12 +5820,12 @@ msgstr "" "З найкращими побажаннями,\n" "%4$s\n" -#: lib/mail.php:510 +#: lib/mail.php:517 #, php-format msgid "New private message from %s" msgstr "Нове приватне повідомлення від %s" -#: lib/mail.php:514 +#: lib/mail.php:521 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -5858,12 +5858,12 @@ msgstr "" "З найкращими побажаннями,\n" "%5$s\n" -#: lib/mail.php:559 +#: lib/mail.php:568 #, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%s (@%s) додав(ла) Ваш допис обраних" -#: lib/mail.php:561 +#: lib/mail.php:570 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -5900,12 +5900,12 @@ msgstr "" "Щиро Ваші,\n" "%6$s\n" -#: lib/mail.php:624 +#: lib/mail.php:635 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "%s (@%s) пропонує до Вашої уваги наступний допис" -#: lib/mail.php:626 +#: lib/mail.php:637 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" diff --git a/locale/vi/LC_MESSAGES/statusnet.po b/locale/vi/LC_MESSAGES/statusnet.po index dec9eeeba..59751aa5d 100644 --- a/locale/vi/LC_MESSAGES/statusnet.po +++ b/locale/vi/LC_MESSAGES/statusnet.po @@ -7,12 +7,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-04 18:55+0000\n" -"PO-Revision-Date: 2010-03-05 22:36:48+0000\n" +"POT-Creation-Date: 2010-03-06 23:49+0000\n" +"PO-Revision-Date: 2010-03-06 23:51:10+0000\n" "Language-Team: Vietnamese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63299); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: vi\n" "X-Message-Group: out-statusnet\n" @@ -108,7 +108,7 @@ msgstr "Không có tin nhắn nào." #: actions/otp.php:76 actions/remotesubscribe.php:145 #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 +#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:302 #: lib/command.php:355 lib/command.php:401 lib/command.php:462 #: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82 @@ -713,7 +713,7 @@ msgstr "Trả lời cho %s" msgid "Notices tagged with %s" msgstr "Thông báo được gắn thẻ %s" -#: actions/apitimelinetag.php:104 actions/tagrss.php:64 +#: actions/apitimelinetag.php:104 actions/tagrss.php:65 #, fuzzy, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Dòng tin nhắn cho %s" @@ -757,7 +757,7 @@ msgstr "" #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 #: actions/remotesubscribe.php:191 actions/userauthorization.php:72 -#: actions/userrss.php:103 +#: actions/userrss.php:106 #, fuzzy msgid "User without matching profile" msgstr "Hồ sơ ở nơi khác không khớp với hồ sơ này của bạn" @@ -1833,7 +1833,7 @@ msgstr "" msgid "Make this user an admin" msgstr "Kênh mà bạn tham gia" -#: actions/grouprss.php:138 actions/userrss.php:90 +#: actions/grouprss.php:138 actions/userrss.php:93 #: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67 #, fuzzy, php-format msgid "%s timeline" @@ -4580,7 +4580,7 @@ msgstr "Bạn chưa cập nhật thông tin riêng" msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" -#: actions/userrss.php:92 lib/atomgroupnoticefeed.php:66 +#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66 #: lib/atomusernoticefeed.php:72 #, php-format msgid "Updates from %1$s on %2$s!" @@ -5386,12 +5386,12 @@ msgstr "%s và nhóm" msgid "Fullname: %s" msgstr "Tên đầy đủ" -#: lib/command.php:312 lib/mail.php:254 +#: lib/command.php:312 lib/mail.php:258 #, fuzzy, php-format msgid "Location: %s" msgstr "Thành phố: %s" -#: lib/command.php:315 lib/mail.php:256 +#: lib/command.php:315 lib/mail.php:260 #, fuzzy, php-format msgid "Homepage: %s" msgstr "Trang chủ hoặc Blog: %s" @@ -5856,11 +5856,11 @@ msgstr "Sai tên đăng nhập hoặc mật khẩu." msgid "Sign up for a new account" msgstr "Tạo tài khoản mới" -#: lib/mail.php:172 +#: lib/mail.php:173 msgid "Email address confirmation" msgstr "Xac nhan dia chi email" -#: lib/mail.php:174 +#: lib/mail.php:175 #, fuzzy, php-format msgid "" "Hey, %s.\n" @@ -5892,12 +5892,12 @@ msgstr "" "%4$s\n" "\n" -#: lib/mail.php:236 +#: lib/mail.php:240 #, php-format msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s đang theo dõi lưu ý của bạn trên %2$s." -#: lib/mail.php:241 +#: lib/mail.php:245 #, fuzzy, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -5918,17 +5918,17 @@ msgstr "" "Người bạn trung thành của bạn,\n" "%4$s.\n" -#: lib/mail.php:258 +#: lib/mail.php:262 #, fuzzy, php-format msgid "Bio: %s" msgstr "Thành phố: %s" -#: lib/mail.php:286 +#: lib/mail.php:290 #, php-format msgid "New email address for posting to %s" msgstr "Dia chi email moi de gui tin nhan den %s" -#: lib/mail.php:289 +#: lib/mail.php:293 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5949,21 +5949,21 @@ msgstr "" "Chúc sức khỏe,\n" "%4$s" -#: lib/mail.php:413 +#: lib/mail.php:417 #, fuzzy, php-format msgid "%s status" msgstr "Trạng thái của %1$s vào %2$s" -#: lib/mail.php:439 +#: lib/mail.php:443 msgid "SMS confirmation" msgstr "Xác nhận SMS" -#: lib/mail.php:463 +#: lib/mail.php:467 #, php-format msgid "You've been nudged by %s" msgstr "" -#: lib/mail.php:467 +#: lib/mail.php:471 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -5979,12 +5979,12 @@ msgid "" "%4$s\n" msgstr "" -#: lib/mail.php:510 +#: lib/mail.php:517 #, php-format msgid "New private message from %s" msgstr "Bạn có tin nhắn riêng từ %s" -#: lib/mail.php:514 +#: lib/mail.php:521 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -6017,12 +6017,12 @@ msgstr "" "Chúc sức khỏe,\n" "%5$s\n" -#: lib/mail.php:559 +#: lib/mail.php:568 #, fuzzy, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%s da them tin nhan cua ban vao danh sach tin nhan ua thich" -#: lib/mail.php:561 +#: lib/mail.php:570 #, fuzzy, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -6056,12 +6056,12 @@ msgstr "" "Chúc sức khỏe,\n" "%5$s\n" -#: lib/mail.php:624 +#: lib/mail.php:635 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "" -#: lib/mail.php:626 +#: lib/mail.php:637 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po index 36e3a7946..cc1761616 100644 --- a/locale/zh_CN/LC_MESSAGES/statusnet.po +++ b/locale/zh_CN/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-04 18:55+0000\n" -"PO-Revision-Date: 2010-03-05 22:37:13+0000\n" +"POT-Creation-Date: 2010-03-06 23:49+0000\n" +"PO-Revision-Date: 2010-03-06 23:51:13+0000\n" "Language-Team: Simplified Chinese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63299); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: zh-hans\n" "X-Message-Group: out-statusnet\n" @@ -110,7 +110,7 @@ msgstr "没有该页面" #: actions/otp.php:76 actions/remotesubscribe.php:145 #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 +#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:302 #: lib/command.php:355 lib/command.php:401 lib/command.php:462 #: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82 @@ -711,7 +711,7 @@ msgstr "%s 的回复" msgid "Notices tagged with %s" msgstr "带 %s 标签的通告" -#: actions/apitimelinetag.php:104 actions/tagrss.php:64 +#: actions/apitimelinetag.php:104 actions/tagrss.php:65 #, fuzzy, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "%2$s 上 %1$s 的更新！" @@ -753,7 +753,7 @@ msgstr "您可以在这里上传个人头像。" #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 #: actions/remotesubscribe.php:191 actions/userauthorization.php:72 -#: actions/userrss.php:103 +#: actions/userrss.php:106 msgid "User without matching profile" msgstr "找不到匹配的用户。" @@ -1810,7 +1810,7 @@ msgstr "admin管理员" msgid "Make this user an admin" msgstr "" -#: actions/grouprss.php:138 actions/userrss.php:90 +#: actions/grouprss.php:138 actions/userrss.php:93 #: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67 #, php-format msgid "%s timeline" @@ -4508,7 +4508,7 @@ msgstr "您未告知此个人信息" msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" -#: actions/userrss.php:92 lib/atomgroupnoticefeed.php:66 +#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66 #: lib/atomusernoticefeed.php:72 #, php-format msgid "Updates from %1$s on %2$s!" @@ -5311,12 +5311,12 @@ msgstr "%s 离开群 %s" msgid "Fullname: %s" msgstr "全名：%s" -#: lib/command.php:312 lib/mail.php:254 +#: lib/command.php:312 lib/mail.php:258 #, php-format msgid "Location: %s" msgstr "位置：%s" -#: lib/command.php:315 lib/mail.php:256 +#: lib/command.php:315 lib/mail.php:260 #, php-format msgid "Homepage: %s" msgstr "主页：%s" @@ -5772,11 +5772,11 @@ msgstr "输入用户名和密码以登录。" msgid "Sign up for a new account" msgstr "创建新帐号" -#: lib/mail.php:172 +#: lib/mail.php:173 msgid "Email address confirmation" msgstr "电子邮件地址确认" -#: lib/mail.php:174 +#: lib/mail.php:175 #, php-format msgid "" "Hey, %s.\n" @@ -5793,12 +5793,12 @@ msgid "" "%s\n" msgstr "" -#: lib/mail.php:236 +#: lib/mail.php:240 #, php-format msgid "%1$s is now listening to your notices on %2$s." msgstr "%1$s 开始关注您的 %2$s 信息。" -#: lib/mail.php:241 +#: lib/mail.php:245 #, fuzzy, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -5818,19 +5818,19 @@ msgstr "" "\n" "为您效力的 %4$s\n" -#: lib/mail.php:258 +#: lib/mail.php:262 #, fuzzy, php-format msgid "Bio: %s" msgstr "" "自传Bio: %s\n" "\n" -#: lib/mail.php:286 +#: lib/mail.php:290 #, php-format msgid "New email address for posting to %s" msgstr "新的电子邮件地址，用于发布 %s 信息" -#: lib/mail.php:289 +#: lib/mail.php:293 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5850,21 +5850,21 @@ msgstr "" "\n" "为您效力的 %4$s" -#: lib/mail.php:413 +#: lib/mail.php:417 #, php-format msgid "%s status" msgstr "%s 状态" -#: lib/mail.php:439 +#: lib/mail.php:443 msgid "SMS confirmation" msgstr "SMS短信确认" -#: lib/mail.php:463 +#: lib/mail.php:467 #, php-format msgid "You've been nudged by %s" msgstr "%s 振铃呼叫你" -#: lib/mail.php:467 +#: lib/mail.php:471 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -5880,12 +5880,12 @@ msgid "" "%4$s\n" msgstr "" -#: lib/mail.php:510 +#: lib/mail.php:517 #, php-format msgid "New private message from %s" msgstr "%s 发送了新的私人信息" -#: lib/mail.php:514 +#: lib/mail.php:521 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -5904,12 +5904,12 @@ msgid "" "%5$s\n" msgstr "" -#: lib/mail.php:559 +#: lib/mail.php:568 #, fuzzy, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "%s 收藏了您的通告" -#: lib/mail.php:561 +#: lib/mail.php:570 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -5930,12 +5930,12 @@ msgid "" "%6$s\n" msgstr "" -#: lib/mail.php:624 +#: lib/mail.php:635 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "" -#: lib/mail.php:626 +#: lib/mail.php:637 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.po b/locale/zh_TW/LC_MESSAGES/statusnet.po index 2829f707e..3ea887beb 100644 --- a/locale/zh_TW/LC_MESSAGES/statusnet.po +++ b/locale/zh_TW/LC_MESSAGES/statusnet.po @@ -7,12 +7,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-04 18:55+0000\n" -"PO-Revision-Date: 2010-03-05 22:37:16+0000\n" +"POT-Creation-Date: 2010-03-06 23:49+0000\n" +"PO-Revision-Date: 2010-03-06 23:51:15+0000\n" "Language-Team: Traditional Chinese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63299); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: zh-hant\n" "X-Message-Group: out-statusnet\n" @@ -105,7 +105,7 @@ msgstr "無此通知" #: actions/otp.php:76 actions/remotesubscribe.php:145 #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 -#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 +#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:302 #: lib/command.php:355 lib/command.php:401 lib/command.php:462 #: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82 @@ -701,7 +701,7 @@ msgstr "" msgid "Notices tagged with %s" msgstr "" -#: actions/apitimelinetag.php:104 actions/tagrss.php:64 +#: actions/apitimelinetag.php:104 actions/tagrss.php:65 #, fuzzy, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "&s的微型部落格" @@ -743,7 +743,7 @@ msgstr "" #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 #: actions/remotesubscribe.php:191 actions/userauthorization.php:72 -#: actions/userrss.php:103 +#: actions/userrss.php:106 msgid "User without matching profile" msgstr "" @@ -1768,7 +1768,7 @@ msgstr "" msgid "Make this user an admin" msgstr "" -#: actions/grouprss.php:138 actions/userrss.php:90 +#: actions/grouprss.php:138 actions/userrss.php:93 #: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67 #, php-format msgid "%s timeline" @@ -4347,7 +4347,7 @@ msgstr "" msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" -#: actions/userrss.php:92 lib/atomgroupnoticefeed.php:66 +#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66 #: lib/atomusernoticefeed.php:72 #, php-format msgid "Updates from %1$s on %2$s!" @@ -5125,12 +5125,12 @@ msgstr "%1$s的狀態是%2$s" msgid "Fullname: %s" msgstr "全名" -#: lib/command.php:312 lib/mail.php:254 +#: lib/command.php:312 lib/mail.php:258 #, php-format msgid "Location: %s" msgstr "" -#: lib/command.php:315 lib/mail.php:256 +#: lib/command.php:315 lib/mail.php:260 #, php-format msgid "Homepage: %s" msgstr "" @@ -5577,11 +5577,11 @@ msgstr "使用者名稱或密碼無效" msgid "Sign up for a new account" msgstr "新增帳號" -#: lib/mail.php:172 +#: lib/mail.php:173 msgid "Email address confirmation" msgstr "確認信箱" -#: lib/mail.php:174 +#: lib/mail.php:175 #, php-format msgid "" "Hey, %s.\n" @@ -5598,12 +5598,12 @@ msgid "" "%s\n" msgstr "" -#: lib/mail.php:236 +#: lib/mail.php:240 #, php-format msgid "%1$s is now listening to your notices on %2$s." msgstr "現在%1$s在%2$s成為你的粉絲囉" -#: lib/mail.php:241 +#: lib/mail.php:245 #, fuzzy, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" @@ -5625,17 +5625,17 @@ msgstr "" "%4$s.\n" "敬上。\n" -#: lib/mail.php:258 +#: lib/mail.php:262 #, fuzzy, php-format msgid "Bio: %s" msgstr "自我介紹" -#: lib/mail.php:286 +#: lib/mail.php:290 #, php-format msgid "New email address for posting to %s" msgstr "" -#: lib/mail.php:289 +#: lib/mail.php:293 #, php-format msgid "" "You have a new posting address on %1$s.\n" @@ -5648,21 +5648,21 @@ msgid "" "%4$s" msgstr "" -#: lib/mail.php:413 +#: lib/mail.php:417 #, php-format msgid "%s status" msgstr "" -#: lib/mail.php:439 +#: lib/mail.php:443 msgid "SMS confirmation" msgstr "" -#: lib/mail.php:463 +#: lib/mail.php:467 #, php-format msgid "You've been nudged by %s" msgstr "" -#: lib/mail.php:467 +#: lib/mail.php:471 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -5678,12 +5678,12 @@ msgid "" "%4$s\n" msgstr "" -#: lib/mail.php:510 +#: lib/mail.php:517 #, php-format msgid "New private message from %s" msgstr "" -#: lib/mail.php:514 +#: lib/mail.php:521 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -5702,12 +5702,12 @@ msgid "" "%5$s\n" msgstr "" -#: lib/mail.php:559 +#: lib/mail.php:568 #, fuzzy, php-format msgid "%s (@%s) added your notice as a favorite" msgstr "現在%1$s在%2$s成為你的粉絲囉" -#: lib/mail.php:561 +#: lib/mail.php:570 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -5728,12 +5728,12 @@ msgid "" "%6$s\n" msgstr "" -#: lib/mail.php:624 +#: lib/mail.php:635 #, php-format msgid "%s (@%s) sent a notice to your attention" msgstr "" -#: lib/mail.php:626 +#: lib/mail.php:637 #, php-format msgid "" "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n" diff --git a/plugins/LdapAuthentication/LdapAuthenticationPlugin.php b/plugins/LdapAuthentication/LdapAuthenticationPlugin.php index e0fd615dd..483209676 100644 --- a/plugins/LdapAuthentication/LdapAuthenticationPlugin.php +++ b/plugins/LdapAuthentication/LdapAuthenticationPlugin.php @@ -224,6 +224,11 @@ class LdapAuthenticationPlugin extends AuthenticationPlugin $ldap->setErrorHandling(PEAR_ERROR_RETURN); $err=$ldap->bind(); if (Net_LDAP2::isError($err)) { + // if we were called with a config, assume caller will handle + // incorrect username/password (LDAP_INVALID_CREDENTIALS) + if (isset($config) && $err->getCode() == 0x31) { + return null; + } throw new Exception('Could not connect to LDAP server: '.$err->getMessage()); } if($config == null) $this->default_ldap=$ldap; diff --git a/plugins/LdapAuthorization/LdapAuthorizationPlugin.php b/plugins/LdapAuthorization/LdapAuthorizationPlugin.php index 19aff42b8..042b2db8d 100644 --- a/plugins/LdapAuthorization/LdapAuthorizationPlugin.php +++ b/plugins/LdapAuthorization/LdapAuthorizationPlugin.php @@ -131,13 +131,13 @@ class LdapAuthorizationPlugin extends AuthorizationPlugin { $ldap = $this->ldap_get_connection(); $link = $ldap->getLink(); - $r = ldap_compare($link, $groupDn, $this->uniqueMember_attribute, $userDn); + $r = @ldap_compare($link, $groupDn, $this->uniqueMember_attribute, $userDn); if ($r === true){ return true; }else if($r === false){ return false; }else{ - common_log(LOG_ERR, ldap_error($r)); + common_log(LOG_ERR, "LDAP error determining if userDn=$userDn is a member of groupDn=groupDn using uniqueMember_attribute=$this->uniqueMember_attribute error: ".ldap_error($link)); return false; } } @@ -167,6 +167,11 @@ class LdapAuthorizationPlugin extends AuthorizationPlugin $ldap->setErrorHandling(PEAR_ERROR_RETURN); $err=$ldap->bind(); if (Net_LDAP2::isError($err)) { + // if we were called with a config, assume caller will handle + // incorrect username/password (LDAP_INVALID_CREDENTIALS) + if (isset($config) && $err->getCode() == 0x31) { + return null; + } throw new Exception('Could not connect to LDAP server: '.$err->getMessage()); return false; } diff --git a/plugins/MemcachedPlugin.php b/plugins/MemcachedPlugin.php new file mode 100644 index 000000000..707e6db9a --- /dev/null +++ b/plugins/MemcachedPlugin.php @@ -0,0 +1,223 @@ +<?php +/** + * StatusNet - the distributed open-source microblogging tool + * Copyright (C) 2009, StatusNet, Inc. + * + * Plugin to implement cache interface for memcached + * + * PHP version 5 + * + * 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 Cache + * @package StatusNet + * @author Evan Prodromou <evan@status.net>, Craig Andrews <candrews@integralblue.com> + * @copyright 2009 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET')) { + // This check helps protect against security problems; + // your code file can't be executed directly from the web. + exit(1); +} + +/** + * A plugin to use memcached for the cache interface + * + * This used to be encoded as config-variable options in the core code; + * it's now broken out to a separate plugin. The same interface can be + * implemented by other plugins. + * + * @category Cache + * @package StatusNet + * @author Evan Prodromou <evan@status.net>, Craig Andrews <candrews@integralblue.com> + * @copyright 2009 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +class MemcachedPlugin extends Plugin +{ + static $cacheInitialized = false; + + private $_conn = null; + public $servers = array('127.0.0.1;11211'); + + public $defaultExpiry = 86400; // 24h + + /** + * Initialize the plugin + * + * Note that onStartCacheGet() may have been called before this! + * + * @return boolean flag value + */ + + function onInitializePlugin() + { + $this->_ensureConn(); + self::$cacheInitialized = true; + return true; + } + + /** + * Get a value associated with a key + * + * The value should have been set previously. + * + * @param string &$key in; Lookup key + * @param mixed &$value out; value associated with key + * + * @return boolean hook success + */ + + function onStartCacheGet(&$key, &$value) + { + $this->_ensureConn(); + $value = $this->_conn->get($key); + Event::handle('EndCacheGet', array($key, &$value)); + return false; + } + + /** + * Associate a value with a key + * + * @param string &$key in; Key to use for lookups + * @param mixed &$value in; Value to associate + * @param integer &$flag in; Flag empty or Cache::COMPRESSED + * @param integer &$expiry in; Expiry (passed through to Memcache) + * @param boolean &$success out; Whether the set was successful + * + * @return boolean hook success + */ + + function onStartCacheSet(&$key, &$value, &$flag, &$expiry, &$success) + { + $this->_ensureConn(); + if ($expiry === null) { + $expiry = $this->defaultExpiry; + } + $success = $this->_conn->set($key, $value, $expiry); + Event::handle('EndCacheSet', array($key, $value, $flag, + $expiry)); + return false; + } + + /** + * Atomically increment an existing numeric key value. + * Existing expiration time will not be changed. + * + * @param string &$key in; Key to use for lookups + * @param int &$step in; Amount to increment (default 1) + * @param mixed &$value out; Incremented value, or false if key not set. + * + * @return boolean hook success + */ + function onStartCacheIncrement(&$key, &$step, &$value) + { + $this->_ensureConn(); + $value = $this->_conn->increment($key, $step); + Event::handle('EndCacheIncrement', array($key, $step, $value)); + return false; + } + + /** + * Delete a value associated with a key + * + * @param string &$key in; Key to lookup + * @param boolean &$success out; whether it worked + * + * @return boolean hook success + */ + + function onStartCacheDelete(&$key, &$success) + { + $this->_ensureConn(); + $success = $this->_conn->delete($key); + Event::handle('EndCacheDelete', array($key)); + return false; + } + + function onStartCacheReconnect(&$success) + { + // nothing to do + return true; + } + + /** + * Ensure that a connection exists + * + * Checks the instance $_conn variable and connects + * if it is empty. + * + * @return void + */ + + private function _ensureConn() + { + if (empty($this->_conn)) { + $this->_conn = new Memcached(common_config('site', 'nickname')); + + if (!count($this->_conn->getServerList())) { + if (is_array($this->servers)) { + $servers = $this->servers; + } else { + $servers = array($this->servers); + } + foreach ($servers as $server) { + if (strpos($server, ';') !== false) { + list($host, $port) = explode(';', $server); + } else { + $host = $server; + $port = 11211; + } + + $this->_conn->addServer($host, $port); + } + + // Compress items stored in the cache. + + // Allows the cache to store objects larger than 1MB (if they + // compress to less than 1MB), and improves cache memory efficiency. + + $this->_conn->setOption(Memcached::OPT_COMPRESSION, true); + } + } + } + + /** + * Translate general flags to Memcached-specific flags + * @param int $flag + * @return int + */ + protected function flag($flag) + { + //no flags are presently supported + return $flag; + } + + function onPluginVersion(&$versions) + { + $versions[] = array('name' => 'Memcached', + 'version' => STATUSNET_VERSION, + 'author' => 'Evan Prodromou, Craig Andrews', + 'homepage' => 'http://status.net/wiki/Plugin:Memcached', + 'rawdescription' => + _m('Use <a href="http://memcached.org/">Memcached</a> to cache query results.')); + return true; + } +} + diff --git a/plugins/OStatus/OStatusPlugin.php b/plugins/OStatus/OStatusPlugin.php index efb630297..38042803f 100644 --- a/plugins/OStatus/OStatusPlugin.php +++ b/plugins/OStatus/OStatusPlugin.php @@ -322,6 +322,86 @@ class OStatusPlugin extends Plugin } /** + * Allow remote profile references to be used in commands: + * sub update@status.net + * whois evan@identi.ca + * reply http://identi.ca/evan hey what's up + * + * @param Command $command + * @param string $arg + * @param Profile &$profile + * @return hook return code + */ + function onStartCommandGetProfile($command, $arg, &$profile) + { + $oprofile = $this->pullRemoteProfile($arg); + if ($oprofile && !$oprofile->isGroup()) { + $profile = $oprofile->localProfile(); + return false; + } else { + return true; + } + } + + /** + * Allow remote group references to be used in commands: + * join group+statusnet@identi.ca + * join http://identi.ca/group/statusnet + * drop identi.ca/group/statusnet + * + * @param Command $command + * @param string $arg + * @param User_group &$group + * @return hook return code + */ + function onStartCommandGetGroup($command, $arg, &$group) + { + $oprofile = $this->pullRemoteProfile($arg); + if ($oprofile && $oprofile->isGroup()) { + $group = $oprofile->localGroup(); + return false; + } else { + return true; + } + } + + protected function pullRemoteProfile($arg) + { + $oprofile = null; + if (preg_match('!^((?:\w+\.)*\w+@(?:\w+\.)*\w+(?:\w+\-\w+)*\.\w+)$!', $arg)) { + // webfinger lookup + try { + return Ostatus_profile::ensureWebfinger($arg); + } catch (Exception $e) { + common_log(LOG_ERR, 'Webfinger lookup failed for ' . + $arg . ': ' . $e->getMessage()); + } + } + + // Look for profile URLs, with or without scheme: + $urls = array(); + if (preg_match('!^https?://((?:\w+\.)*\w+(?:\w+\-\w+)*\.\w+(?:/\w+)+)$!', $arg)) { + $urls[] = $arg; + } + if (preg_match('!^((?:\w+\.)*\w+(?:\w+\-\w+)*\.\w+(?:/\w+)+)$!', $arg)) { + $schemes = array('http', 'https'); + foreach ($schemes as $scheme) { + $urls[] = "$scheme://$arg"; + } + } + + foreach ($urls as $url) { + try { + return Ostatus_profile::ensureProfile($url); + } catch (Exception $e) { + common_log(LOG_ERR, 'Profile lookup failed for ' . + $arg . ': ' . $e->getMessage()); + } + } + return null; + } + + /** * Make sure necessary tables are filled out. */ function onCheckSchema() { diff --git a/plugins/OStatus/classes/HubSub.php b/plugins/OStatus/classes/HubSub.php index 3120a70f9..c420b3eef 100644 --- a/plugins/OStatus/classes/HubSub.php +++ b/plugins/OStatus/classes/HubSub.php @@ -192,7 +192,7 @@ class HubSub extends Memcached_DataObject // Any existing query string parameters must be preserved $url = $this->callback; - if (strpos('?', $url) !== false) { + if (strpos($url, '?') !== false) { $url .= '&'; } else { $url .= '?'; diff --git a/plugins/OStatus/classes/Ostatus_profile.php b/plugins/OStatus/classes/Ostatus_profile.php index fcca1a252..abc8100ce 100644 --- a/plugins/OStatus/classes/Ostatus_profile.php +++ b/plugins/OStatus/classes/Ostatus_profile.php @@ -428,10 +428,18 @@ class Ostatus_profile extends Memcached_DataObject * Currently assumes that all items in the feed are new, * coming from a PuSH hub. * - * @param DOMDocument $feed + * @param DOMDocument $doc + * @param string $source identifier ("push") */ - public function processFeed($feed, $source) + public function processFeed(DOMDocument $doc, $source) { + $feed = $doc->documentElement; + + if ($feed->localName != 'feed' || $feed->namespaceURI != Activity::ATOM) { + common_log(LOG_ERR, __METHOD__ . ": not an Atom feed, ignoring"); + return; + } + $entries = $feed->getElementsByTagNameNS(Activity::ATOM, 'entry'); if ($entries->length == 0) { common_log(LOG_ERR, __METHOD__ . ": no entries in feed update, ignoring"); @@ -449,6 +457,7 @@ class Ostatus_profile extends Memcached_DataObject * * @param DOMElement $entry * @param DOMElement $feed for context + * @param string $source identifier ("push" or "salmon") */ public function processEntry($entry, $feed, $source) { diff --git a/plugins/OStatus/lib/feeddiscovery.php b/plugins/OStatus/lib/feeddiscovery.php index 7afb71bdc..ff76b229e 100644 --- a/plugins/OStatus/lib/feeddiscovery.php +++ b/plugins/OStatus/lib/feeddiscovery.php @@ -129,7 +129,7 @@ class FeedDiscovery function initFromResponse($response) { if (!$response->isOk()) { - throw new FeedSubBadResponseException($response->getCode()); + throw new FeedSubBadResponseException($response->getStatus()); } $sourceurl = $response->getUrl(); diff --git a/plugins/OpenID/User_openid.php b/plugins/OpenID/User_openid.php index 801b49ecc..5ef05b4c7 100644 --- a/plugins/OpenID/User_openid.php +++ b/plugins/OpenID/User_openid.php @@ -39,9 +39,21 @@ class User_openid extends Memcached_DataObject ); } + /** + * List primary and unique keys in this table. + * Unique keys used for lookup *MUST* be listed to ensure proper caching. + */ function keys() { - return array('canonical' => 'K', 'display' => 'U'); + return array('canonical' => 'K', 'display' => 'U', 'user_id' => 'U'); + } + + /** + * No sequence keys in this table. + */ + function sequenceKey() + { + return array(false, false, false); } Static function hasOpenID($user_id) diff --git a/plugins/OpenID/openidsettings.php b/plugins/OpenID/openidsettings.php index 3fc3d6128..16142cf48 100644 --- a/plugins/OpenID/openidsettings.php +++ b/plugins/OpenID/openidsettings.php @@ -176,6 +176,43 @@ class OpenidsettingsAction extends AccountSettingsAction } } } + + $this->elementStart('form', array('method' => 'post', + 'id' => 'form_settings_openid_trustroots', + 'class' => 'form_settings', + 'action' => + common_local_url('openidsettings'))); + $this->elementStart('fieldset', array('id' => 'settings_openid_trustroots')); + $this->element('legend', null, _m('OpenID Trusted Sites')); + $this->hidden('token', common_session_token()); + $this->element('p', 'form_guide', + _m('The following sites are allowed to access your ' . + 'identity and log you in. You can remove a site from ' . + 'this list to deny it access to your OpenID.')); + $this->elementStart('ul', 'form_data'); + $user_openid_trustroot = new User_openid_trustroot(); + $user_openid_trustroot->user_id=$user->id; + if($user_openid_trustroot->find()) { + while($user_openid_trustroot->fetch()) { + $this->elementStart('li'); + $this->element('input', array('name' => 'openid_trustroot[]', + 'type' => 'checkbox', + 'class' => 'checkbox', + 'value' => $user_openid_trustroot->trustroot, + 'id' => 'openid_trustroot_' . crc32($user_openid_trustroot->trustroot))); + $this->element('label', array('class'=>'checkbox', 'for' => 'openid_trustroot_' . crc32($user_openid_trustroot->trustroot)), + $user_openid_trustroot->trustroot); + $this->elementEnd('li'); + } + } + $this->elementEnd('ul'); + $this->element('input', array('type' => 'submit', + 'id' => 'settings_openid_trustroots_action-submit', + 'name' => 'remove_trustroots', + 'class' => 'submit', + 'value' => _m('Remove'))); + $this->elementEnd('fieldset'); + $this->elementEnd('form'); } /** @@ -204,12 +241,45 @@ class OpenidsettingsAction extends AccountSettingsAction } } else if ($this->arg('remove')) { $this->removeOpenid(); + } else if($this->arg('remove_trustroots')) { + $this->removeTrustroots(); } else { $this->showForm(_m('Something weird happened.')); } } /** + * Handles a request to remove OpenID trustroots from the user's account + * + * Validates input and, if everything is OK, deletes the trustroots. + * Reloads the form with a success or error notification. + * + * @return void + */ + + function removeTrustroots() + { + $user = common_current_user(); + $trustroots = $this->arg('openid_trustroot'); + if($trustroots) { + foreach($trustroots as $trustroot) { + $user_openid_trustroot = User_openid_trustroot::pkeyGet( + array('user_id'=>$user->id, 'trustroot'=>$trustroot)); + if($user_openid_trustroot) { + $user_openid_trustroot->delete(); + } else { + $this->showForm(_m('No such OpenID trustroot.')); + return; + } + } + $this->showForm(_m('Trustroots removed'), true); + } else { + $this->showForm(); + } + return; + } + + /** * Handles a request to remove an OpenID from the user's account * * Validates input and, if everything is OK, deletes the OpenID. diff --git a/plugins/RSSCloud/RSSCloudNotifier.php b/plugins/RSSCloud/RSSCloudNotifier.php index d454691c8..9e7b53680 100644 --- a/plugins/RSSCloud/RSSCloudNotifier.php +++ b/plugins/RSSCloud/RSSCloudNotifier.php @@ -152,7 +152,7 @@ class RSSCloudNotifier function notify($profile) { $feed = common_path('api/statuses/user_timeline/') . - $profile->nickname . '.rss'; + $profile->id . '.rss'; $cloudSub = new RSSCloudSubscription(); diff --git a/plugins/RSSCloud/RSSCloudRequestNotify.php b/plugins/RSSCloud/RSSCloudRequestNotify.php index d76c08d37..030529534 100644 --- a/plugins/RSSCloud/RSSCloudRequestNotify.php +++ b/plugins/RSSCloud/RSSCloudRequestNotify.php @@ -270,13 +270,14 @@ class RSSCloudRequestNotifyAction extends Action function userFromFeed($feed) { - // We only do profile feeds + // We only do canonical RSS2 profile feeds (specified by ID), e.g.: + // http://www.example.com/api/statuses/user_timeline/2.rss $path = common_path('api/statuses/user_timeline/'); - $valid = '%^' . $path . '(?<nickname>.*)\.rss$%'; + $valid = '%^' . $path . '(?<id>.*)\.rss$%'; if (preg_match($valid, $feed, $matches)) { - $user = User::staticGet('nickname', $matches['nickname']); + $user = User::staticGet('id', $matches['id']); if (!empty($user)) { return $user; } diff --git a/scripts/command.php b/scripts/command.php new file mode 100755 index 000000000..6041b02eb --- /dev/null +++ b/scripts/command.php @@ -0,0 +1,80 @@ +#!/usr/bin/env php +<?php +/* + * StatusNet - a distributed open-source microblogging tool + * Copyright (C) 2008, 2009, 2010 StatusNet, Inc. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +define('INSTALLDIR', realpath(dirname(__FILE__) . '/..')); + +$shortoptions = 'i:n:'; +$longoptions = array('id=', 'nickname='); + +$helptext = <<<END_OF_USERROLE_HELP +command.php [options] [command line] +Perform commands on behalf of a user, such as sub, unsub, join, drop + + -i --id ID of the user + -n --nickname nickname of the user + +END_OF_USERROLE_HELP; + +require_once INSTALLDIR.'/scripts/commandline.inc'; + + + +function interpretCommand($user, $body) +{ + $inter = new CommandInterpreter(); + $chan = new CLIChannel(); + $cmd = $inter->handle_command($user, $body); + if ($cmd) { + $cmd->execute($chan); + return true; + } else { + $chan->error($user, "Not a valid command. Try 'help'?"); + return false; + } +} + + + +if (have_option('i', 'id')) { + $id = get_option_value('i', 'id'); + $user = User::staticGet('id', $id); + if (empty($user)) { + print "Can't find user with ID $id\n"; + exit(1); + } +} else if (have_option('n', 'nickname')) { + $nickname = get_option_value('n', 'nickname'); + $user = User::staticGet('nickname', $nickname); + if (empty($user)) { + print "Can't find user with nickname '$nickname'\n"; + exit(1); + } +} else { + print "You must provide either an ID or a nickname.\n\n"; + print $helptext; + exit(1); +} + +// @todo refactor the interactive console in console.php and use +// that to optionally make an interactive test console here too. +// Would be good to help people test commands when XMPP or email +// isn't available locally. +interpretCommand($user, implode(' ', $args)); + diff --git a/scripts/flushsite.php b/scripts/flushsite.php new file mode 100644 index 000000000..b7f385ac4 --- /dev/null +++ b/scripts/flushsite.php @@ -0,0 +1,45 @@ +#!/usr/bin/env php +<?php +/* + * StatusNet - a distributed open-source microblogging tool + * Copyright (C) 2008, 2009, StatusNet, Inc. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +define('INSTALLDIR', realpath(dirname(__FILE__) . '/..')); + +$shortoptions = 'd'; +$longoptions = array('delete'); + +$helptext = <<<END_OF_FLUSHSITE_HELP +flushsite.php -s<sitename> +Flush the site with the given name from memcached. + +END_OF_FLUSHSITE_HELP; + +require_once INSTALLDIR.'/scripts/commandline.inc'; + +$nickname = common_config('site', 'nickname'); + +$sn = Status_network::memGet('nickname', $nickname); + +if (empty($sn)) { + print "No such site.\n"; + exit(-1); +} + +print "Flushing cache for {$nickname}..."; +$sn->decache(); +print "OK.\n";
\ No newline at end of file diff --git a/scripts/importtwitteratom.php b/scripts/importtwitteratom.php new file mode 100644 index 000000000..7316f2108 --- /dev/null +++ b/scripts/importtwitteratom.php @@ -0,0 +1,192 @@ +#!/usr/bin/env php +<?php +/* + * StatusNet - the distributed open-source microblogging tool + * Copyright (C) 2010 StatusNet, Inc. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +define('INSTALLDIR', realpath(dirname(__FILE__) . '/..')); + +$shortoptions = 'i:n:f:'; +$longoptions = array('id=', 'nickname=', 'file='); + +$helptext = <<<END_OF_IMPORTTWITTERATOM_HELP +importtwitteratom.php [options] +import an Atom feed from Twitter as notices by a user + + -i --id ID of user to update + -n --nickname nickname of the user to update + -f --file file to import (Atom-only for now) + +END_OF_IMPORTTWITTERATOM_HELP; + +require_once INSTALLDIR.'/scripts/commandline.inc'; +require_once INSTALLDIR.'/extlib/htmLawed/htmLawed.php'; + +function getUser() +{ + $user = null; + + if (have_option('i', 'id')) { + $id = get_option_value('i', 'id'); + $user = User::staticGet('id', $id); + if (empty($user)) { + throw new Exception("Can't find user with id '$id'."); + } + } else if (have_option('n', 'nickname')) { + $nickname = get_option_value('n', 'nickname'); + $user = User::staticGet('nickname', $nickname); + if (empty($user)) { + throw new Exception("Can't find user with nickname '$nickname'"); + } + } else { + show_help(); + exit(1); + } + + return $user; +} + +function getAtomFeedDocument() +{ + $filename = get_option_value('f', 'file'); + + if (empty($filename)) { + show_help(); + exit(1); + } + + if (!file_exists($filename)) { + throw new Exception("No such file '$filename'."); + } + + if (!is_file($filename)) { + throw new Exception("Not a regular file: '$filename'."); + } + + if (!is_readable($filename)) { + throw new Exception("File '$filename' not readable."); + } + + $xml = file_get_contents($filename); + + $dom = DOMDocument::loadXML($xml); + + if ($dom->documentElement->namespaceURI != Activity::ATOM || + $dom->documentElement->localName != 'feed') { + throw new Exception("'$filename' is not an Atom feed."); + } + + return $dom; +} + +function importActivityStream($user, $doc) +{ + $feed = $doc->documentElement; + + $entries = $feed->getElementsByTagNameNS(Activity::ATOM, 'entry'); + + for ($i = $entries->length - 1; $i >= 0; $i--) { + $entry = $entries->item($i); + $activity = new Activity($entry, $feed); + $object = $activity->object; + if (!have_option('q', 'quiet')) { + print $activity->content . "\n"; + } + $html = getTweetHtml($object->link); + + $config = array('safe' => 1, + 'deny_attribute' => 'class,rel,id,style,on*'); + + $html = htmLawed($html, $config); + + $content = html_entity_decode(strip_tags($html)); + + $notice = Notice::saveNew($user->id, + $content, + 'importtwitter', + array('uri' => $object->id, + 'url' => $object->link, + 'rendered' => $html, + 'created' => common_sql_date($activity->time), + 'replies' => array(), + 'groups' => array())); + } +} + +function getTweetHtml($url) +{ + try { + $client = new HTTPClient(); + $response = $client->get($url); + } catch (HTTP_Request2_Exception $e) { + print "ERROR: HTTP response " . $e->getMessage() . "\n"; + return false; + } + + if (!$response->isOk()) { + print "ERROR: HTTP response " . $response->getCode() . "\n"; + return false; + } + + $body = $response->getBody(); + + return tweetHtmlFromBody($body); +} + +function tweetHtmlFromBody($body) +{ + $doc = DOMDocument::loadHTML($body); + $xpath = new DOMXPath($doc); + + $spans = $xpath->query('//span[@class="entry-content"]'); + + if ($spans->length == 0) { + print "ERROR: No content in tweet page.\n"; + return ''; + } + + $span = $spans->item(0); + + $children = $span->childNodes; + + $text = ''; + + for ($i = 0; $i < $children->length; $i++) { + $child = $children->item($i); + if ($child instanceof DOMElement && + $child->tagName == 'a' && + !preg_match('#^https?://#', $child->getAttribute('href'))) { + $child->setAttribute('href', 'http://twitter.com' . $child->getAttribute('href')); + } + $text .= $doc->saveXML($child); + } + + return $text; +} + +try { + + $doc = getAtomFeedDocument(); + $user = getUser(); + + importActivityStream($user, $doc); + +} catch (Exception $e) { + print $e->getMessage()."\n"; + exit(1); +} + diff --git a/theme/base/css/ie6.css b/theme/base/css/ie6.css index edc49478f..6df5e01ce 100644 --- a/theme/base/css/ie6.css +++ b/theme/base/css/ie6.css @@ -12,11 +12,11 @@ margin:0 auto; } #content { -width:69%; +width:66%; } #aside_primary { -padding:5%; -width:29.5%; +padding:1.8%; +width:24%; } .entity_profile .entity_nickname, .entity_profile .entity_location, @@ -32,9 +32,9 @@ margin-bottom:123px; width:20%; } .notice div.entry-content { -width:50%; +width:65%; margin-left:30px; } .notice-options a { width:16px; -}
\ No newline at end of file +} |